Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
callfcgi: Improved recvrec implementation.
[ashd.git]
/
python
/
ashd
/
proto.py
diff --git
a/python/ashd/proto.py
b/python/ashd/proto.py
index
ab2152e
..
e18023d
100644
(file)
--- a/
python/ashd/proto.py
+++ b/
python/ashd/proto.py
@@
-8,7
+8,7
@@
ashd.util module provides an easier-to-use interface.
"""
import os, socket
"""
import os, socket
-
from .
import htlib
+import htlib
__all__ = ["req", "recvreq", "sendreq"]
__all__ = ["req", "recvreq", "sendreq"]
@@
-47,7
+47,7
@@
class req(object):
self.rest = rest
self.headers = headers
self.bsk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM)
self.rest = rest
self.headers = headers
self.bsk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM)
- self.sk = self.bsk.makefile('r
wb
')
+ self.sk = self.bsk.makefile('r
+
')
os.close(fd)
def close(self):
os.close(fd)
def close(self):
@@
-61,8
+61,6
@@
class req(object):
header regardlessly of whether the client specified it as
"Content-Type", "content-type" or "Content-type".
"""
header regardlessly of whether the client specified it as
"Content-Type", "content-type" or "Content-type".
"""
- if isinstance(header, str):
- header = header.encode("ascii")
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
@@
-73,8
+71,6
@@
class req(object):
"""Works analogously to the __getitem__ method for checking
header presence case-insensitively.
"""
"""Works analogously to the __getitem__ method for checking
header presence case-insensitively.
"""
- if isinstance(header, str):
- header = header.encode("ascii")
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
@@
-101,17
+97,13
@@
class req(object):
else:
util.respond(req, "Not found", status = "404 Not Found", ctype = "text/plain")
"""
else:
util.respond(req, "Not found", status = "404 Not Found", ctype = "text/plain")
"""
- if isinstance(match, str):
- match = match.encode("utf-8")
if self.rest[:len(match)] == match:
self.rest = self.rest[len(match):]
return True
return False
def __str__(self):
if self.rest[:len(match)] == match:
self.rest = self.rest[len(match):]
return True
return False
def __str__(self):
- def dec(b):
- return b.decode("ascii", errors="replace")
- return "\"%s %s %s\"" % (dec(self.method), dec(self.url), dec(self.ver))
+ return "\"%s %s %s\"" % (self.method, self.url, self.ver)
def __enter__(self):
return self
def __enter__(self):
return self
@@
-129,22
+121,22
@@
def recvreq(sock = 0):
done, to avoid leaking response sockets. If end-of-file is
received on the socket, None is returned.
done, to avoid leaking response sockets. If end-of-file is
received on the socket, None is returned.
- This function may either raise
o
n OSError if an error occurs on
- the socket, or a ashd.proto.protoerr if the incoming request is
+ This function may either raise
a
n OSError if an error occurs on
+ the socket, or a
n
ashd.proto.protoerr if the incoming request is
invalidly encoded.
"""
data, fd = htlib.recvfd(sock)
if fd is None:
return None
try:
invalidly encoded.
"""
data, fd = htlib.recvfd(sock)
if fd is None:
return None
try:
- parts = data.split(
b
'\0')[:-1]
+ parts = data.split('\0')[:-1]
if len(parts) < 5:
raise protoerr("Truncated request")
method, url, ver, rest = parts[:4]
headers = []
i = 4
while True:
if len(parts) < 5:
raise protoerr("Truncated request")
method, url, ver, rest = parts[:4]
headers = []
i = 4
while True:
- if parts[i] ==
b
"": break
+ if parts[i] == "": break
if len(parts) - i < 3:
raise protoerr("Truncated request")
headers.append((parts[i], parts[i + 1]))
if len(parts) - i < 3:
raise protoerr("Truncated request")
headers.append((parts[i], parts[i + 1]))
@@
-161,13
+153,13
@@
def sendreq(sock, req):
This function may raise an OSError if an error occurs on the
socket.
"""
This function may raise an OSError if an error occurs on the
socket.
"""
- data =
b
""
- data += req.method +
b
'\0'
- data += req.url +
b
'\0'
- data += req.ver +
b
'\0'
- data += req.rest +
b
'\0'
+ data = ""
+ data += req.method + '\0'
+ data += req.url + '\0'
+ data += req.ver + '\0'
+ data += req.rest + '\0'
for key, val in req.headers:
for key, val in req.headers:
- data += key +
b
'\0'
- data += val +
b
'\0'
- data +=
b
'\0'
+ data += key + '\0'
+ data += val + '\0'
+ data += '\0'
htlib.sendfd(sock, req.sk.fileno(), data)
htlib.sendfd(sock, req.sk.fileno(), data)