daveschaefer avatar daveschaefer committed bf4a94e Merge

Merge cherrypy changes from main depo into local

Comments (0)

Files changed (4)

cherrypy/wsgiserver/wsgiserver2.py

             af, socktype, proto, canonname, sa = res
             try:
                 self.bind(af, socktype, proto)
-            except socket.error:
+            except socket.error, serr:
+                msg = "%s -- (%s: %s)" % (msg, sa, serr)
                 if self.socket:
                     self.socket.close()
                 self.socket = None

cherrypy/wsgiserver/wsgiserver3.py

             af, socktype, proto, canonname, sa = res
             try:
                 self.bind(af, socktype, proto)
-            except socket.error:
+            except socket.error as serr:
+                msg = "%s -- (%s: %s)" % (msg, sa, serr)
                 if self.socket:
                     self.socket.close()
                 self.socket = None

sphinx/source/progguide/security.rst

     [/]
     tools.sessions.on = True
     # increase security on sessions
-    tools.session.secure = True
+    tools.sessions.secure = True
     tools.sessions.httponly = True
 
 

sphinx/source/tutorial/REST.rst

 
 Represents the Read method in CRUD.
 
-Add a new method to the file ``songs.py``, called ``GET``::
+Add a new method to the ``Songs`` class in ``songs.py``, called ``GET``::
 
     def GET(self, id=None):
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.