Changeset 1933
- Timestamp:
- 03/26/08 13:45:14
- Files:
-
- trunk/cherrypy/_cpserver.py (modified) (1 diff)
- trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
- trunk/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpserver.py
r1926 r1933 56 56 ssl_certificate = None 57 57 ssl_private_key = None 58 nodelay = True 58 59 59 60 def __init__(self): trunk/cherrypy/_cpwsgi.py
r1867 r1933 350 350 wsgiserver has been designed to not reference CherryPy in any way, 351 351 so that it can be used in other frameworks and applications. Therefore, 352 we wrap it here, so we can set our own mount points from cherrypy.tree. 352 we wrap it here, so we can set our own mount points from cherrypy.tree 353 and apply some attributes from config -> cherrypy.server -> wsgiserver. 353 354 """ 354 355 … … 372 373 ) 373 374 self.protocol = server.protocol_version 375 self.nodelay = server.nodelay 374 376 self.ssl_certificate = server.ssl_certificate 375 377 self.ssl_private_key = server.ssl_private_key trunk/cherrypy/wsgiserver/__init__.py
r1929 r1933 1183 1183 timeout: the timeout in seconds for accepted connections (default 10). 1184 1184 1185 nodelay: if True (the default since 3.1), sets the TCP_NODELAY socket 1186 option. 1187 1185 1188 protocol: the version string to write in the Status-Line of all 1186 1189 HTTP responses. For example, "HTTP/1.1" (the default). This … … 1206 1209 ready = False 1207 1210 _interrupt = None 1211 1212 nodelay = True 1213 1208 1214 ConnectionClass = HTTPConnection 1209 1215 environ = {} … … 1348 1354 self.socket = socket.socket(family, type, proto) 1349 1355 self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) 1350 ## self.socket.setsockopt(socket.SOL_SOCKET, socket.TCP_NODELAY, 1) 1356 if self.nodelay: 1357 self.socket.setsockopt(socket.SOL_SOCKET, socket.TCP_NODELAY, 1) 1351 1358 if self.ssl_certificate and self.ssl_private_key: 1352 1359 if SSL is None:
