cleemesser avatar cleemesser committed a32e197

add patch to cherrypy 3.2's wsgiserver

Comments (0)

Files changed (2)

patches/README-patches.txt

+cherrypy-3.2-wsgiserver-dir.patch was created in this directory with the following command::
+
+ $ diff -r ../django_wsgiserver/wsgiserver ../../cherrypy/cherrypy/wsgiserver/ > cherrypy-3.2-wsgiserver-dir.patch
+
+It's meant to help maintain the patches for wsgiserver versus cherrypy 3.2 

patches/cherrypy-3.2-wsgiserver-dir.patch

+diff -r ../django_wsgiserver/wsgiserver/ssl_builtin.py ../../cherrypy/cherrypy/wsgiserver/ssl_builtin.py
+24c24
+< from django_wsgiserver import wsgiserver
+---
+> from cherrypy import wsgiserver
+Only in ../django_wsgiserver/wsgiserver: ssl_builtin.pyc
+diff -r ../django_wsgiserver/wsgiserver/ssl_pyopenssl.py ../../cherrypy/cherrypy/wsgiserver/ssl_pyopenssl.py
+37c37
+< from django_wsgiserver import wsgiserver
+---
+> from cherrypy import wsgiserver
+diff -r ../django_wsgiserver/wsgiserver/wsgiserver2.py ../../cherrypy/cherrypy/wsgiserver/wsgiserver2.py
+230,232c230
+<                 # raise ValueError("Illegal header line.")
+<                 #print "Illegal header line" # ignore illegal headers instead of cherrpy blow up, add loging !!! -clm
+<                 continue 
+---
+>                 raise ValueError("Illegal header line.")
+1808c1806
+<                 from django_wsgiserver.wsgiserver.ssl_pyopenssl import pyOpenSSLAdapter
+---
+>                 from cherrypy.wsgiserver.ssl_pyopenssl import pyOpenSSLAdapter
+2072,2073c2070,2071
+<     'builtin': 'django_wsgiserver.wsgiserver.ssl_builtin.BuiltinSSLAdapter',
+<     'pyopenssl': 'django_wsgiserver.wsgiserver.ssl_pyopenssl.pyOpenSSLAdapter',
+---
+>     'builtin': 'cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter',
+>     'pyopenssl': 'cherrypy.wsgiserver.ssl_pyopenssl.pyOpenSSLAdapter',
+diff -r ../django_wsgiserver/wsgiserver/wsgiserver3.py ../../cherrypy/cherrypy/wsgiserver/wsgiserver3.py
+217,218d216
+<                 #logger.error("400 Bad Request: Illegal header line") # ignore illegal headers instead of cherrpy blow up, add loging !!! -clm
+<                 continue 
+1777c1775
+<     'builtin': 'django_wsgiserver.wsgiserver.ssl_builtin.BuiltinSSLAdapter',
+---
+>     'builtin': 'cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter',
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.