diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-13 22:28:04 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-13 22:28:04 -0400 |
commit | c6f9a75e83081b04a04004b4be2db3fcf95141a2 (patch) | |
tree | 8740dc0452b84c282e35a831120fe275acdeae08 | |
parent | aa13578fdd118a1c98d9b1d4effc5bca64099b82 (diff) | |
parent | f0caa99f356b00521955ed8cff58fafee829efb7 (diff) | |
download | cherrypy-c6f9a75e83081b04a04004b4be2db3fcf95141a2.tar.gz |
Merge with cherrypy-3.2.x
-rw-r--r-- | cherrypy/lib/cptools.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cherrypy/lib/cptools.py b/cherrypy/lib/cptools.py index 66c9c1b8..1ab70ef4 100644 --- a/cherrypy/lib/cptools.py +++ b/cherrypy/lib/cptools.py @@ -382,7 +382,8 @@ Message: %(error_msg)s if self.debug: cherrypy.log('routing %r to login_screen' % path, 'TOOLS.SESSAUTH') - return self.login_screen(**request.params) + response.body = self.login_screen() + return True elif path.endswith('do_login'): if request.method != 'POST': response.headers['Allow'] = "POST" |