Commit 0b62c54d authored by Andreas Jung's avatar Andreas Jung

Re-applied Medusa patch to allow proxy-like HTTP requests

(GET http://hostname:port/ HTTP/1.0)
parent 29c0b555
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# All Rights Reserved. # All Rights Reserved.
# #
RCS_ID = '$Id: http_server.py,v 1.29 2001/08/17 13:00:06 andreasjung Exp $' RCS_ID = '$Id: http_server.py,v 1.30 2001/09/20 13:29:28 andreasjung Exp $'
# python modules # python modules
import os import os
...@@ -713,7 +713,7 @@ def get_header_match (head_reg, lines): ...@@ -713,7 +713,7 @@ def get_header_match (head_reg, lines):
return m return m
return '' return ''
REQUEST = re.compile ('([^ ]+) ([^ ]+)(( HTTP/([0-9.]+))$|$)') REQUEST = re.compile ('([^ ]+) (?:[^ :?#]+://[^ ?#/]*)?([^ ]+)(( HTTP/([0-9.]+))$|$)')
def crack_request (r): def crack_request (r):
m = REQUEST.match (r) m = REQUEST.match (r)
......
...@@ -42,6 +42,8 @@ Zope Changes ...@@ -42,6 +42,8 @@ Zope Changes
control panel to make it easer to tell what configuration of control panel to make it easer to tell what configuration of
Zope is running. Zope is running.
- Re-applied Medusa patch to allow proxy-like HTTP requests
(GET http://hostname:port/ HTTP/1.0)
Bugs fixed Bugs fixed
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# All Rights Reserved. # All Rights Reserved.
# #
RCS_ID = '$Id: http_server.py,v 1.29 2001/08/17 13:00:06 andreasjung Exp $' RCS_ID = '$Id: http_server.py,v 1.30 2001/09/20 13:29:28 andreasjung Exp $'
# python modules # python modules
import os import os
...@@ -713,7 +713,7 @@ def get_header_match (head_reg, lines): ...@@ -713,7 +713,7 @@ def get_header_match (head_reg, lines):
return m return m
return '' return ''
REQUEST = re.compile ('([^ ]+) ([^ ]+)(( HTTP/([0-9.]+))$|$)') REQUEST = re.compile ('([^ ]+) (?:[^ :?#]+://[^ ?#/]*)?([^ ]+)(( HTTP/([0-9.]+))$|$)')
def crack_request (r): def crack_request (r):
m = REQUEST.match (r) m = REQUEST.match (r)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment