Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python3: Encode ashd-wsgi3 output headers with utf-8 instead of latin-1.
[ashd.git]
/
python3
/
ashd-wsgi3
diff --git
a/python3/ashd-wsgi3
b/python3/ashd-wsgi3
index
de6c20e
..
c10bfc9
100755
(executable)
--- a/
python3/ashd-wsgi3
+++ b/
python3/ashd-wsgi3
@@
-1,14
+1,14
@@
#!/usr/bin/python3
#!/usr/bin/python3
-import sys, os, getopt, socket, logging, time, locale, collections
-import ashd.util, ashd.serve
+import sys, os, getopt, socket, logging, time, locale, collections
.abc, signal
+import ashd.util, ashd.serve
, ashd.htlib
try:
import pdm.srv
except:
pdm = None
def usage(out):
try:
import pdm.srv
except:
pdm = None
def usage(out):
- out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-
l REQLIMIT] [-
t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n")
+ out.write("usage: ashd-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-t REQUEST-HANDLER[:PAR[=VAL](,PAR[=VAL])...]] HANDLER-MODULE [ARGS...]\n")
hspec = "free", {}
modwsgi_compat = False
hspec = "free", {}
modwsgi_compat = False
@@
-148,15
+148,16
@@
def mkenv(req):
return env
def recode(thing):
return env
def recode(thing):
- if isinstance(thing, collections.ByteString):
+ if isinstance(thing, collections.
abc.
ByteString):
return thing
else:
return thing
else:
- return str(thing).encode("
latin-1
")
+ return str(thing).encode("
utf-8
")
class request(ashd.serve.wsgirequest):
def __init__(self, *, bkreq, **kw):
super().__init__(**kw)
self.bkreq = bkreq.dup()
class request(ashd.serve.wsgirequest):
def __init__(self, *, bkreq, **kw):
super().__init__(**kw)
self.bkreq = bkreq.dup()
+ self.sendrights = None
def mkenv(self):
return mkenv(self.bkreq)
def mkenv(self):
return mkenv(self.bkreq)
@@
-168,6
+169,13
@@
class request(ashd.serve.wsgirequest):
return self.bkreq.bsk.fileno()
def writehead(self, status, headers):
return self.bkreq.bsk.fileno()
def writehead(self, status, headers):
+ headers = list(headers)
+ for header in headers:
+ nm, val = header
+ if nm.lower() == "x-ash-send-rights":
+ self.sendrights = val
+ headers.remove(header)
+ break
w = self.buffer.extend
w(b"HTTP/1.1 " + recode(status) + b"\n")
for nm, val in headers:
w = self.buffer.extend
w(b"HTTP/1.1 " + recode(status) + b"\n")
for nm, val in headers:
@@
-176,13
+184,22
@@
class request(ashd.serve.wsgirequest):
def flush(self):
try:
def flush(self):
try:
- ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT)
+ if self.sendrights is not None:
+ ret = ashd.htlib.sendfd(self.bkreq.bsk.fileno(), self.sendrights.fileno(), self.buffer)
+ self.sendrights.close()
+ self.sendrights = None
+ else:
+ ret = self.bkreq.bsk.send(self.buffer, socket.MSG_DONTWAIT)
self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
def close(self):
self.buffer[:ret] = b""
except IOError:
raise ashd.serve.closed()
def close(self):
- self.bkreq.close()
+ try:
+ self.bkreq.close()
+ finally:
+ if self.sendrights is not None:
+ self.sendrights.close()
def handle(req):
reqhandler.handle(request(bkreq=req, handler=reqhandler))
def handle(req):
reqhandler.handle(request(bkreq=req, handler=reqhandler))
@@
-197,6
+214,11
@@
except ValueError as exc:
sys.stderr.write("ashd-wsgi3: %s\n" % exc)
sys.exit(1)
sys.stderr.write("ashd-wsgi3: %s\n" % exc)
sys.exit(1)
+def sigterm(sig, frame):
+ socket.fromfd(0, socket.AF_UNIX, socket.SOCK_SEQPACKET).shutdown(socket.SHUT_RDWR) # :P
+for signum in [signal.SIGINT, signal.SIGTERM]:
+ signal.signal(signum, sigterm)
+
reqhandler = hclass(**hargs)
try:
ashd.util.serveloop(handle)
reqhandler = hclass(**hargs)
try:
ashd.util.serveloop(handle)