[Zope3-checkins] CVS: Zope3/lib/python/Zope/Server/HTTP - HTTPRequestParser.py:1.2.24.1

[Florent Guillaume]

Update of /cvs-repository/Zope3/lib/python/Zope/Server/HTTP
In directory cvs.zope.org:/tmp/cvs-serv5165/lib/python/Zope/Server/HTTP

Modified Files:
      Tag: sprintathon-wf-branch
	HTTPRequestParser.py 
Log Message:
Merge from HEAD.


=== Zope3/lib/python/Zope/Server/HTTP/HTTPRequestParser.py 1.2 => 1.2.24.1 ===
--- Zope3/lib/python/Zope/Server/HTTP/HTTPRequestParser.py:1.2	Mon Jun 10 19:29:35 2002
+++ Zope3/lib/python/Zope/Server/HTTP/HTTPRequestParser.py	Fri Dec  6 10:59:26 2002
@@ -130,8 +130,6 @@
 
         command, uri, version = self.crack_first_line()
         self.command = str(command)
-        if uri and '%' in uri:
-            uri = unquote(uri)
         self.uri = str(uri)
         self.version = version
         self.split_uri()
@@ -189,7 +187,10 @@
         if m.end() != len(self.uri):
             raise ValueError, "Broken URI"
         else:
-            self.path, query, self.fragment = m.groups()
+            path, query, self.fragment = m.groups()
+            if path and '%' in path:
+                path = unquote(path)
+            self.path = path
             if query:
                 query = query[1:]
             self.query = query