Changeset 2018
- Timestamp:
- 07/09/08 01:22:41
- Files:
-
- trunk/cherrypy/cherryd (modified) (1 diff)
- trunk/cherrypy/test/fastcgi.bat (added)
- trunk/cherrypy/test/fastcgi.py (added)
- trunk/cherrypy/test/fcgi.conf (added)
- trunk/cherrypy/test/modfcgid.py (added)
- trunk/cherrypy/test/test.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/cherryd
r2010 r2018 37 37 38 38 if fastcgi: 39 # turn off autoreload when using fastcgi40 cherrypy.config.update({' autoreload.on': False})39 # Turn off autoreload when using fastcgi. 40 cherrypy.config.update({'engine.autoreload_on': False}) 41 41 42 42 cherrypy.server.unsubscribe() 43 43 44 fastcgi_port = cherrypy.config.get('server.socket_port', 4000) 45 fastcgi_bindaddr = cherrypy.config.get('server.socket_host', '0.0.0.0') 46 bindAddress = (fastcgi_bindaddr, fastcgi_port) 44 sock_file = cherrypy.config.get('server.socket_file', None) 45 if sock_file: 46 bindAddress = sock_file 47 else: 48 fastcgi_port = cherrypy.config.get('server.socket_port', 4000) 49 fastcgi_bindaddr = cherrypy.config.get('server.socket_host', '0.0.0.0') 50 bindAddress = (fastcgi_bindaddr, fastcgi_port) 47 51 f = servers.FlupFCGIServer(application=cherrypy.tree, bindAddress=bindAddress) 48 52 s = servers.ServerAdapter(engine, httpserver=f, bind_addr=bindAddress) trunk/cherrypy/test/test.py
r2003 r2018 91 91 'modpygw': "modpygw", 92 92 'modwsgi': "modwsgi", 93 'modfcgid': "modfcgid", 93 94 } 94 95 default_server = "wsgi" … … 333 334 "http", self.interactive) 334 335 h.use_wsgi = True 336 elif self.server == 'modfcgid': 337 from cherrypy.test import modfcgid 338 h = modfcgid.FCGITestHarness(self.tests, self.server, 339 self.protocol, self.port, 340 "http", self.interactive) 335 341 else: 336 342 h = TestHarness(self.tests, self.server, self.protocol,
