Changeset 47

Timestamp:

05/30/13 12:36:53 (11 years ago)

Author:

tmorgan

Message:

added support for binary data in request body

File:

• trunk/bin/bletchley-http2py (modified) (4 diffs)

trunk/bin/bletchley-http2py

@@ -35 +35 @@
 import sys
 import argparse
+
+bopen = lambda f: open(f, 'rb')
 
 parser = argparse.ArgumentParser(
@@ -43 +45 @@
     ' For more information, see: http://code.google.com/p/bletchley/wiki/Overview')
 parser.add_argument(
-    'requestfile', type=open, nargs='?', default=sys.stdin, 
+    'requestfile', type=bopen, nargs='?', default=sys.stdin.buffer, 
     help='A file containing an HTTP request.  Defaults to stdin if omitted.')
 parser.add_argument(
@@ -53 +55 @@
 
 
-if '\r\n\r\n' in input_req:
-    raw_headers,body = input_req.split('\r\n\r\n', 1)
-elif '\n\n' in input_req:
-    raw_headers,body = input_req.split('\n\n', 1)
+if b'\r\n\r\n' in input_req:
+    raw_headers,body = input_req.split(b'\r\n\r\n', 1)
+elif b'\n\n' in input_req:
+    raw_headers,body = input_req.split(b'\n\n', 1)
 else:
     raw_headers = input_req
-    body = ''
+    body = b''
+
+raw_headers = raw_headers.decode('utf-8')
 
 header_lines = raw_headers.split('\n')
@@ -102 +106 @@
 
 
-formatted_body = '\n            '.join([repr(body[i:i+40].encode()) for i in range(0,len(body),40)])
-if formatted_body == '':
+formatted_body = '\n            '.join([repr(body[i:i+40]) for i in range(0,len(body),40)])
+if formatted_body == b'':
     formatted_body = "b''"