Robert Brewer avatar Robert Brewer committed 99844c9

Fix for #844 (mod_python timeout w/ CherryPy 3.1).

Comments (0)

Files changed (1)

cherrypy/_cpmodpy.py

 
 
 # We will use this method from the mod_python configuration
-# as the entyr point to our application
+# as the entry point to our application
 def setup_server():
-    cherrypy.tree.mount(Root())
     cherrypy.config.update({'environment': 'production',
                             'log.screen': False,
                             'show_tracebacks': False})
-    # You must start the engine in a non-blocking fashion
-    # so that mod_python can proceed
-    cherrypy.engine.start(blocking=False)
+    cherrypy.tree.mount(Root())
 
 ##########################################
 # mod_python settings for apache2
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.