Changeset Navigation

Changeset 1672

Timestamp:

06/17/07 15:24:59

Author:

fumanchu

Message:

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

Files:

r1582	r1672
1	1	"""A WSGI application interface (see PEP 333)."""
	2
	3	try:
	4	GeneratorExit
	5	except NameError:
	6	GeneratorExit = None
2	7
3	8	import sys
…	…
10	15	"""Rebuild first line of the request (e.g. "GET /path HTTP/1.0")."""
11	16
12		resource = environ.get('SCRIPT_NAME', '') + environ.get('PATH_INFO', '')
	17	resource = httptools.urljoin(environ.get('SCRIPT_NAME', ''),
	18	environ.get('PATH_INFO', ''))
13	19	if not (resource == "*" or resource.startswith("/")):
14	20	resource = "/" + resource
…	…
68	74	except (KeyboardInterrupt, SystemExit), ex:
69	75	raise ex
	76	except GeneratorExit:
	77	raise
70	78	except:
71	79	cherrypy.log(traceback=True)