diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-13 22:26:18 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-13 22:26:18 -0400 |
| commit | f0caa99f356b00521955ed8cff58fafee829efb7 (patch) | |
| tree | 355a1ecad971deabccb4eb911ad8eee1330d411e | |
| parent | c6f98e6f729dde5bb8b85ce62946d047a5ca5791 (diff) | |
| parent | 9dc215e43a1aab148ce10a68006fb15be4f10d4f (diff) | |
| download | cherrypy-3.2.x.tar.gz | |
Merged in bazsi/cherrypy/fix-session-auth-login-screen (pull request #60)cherrypy-3.2.x
fix an issue that causes @session_auth tool to fail if login_screen is requested
| -rw-r--r-- | cherrypy/__init__.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/ssl_pyopenssl.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 2 | ||||
| -rw-r--r-- | release.py | 8 |
5 files changed, 9 insertions, 7 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index 29621193..78b7b883 100644 --- a/cherrypy/__init__.py +++ b/cherrypy/__init__.py @@ -57,7 +57,7 @@ These API's are described in the CherryPy specification: http://www.cherrypy.org/wiki/CherryPySpec """ -__version__ = "3.2.5" +__version__ = "3.2.6" from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode from cherrypy._cpcompat import basestring, unicodestr, set diff --git a/cherrypy/wsgiserver/ssl_pyopenssl.py b/cherrypy/wsgiserver/ssl_pyopenssl.py index 42745fbc..1a9ecdec 100644 --- a/cherrypy/wsgiserver/ssl_pyopenssl.py +++ b/cherrypy/wsgiserver/ssl_pyopenssl.py @@ -105,6 +105,8 @@ class SSL_fileobject(wsgiserver.CP_fileobject): p = self._sock.pending() if not p: return "".join(buf) + elif len("".join(buf)) + p >= args[0]: + return "".join(buf) def sendall(self, *args, **kwargs): return self._safe_call(False, super(SSL_fileobject, self).sendall, diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index 4192c2dc..382d39a7 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1659,7 +1659,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.5" + version = "CherryPy/3.2.6" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 0467c10d..58635f43 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -1384,7 +1384,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.5" + version = "CherryPy/3.2.6" """A version string for the HTTPServer.""" software = None @@ -15,10 +15,9 @@ import platform import shutil import importlib -VERSION='3.2.5' +from six.moves import input -if sys.version_info < (3,): - input = raw_input +VERSION='3.2.6' def get_next_version(): print("The last release on this branch was {version}".format( @@ -27,7 +26,8 @@ def get_next_version(): NEXT_VERSION = get_next_version() -files_with_versions = ('release.py', 'setup.py', 'cherrypy/__init__.py', +files_with_versions = ( + 'release.py', 'setup.py', 'cherrypy/__init__.py', 'cherrypy/wsgiserver/wsgiserver2.py', 'cherrypy/wsgiserver/wsgiserver3.py', ) |