equal
deleted
inserted
replaced
1 This patch comes from in-house. It has not yet been submitted upstream, |
1 This patch comes from in-house. It has not yet been submitted upstream, |
2 but submission is planned. |
2 but submission is planned. |
3 |
3 |
4 --- Python-2.7.10/Lib/test/test_ssl.py.~1~ 2015-05-10 10:17:04 -0800 |
4 --- Python-2.7.10/Lib/test/test_ssl.py.~1~ 2015-05-10 10:17:04 -0800 |
5 +++ Python-2.7.10/Lib/test/test_ssl.py 2015-05-18 14:53:04 -0800 |
5 +++ Python-2.7.10/Lib/test/test_ssl.py 2015-05-18 14:53:04 -0800 |
6 @@ -2290,7 +2290,7 @@ |
6 @@ -2315,7 +2315,7 @@ |
7 sys.stdout.write("\n") |
7 sys.stdout.write("\n") |
8 if hasattr(ssl, 'PROTOCOL_SSLv2'): |
8 if hasattr(ssl, 'PROTOCOL_SSLv2'): |
9 try: |
9 try: |
10 - try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True) |
10 - try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True) |
11 + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, False) |
11 + try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, False) |