1.1 --- a/WebStack/JavaServlet.py Sat Oct 27 22:38:58 2007 +0000
1.2 +++ b/WebStack/JavaServlet.py Sat Oct 27 22:39:22 2007 +0000
1.3 @@ -24,7 +24,7 @@
1.4 from StringIO import StringIO
1.5 from WebStack.Helpers.Request import Cookie, FileContent, get_body_fields, \
1.6 get_storage_items, get_fields_from_query_string, filter_fields, \
1.7 - HeaderValue
1.8 + HeaderDict, HeaderValue
1.9 import javax.servlet.http
1.10 import jarray
1.11
1.12 @@ -183,7 +183,7 @@
1.13 NOTE: need to change.
1.14 """
1.15
1.16 - headers = {}
1.17 + headers = HeaderDict()
1.18 header_names_enum = self.request.getHeaderNames()
1.19 while header_names_enum.hasMoreElements():
1.20
1.21 @@ -520,8 +520,10 @@
1.22 time.time function, and indicates the expiry date/time of the cookie.
1.23 """
1.24
1.25 - cookie = javax.servlet.http.Cookie(self.encode_cookie_value(name),
1.26 - self.encode_cookie_value(value))
1.27 + cookie = javax.servlet.http.Cookie(
1.28 + self.encode_cookie_value(name),
1.29 + self.encode_cookie_value(value)
1.30 + )
1.31 if path is not None:
1.32 cookie.setPath(path)
1.33
1.34 @@ -620,7 +622,6 @@
1.35 boundary = fp.readline()
1.36 str_buffer.write('Content-Type: multipart/mixed; boundary="%s"\n\n' % boundary[2:-2])
1.37 str_buffer.write(boundary)
1.38 - str_buffer.write(fp.read())
1.39 str_buffer.close()
1.40
1.41 # Concatenate the headers with the rest of the stream.
1.42 @@ -664,7 +665,7 @@
1.43
1.44 # Using properly decoded header values.
1.45
1.46 - headers = {}
1.47 + headers = HeaderDict()
1.48 for header in part.getAllHeaders():
1.49 headers[header.getName()] = self.parse_header_value(HeaderValue, header.getValue())
1.50