Robert Brewer avatar Robert Brewer committed 2b254ad

Buglet in _cpwsgi_server: ssl attributes were being set on the class, not the instance.

Comments (0)

Files changed (1)

cherrypy/_cpwsgi_server.py

         ssl_module = self.server_adapter.ssl_module or 'pyopenssl'
         if self.server_adapter.ssl_context:
             adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
-            s.ssl_adapter = adapter_class(self.server_adapter.ssl_certificate,
-                                          self.server_adapter.ssl_private_key,
-                                          self.server_adapter.ssl_certificate_chain)
-            s.ssl_adapter.context = self.server_adapter.ssl_context
+            self.ssl_adapter = adapter_class(
+                self.server_adapter.ssl_certificate,
+                self.server_adapter.ssl_private_key,
+                self.server_adapter.ssl_certificate_chain)
+            self.ssl_adapter.context = self.server_adapter.ssl_context
         elif self.server_adapter.ssl_certificate:
             adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
-            s.ssl_adapter = adapter_class(self.server_adapter.ssl_certificate,
-                                          self.server_adapter.ssl_private_key,
-                                          self.server_adapter.ssl_certificate_chain)
+            self.ssl_adapter = adapter_class(
+                self.server_adapter.ssl_certificate,
+                self.server_adapter.ssl_private_key,
+                self.server_adapter.ssl_certificate_chain)
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.