Stephan Kulow 2010-09-21 14:20:03 +00:00 committed by Git OBS Bridge
parent 041cdcf084
commit 9e50977fa3
3 changed files with 0 additions and 50 deletions

View File

@ -1,23 +0,0 @@
# force use of directories passed to configure script
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in.orig
+++ Makefile.pre.in
@@ -86,12 +86,12 @@ exec_prefix= @exec_prefix@
datarootdir= @datarootdir@
# Expanded directories
-BINDIR= $(exec_prefix)/bin
-LIBDIR= $(exec_prefix)/lib
+BINDIR= @bindir@
+LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
-CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+CONFINCLUDEDIR= @includedir@
+SCRIPTDIR= @libdir@
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)

View File

@ -1,16 +0,0 @@
--- Lib/ssl.py
+++ Lib/ssl.py
@@ -112,12 +112,7 @@
keyfile, certfile,
cert_reqs, ssl_version, ca_certs)
if do_handshake_on_connect:
- timeout = self.gettimeout()
- try:
- self.settimeout(None)
- self.do_handshake()
- finally:
- self.settimeout(timeout)
+ self.do_handshake()
self.keyfile = keyfile
self.certfile = certfile
self.cert_reqs = cert_reqs

View File

@ -1,11 +0,0 @@
--- Modules/_ssl.c
+++ Modules/_ssl.c
@@ -311,6 +311,8 @@
goto fail;
}
+ SSL_CTX_set_options(self->ctx, SSL_OP_ALL); /* ssl compatibility */
+
if (certreq != PY_SSL_CERT_NONE) {
if (cacerts_file == NULL) {
errstr = ERRSTR("No root certificates specified for "