Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Fixed scgi-wsgi3 input handling bug.
[ashd.git]
/
python3
/
scgi-wsgi3
diff --git
a/python3/scgi-wsgi3
b/python3/scgi-wsgi3
index
0dfe9a1
..
428767f
100755
(executable)
--- a/
python3/scgi-wsgi3
+++ b/
python3/scgi-wsgi3
@@
-2,15
+2,19
@@
import sys, os, getopt, logging, collections
import socket
import sys, os, getopt, logging, collections
import socket
-import ashd.scgi, ashd.serve
+import ashd.scgi, ashd.perf, ashd.serve
+try:
+ import pdm.srv
+except:
+ pdm = None
def usage(out):
def usage(out):
- out.write("usage: scgi-wsgi3 [-hAL] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
+ out.write("usage: scgi-wsgi3 [-hAL] [-
m PDM-SPEC] [-
p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
sk = None
modwsgi_compat = False
setlog = True
sk = None
modwsgi_compat = False
setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:
m:
")
for o, a in opts:
if o == "-h":
usage(sys.stdout)
for o, a in opts:
if o == "-h":
usage(sys.stdout)
@@
-33,6
+37,9
@@
for o, a in opts:
sk.listen(32)
elif o == "-A":
modwsgi_compat = True
sk.listen(32)
elif o == "-A":
modwsgi_compat = True
+ elif o == "-m":
+ if pdm is not None:
+ pdm.srv.listen(a)
if len(args) < 1:
usage(sys.stderr)
sys.exit(1)
if len(args) < 1:
usage(sys.stderr)
sys.exit(1)
@@
-88,48
+95,47
@@
def recode(thing):
else:
return str(thing).encode("latin-1")
else:
return str(thing).encode("latin-1")
-class reqthread(ashd.serve.wsgithread):
- def __init__(self, sk):
- super().__init__()
+reqhandler = ashd.serve.freethread()
+
+class request(ashd.serve.wsgirequest):
+ def __init__(self, *, sk, **kw):
+ super().__init__(**kw)
self.bsk = sk.dup()
self.sk = self.bsk.makefile("rwb")
self.bsk = sk.dup()
self.sk = self.bsk.makefile("rwb")
- def handlewsgi(self):
- return handler(self.env, self.startreq)
+ def mkenv(self):
+ return mkenv(ashd.scgi.readhead(self.sk), self.sk)
+
+ def handlewsgi(self, env, startreq):
+ return handler(env, startreq)
+
+ def fileno(self):
+ return self.bsk.fileno()
def writehead(self, status, headers):
def writehead(self, status, headers):
- buf = bytearray()
- buf += b"Status: " + recode(status) + b"\n"
+ w = self.buffer.extend
+ w(b"Status: " + recode(status) + b"\n")
for nm, val in headers:
for nm, val in headers:
- buf += recode(nm) + b": " + recode(val) + b"\n"
- buf += b"\n"
- try:
- self.sk.write(buf)
- except IOError:
- raise ashd.serve.closed()
+ w(recode(nm) + b": " + recode(val) + b"\n")
+ w(b"\n")
- def
writedata(self, data
):
+ def
flush(self
):
try:
try:
-
self.sk.write(data
)
- self.
sk.flush()
+
ret = self.bsk.send(self.buffer, socket.MSG_DONTWAIT
)
+ self.
buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
except IOError:
raise ashd.serve.closed()
- def handle(self):
- head = ashd.scgi.readhead(self.sk)
- self.env = mkenv(head, self.sk)
- super().handle()
+ def close(self):
+ self.sk.close()
+ self.bsk.close()
- def run(self):
+try:
+ while True:
+ nsk, addr = sk.accept()
try:
try:
-
super().run(
)
+
reqhandler.handle(request(sk=nsk, handler=reqhandler)
)
finally:
finally:
- self.sk.close()
- self.bsk.close()
-
-while True:
- nsk, addr = sk.accept()
- try:
- reqthread(nsk).start()
- finally:
- nsk.close()
+ nsk.close()
+finally:
+ reqhandler.close()