Dolda2000 GitWeb
/
ashd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c67f9f8
)
python: Fixed scgi-wsgi3 input handling bug.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 5 Jan 2014 09:04:42 +0000
(10:04 +0100)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 5 Jan 2014 09:04:42 +0000
(10:04 +0100)
python3/scgi-wsgi3
patch
|
blob
|
blame
|
history
diff --git
a/python3/scgi-wsgi3
b/python3/scgi-wsgi3
index
946513e
..
428767f
100755
(executable)
--- a/
python3/scgi-wsgi3
+++ b/
python3/scgi-wsgi3
@@
-100,20
+100,17
@@
reqhandler = ashd.serve.freethread()
class request(ashd.serve.wsgirequest):
def __init__(self, *, sk, **kw):
super().__init__(**kw)
class request(ashd.serve.wsgirequest):
def __init__(self, *, sk, **kw):
super().__init__(**kw)
- self.sk = sk.dup()
+ self.bsk = sk.dup()
+ self.sk = self.bsk.makefile("rwb")
def mkenv(self):
def mkenv(self):
- fsk = self.sk.dup().makefile("rwb")
- try:
- return mkenv(ashd.scgi.readhead(fsk), fsk)
- finally:
- fsk.close()
+ return mkenv(ashd.scgi.readhead(self.sk), self.sk)
def handlewsgi(self, env, startreq):
return handler(env, startreq)
def fileno(self):
def handlewsgi(self, env, startreq):
return handler(env, startreq)
def fileno(self):
- return self.sk.fileno()
+ return self.
b
sk.fileno()
def writehead(self, status, headers):
w = self.buffer.extend
def writehead(self, status, headers):
w = self.buffer.extend
@@
-124,13
+121,14
@@
class request(ashd.serve.wsgirequest):
def flush(self):
try:
def flush(self):
try:
- ret = self.sk.send(self.buffer, socket.MSG_DONTWAIT)
+ ret = self.
b
sk.send(self.buffer, socket.MSG_DONTWAIT)
self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
def close(self):
self.sk.close()
self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
def close(self):
self.sk.close()
+ self.bsk.close()
try:
while True:
try:
while True: