diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/pycurl/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/pycurl/files')
-rw-r--r-- | dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch b/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch new file mode 100644 index 000000000000..c7e1580f54f4 --- /dev/null +++ b/dev-python/pycurl/files/pycurl-7.19.3.1-ssl-test.patch @@ -0,0 +1,64 @@ +https://github.com/p-push/pycurl/commit/8644393bec56cd05c19d5dbe420ff741ba899d10 +diff --git a/tests/runwsgi.py b/tests/runwsgi.py +index f419d7c..242ef1d 100644 +--- a/tests/runwsgi.py ++++ b/tests/runwsgi.py +@@ -11,6 +11,10 @@ + + class Server(bottle.WSGIRefServer): + def run(self, handler): # pragma: no cover ++ self.srv = self.make_server(handler) ++ self.serve() ++ ++ def make_server(self, handler): + from wsgiref.simple_server import make_server, WSGIRequestHandler + if self.quiet: + base = self.options.get('handler_class', WSGIRequestHandler) +@@ -18,7 +22,10 @@ class QuietHandler(base): + def log_request(*args, **kw): + pass + self.options['handler_class'] = QuietHandler +- self.srv = make_server(self.host, self.port, handler, **self.options) ++ srv = make_server(self.host, self.port, handler, **self.options) ++ return srv ++ ++ def serve(self): + if sys.version_info[0] == 2 and sys.version_info[1] < 6: + # python 2.5 has no poll_interval + # and thus no way to stop the server +@@ -27,20 +34,21 @@ def log_request(*args, **kw): + else: + self.srv.serve_forever(poll_interval=0.1) + +-class SslServer(bottle.CherryPyServer): +- def run(self, handler): +- import cherrypy.wsgiserver, cherrypy.wsgiserver.ssl_builtin +- server = cherrypy.wsgiserver.CherryPyWSGIServer((self.host, self.port), handler) ++# http://www.socouldanyone.com/2014/01/bottle-with-ssl.html ++# https://github.com/mfm24/miscpython/blob/master/bottle_ssl.py ++class SslServer(Server): ++ def run(self, handler): # pragma: no cover ++ self.srv = self.make_server(handler) ++ ++ import ssl + cert_dir = os.path.join(os.path.dirname(__file__), 'certs') +- ssl_adapter = cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter( +- os.path.join(cert_dir, 'server.crt'), +- os.path.join(cert_dir, 'server.key'), +- ) +- server.ssl_adapter = ssl_adapter +- try: +- server.start() +- finally: +- server.stop() ++ self.srv.socket = ssl.wrap_socket( ++ self.srv.socket, ++ keyfile=os.path.join(cert_dir, 'server.key'), ++ certfile=os.path.join(cert_dir, 'server.crt'), ++ server_side=True) ++ ++ self.serve() + + def start_bottle_server(app, port, server, **kwargs): + server_thread = ServerThread(app, port, server, kwargs) + |