*** medusa_http.py.orig	Tue Jul 15 20:09:55 2003
--- medusa_http.py	Wed Aug  6 17:21:47 2003
***************
*** 43,51 ****
      def continue_request (self, data, request):
          msg = rfc822.Message(StringIO('\n'.join(request.header)))
          remote_addr, remote_port = request.channel.addr
!         query_string = ''
!         if '?' in request.uri:
!             [request.uri, query_string] = request.uri.split('?', 1)
  
          environ = {'REQUEST_METHOD':request.command,
                     'ACCEPT_ENCODING':msg.get('Accept-encoding'),
--- 43,51 ----
      def continue_request (self, data, request):
          msg = rfc822.Message(StringIO('\n'.join(request.header)))
          remote_addr, remote_port = request.channel.addr
!         path, params, query_string, fragment = request.split_uri()
!         if query_string and query_string[0] == '?':
!             query_string = query_string[1:]
  
          environ = {'REQUEST_METHOD':request.command,
                     'ACCEPT_ENCODING':msg.get('Accept-encoding'),
***************
*** 55,65 ****
                     'HTTP_COOKIE':msg.get('Cookie'),
                     'HTTP_REFERER':msg.get('Referer'),
                     'HTTP_USER_AGENT':msg.get('User-agent'),
!                    'PATH_INFO':request.uri,
                     'QUERY_STRING':query_string,
                     'REMOTE_ADDR':remote_addr,
                     'REMOTE_PORT':str(remote_port),
!                    'REQUEST_URI':request.uri,
                     'SCRIPT_NAME':'',
                     "SCRIPT_FILENAME":   '',
                     'SERVER_NAME':self.server.ip or socket.gethostname(),
--- 55,65 ----
                     'HTTP_COOKIE':msg.get('Cookie'),
                     'HTTP_REFERER':msg.get('Referer'),
                     'HTTP_USER_AGENT':msg.get('User-agent'),
!                    'PATH_INFO':path,
                     'QUERY_STRING':query_string,
                     'REMOTE_ADDR':remote_addr,
                     'REMOTE_PORT':str(remote_port),
!                    'REQUEST_URI':path,
                     'SCRIPT_NAME':'',
                     "SCRIPT_FILENAME":   '',
                     'SERVER_NAME':self.server.ip or socket.gethostname(),