diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 00:04:23 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 00:04:23 +0200 |
| commit | a077d8877d210562f703c23e9625e8467c81222d (patch) | |
| tree | 47608f9f99d149634f6c5dcb755bdf534a096d45 /netlib/http/http1/assemble.py | |
| parent | 11e7f476bd4bbcd6d072fa3659f628ae3a19705d (diff) | |
| download | mitmproxy-a077d8877d210562f703c23e9625e8467c81222d.tar.gz mitmproxy-a077d8877d210562f703c23e9625e8467c81222d.tar.bz2 mitmproxy-a077d8877d210562f703c23e9625e8467c81222d.zip | |
finish netlib.http.http1 refactor
Diffstat (limited to 'netlib/http/http1/assemble.py')
| -rw-r--r-- | netlib/http/http1/assemble.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py index a3269eed..47c7e95a 100644 --- a/netlib/http/http1/assemble.py +++ b/netlib/http/http1/assemble.py @@ -31,8 +31,6 @@ def assemble_response_head(response): return b"%s\r\n%s\r\n" % (first_line, headers) - - def _assemble_request_line(request, form=None): if form is None: form = request.form_out @@ -50,7 +48,7 @@ def _assemble_request_line(request, form=None): request.httpversion ) elif form == "absolute": - return b"%s %s://%s:%s%s %s" % ( + return b"%s %s://%s:%d%s %s" % ( request.method, request.scheme, request.host, @@ -78,11 +76,11 @@ def _assemble_request_headers(request): if request.body or request.body == b"": headers[b"Content-Length"] = str(len(request.body)).encode("ascii") - return str(headers) + return bytes(headers) def _assemble_response_line(response): - return b"%s %s %s" % ( + return b"%s %d %s" % ( response.httpversion, response.status_code, response.msg, |