diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
| commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
| tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /python/python-ssl.patch | |
| parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) | |
Resync to trunk, windows non-pro buildaoo/aw080
Diffstat (limited to 'python/python-ssl.patch')
| -rw-r--r-- | python/python-ssl.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/python-ssl.patch b/python/python-ssl.patch index 02923e9133f8..04921f354612 100644 --- a/python/python-ssl.patch +++ b/python/python-ssl.patch @@ -1,15 +1,15 @@ -diff -ru misc/Python-2.7.5/PCbuild/build_ssl.py misc/build/Python-2.7.5/PCbuild/build_ssl.py ---- misc/Python-2.7.5/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500 +diff -ru misc/Python-2.7.6/PCbuild/build_ssl.py misc/build/Python-2.7.6/PCbuild/build_ssl.py +--- misc/Python-2.7.6/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500 @@ -253,4 +253,4 @@ sys.exit(rc) if __name__=='__main__': - main() + sys.exit(0) -diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py ---- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/setup.py 2012-07-25 14:37:37.000000000 -0500 +diff -ru misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py +--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/setup.py 2012-07-25 14:37:37.000000000 -0500 @@ -702,7 +702,15 @@ exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) |