Changeset 1347
- Timestamp:
- 09/10/06 17:05:13
- Files:
-
- trunk/cherrypy/_cpserver.py (modified) (3 diffs)
- trunk/cherrypy/test/test_core.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpserver.py
r1345 r1347 99 99 def _start_http(self, httpserver): 100 100 """Start the given httpserver in a new thread.""" 101 scheme = "http" 102 if getattr(httpserver, "ssl_certificate", None): 103 scheme = "https" 101 104 bind_addr = self.httpservers[httpserver] 102 105 if isinstance(bind_addr, tuple): … … 105 108 if not host: 106 109 host = '0.0.0.0' 107 on_what = " http://%s:%s/" % (host, port)110 on_what = "%s://%s:%s/" % (scheme, host, port) 108 111 else: 109 112 on_what = "socket file: %s" % bind_addr … … 114 117 115 118 self.wait(httpserver) 116 cherrypy.log("Serving HTTP on %s" % on_what, 'HTTP')119 cherrypy.log("Serving %s on %s" % (scheme.upper(), on_what), 'HTTP') 117 120 118 121 def _start_http_thread(self, httpserver): trunk/cherrypy/test/test_core.py
r1345 r1347 775 775 if cherrypy.server.protocol_version == "HTTP/1.1": 776 776 # Test RFC-2047-encoded request and response header values 777 self.getPage("/headers/ifmatch",778 [('If-Match', '=?utf-8?q?=E2=84=ABngstr=C3=B6m?=')])777 c = "=E2=84=ABngstr=C3=B6m" 778 self.getPage("/headers/ifmatch", [('If-Match', '=?utf-8?q?%s?=' % c)]) 779 779 self.assertBody("u'\\u212bngstr\\xf6m'") 780 780 self.assertHeader("ETag", '=?utf-8?b?4oSrbmdzdHLDtm0=?=') 781 781 782 782 # Test a *LONG* RFC-2047-encoded request and response header value 783 c = "=E2=84=ABngstr=C3=B6m"784 783 self.getPage("/headers/ifmatch", 785 784 [('If-Match', '=?utf-8?q?%s?=' % (c * 10))])
