Changeset 1467
- Timestamp:
- 12/02/06 16:30:23
- Files:
-
- trunk/cherrypy/__init__.py (modified) (1 diff)
- trunk/cherrypy/_cpdispatch.py (modified) (1 diff)
- trunk/cherrypy/_cperror.py (modified) (3 diffs)
- trunk/cherrypy/test/test.py (modified) (1 diff)
- trunk/cherrypy/wsgiserver.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/__init__.py
r1462 r1467 3 3 __version__ = '3.0.0RC1' 4 4 5 import os as _os6 _localdir = _os.path.dirname(__file__)7 5 from urlparse import urljoin as _urljoin 8 6 trunk/cherrypy/_cpdispatch.py
r1463 r1467 200 200 class WSGIEnvProxy(object): 201 201 202 def __getattr__(self, key , default=None):203 return getattr(cherrypy.request.wsgi_environ, key , default)202 def __getattr__(self, key): 203 return getattr(cherrypy.request.wsgi_environ, key) 204 204 205 205 trunk/cherrypy/_cperror.py
r1444 r1467 30 30 # 2. a URL relative to the current path 31 31 # Note that any query string will be discarded. 32 path = _urljoin( cherrypy.request.path_info, path)32 path = _urljoin(request.path_info, path) 33 33 34 34 # Set a 'path' member attribute so that code which traps this … … 70 70 # http://ppewww.ph.gla.ac.uk/~flavell/www/post-redirect.html 71 71 if status is None: 72 if cherrypy.request.protocol >= (1, 1):72 if request.protocol >= (1, 1): 73 73 status = 303 74 74 else: … … 273 273 274 274 template = _HTTPErrorTemplate 275 276 # Replace the default template with a custom one? 275 277 error_page_file = cherrypy.request.error_page.get(code, '') 276 278 if error_page_file: trunk/cherrypy/test/test.py
r1466 r1467 264 264 sys.stdout.write(".") 265 265 sys.stdout.flush() 266 name = os.path.split(morf)[1]266 ## name = os.path.split(morf)[1] 267 267 if morf.find('test') != -1: 268 268 continue trunk/cherrypy/wsgiserver.py
r1465 r1467 197 197 # No Content-Length header supplied. This will hang 198 198 # cgi.FieldStorage, since it cannot determine when to 199 # stop reading from the socket. Until we handle chunked 200 # encoding, always respond with 411 Length Required. 199 # stop reading from the socket. 201 200 # See http://www.cherrypy.org/ticket/493. 202 201 self.simple_response("411 Length Required") … … 457 456 self.environ["wsgi.url_scheme"] = "https" 458 457 self.environ["HTTPS"] = "on" 459 sslenv = getattr(server, "ssl_environ" )458 sslenv = getattr(server, "ssl_environ", None) 460 459 if sslenv: 461 460 self.environ.update(sslenv)
