Changeset 1823

Timestamp:

11/10/07 19:55:58

Author:

fumanchu

Message:

modpython/modwsgi fixes.

Files:

• branches/simpleserver/cherrypy/_cpmodpy.py (modified) (1 diff)
• branches/simpleserver/cherrypy/test/modpy.py (modified) (2 diffs)
• branches/simpleserver/cherrypy/test/modwsgi.py (modified) (1 diff)

branches/simpleserver/cherrypy/_cpmodpy.py

@@ -90 +90 @@
-                            })
-    
+    cherrypy.server.unsubscribe()
-    cherrypy.engine.start()
-    

branches/simpleserver/cherrypy/test/modpy.py

@@ -56 +56 @@
-
-
-apache
+httpd
-CONF_PATH = "test_mp.conf"
-
@@ -128 +128 @@
-        mod.setup_server()
-        
+        cherrypy.server.unsubscribe()
-        cherrypy.engine.start()
-    from mod_python import apache

branches/simpleserver/cherrypy/test/modwsgi.py

@@ -141 +141 @@
-            "engine.SIGTERM": None,
-            })
+        cherrypy.server.unsubscribe()
-        cherrypy.engine.start(blocking=False)
-    return cherrypy.tree(environ, start_response)