diff options
| author | Ian Bicking <ianb@colorstudy.com> | 2010-09-14 10:59:50 -0500 |
|---|---|---|
| committer | Ian Bicking <ianb@colorstudy.com> | 2010-09-14 10:59:50 -0500 |
| commit | 13af02868e92e1fca24985c1b341aab23f9bfc58 (patch) | |
| tree | 14e4dff4770c98d112588ef5edf6b6eccb9b2bc6 /paste/httpserver.py | |
| parent | f47b88b10ff354e1df8692f45c0941377691f549 (diff) | |
| parent | 2f43ca51972a0cfa19b8dfedb38aa1eca3d21d79 (diff) | |
| download | paste-13af02868e92e1fca24985c1b341aab23f9bfc58.tar.gz | |
Automated merge with ssh://bitbucket.org/ianb/paste
Diffstat (limited to 'paste/httpserver.py')
| -rwxr-xr-x | paste/httpserver.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py index 007f8d7..7865fce 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -183,7 +183,7 @@ class WSGIHandlerMixin: if endslash and path != '/': # Put the slash back... path += '/' - (server_name, server_port) = self.server.server_address + (server_name, server_port) = self.server.server_address[:2] rfile = self.rfile if 'HTTP/1.1' == self.protocol_version and \ @@ -1243,7 +1243,7 @@ def serve(application, host=None, port=None, handler=None, ssl_pem=None, threadpool. See paste.httpserver.ThreadPool for specific options (``threadpool_workers`` is a specific option that can also go here). - + ``request_queue_size`` The 'backlog' argument to socket.listen(); specifies the @@ -1300,7 +1300,7 @@ def serve(application, host=None, port=None, handler=None, ssl_pem=None, if converters.asbool(start_loop): protocol = is_ssl and 'https' or 'http' - host, port = server.server_address + host, port = server.server_address[:2] if host == '0.0.0.0': print 'serving on 0.0.0.0:%s view at %s://127.0.0.1:%s' % \ (port, protocol, port) @@ -1400,7 +1400,7 @@ server_runner.__doc__ = (serve.__doc__ or '') + """ When threads are killed or the process restarted, this email address will be contacted (using an SMTP server on localhost). - + """ @@ -1409,4 +1409,3 @@ if __name__ == '__main__': #serve(dump_environ, ssl_pem="test.pem") serve(dump_environ, server_version="Wombles/1.0", protocol_version="HTTP/1.1", port="8888") - |