Commits

Robert Brewer  committed c025fc4

2.x branch fix for #677 (_cpwsgi requestLine: PATH_INFO SCRIPT_NAME).

  • Participants
  • Parent commits d286a19
  • Branches cherrypy-2.x

Comments (0)

Files changed (1)

File cherrypy/_cpwsgi.py

 """A WSGI application interface (see PEP 333)."""
 
+try:
+    GeneratorExit
+except NameError:
+    GeneratorExit = None
+
 import sys
 import cherrypy
 from cherrypy import _cputil, _cpwsgiserver, _cpwsgiserver3
 def requestLine(environ):
     """Rebuild first line of the request (e.g. "GET /path HTTP/1.0")."""
     
-    resource = environ.get('SCRIPT_NAME', '') + environ.get('PATH_INFO', '')
+    resource = httptools.urljoin(environ.get('SCRIPT_NAME', ''),
+                                 environ.get('PATH_INFO', ''))
     if not (resource == "*" or resource.startswith("/")):
         resource = "/" + resource
     
                 yield chunk
         except (KeyboardInterrupt, SystemExit), ex:
             raise ex
+        except GeneratorExit:
+            raise
         except:
             cherrypy.log(traceback=True)
             s, h, b = _cputil.bareError()