Update to 0.11.3. Fixes bug #1559204
This commit is contained in:
Kevin Fenzi
parent
6dc941b384
commit
a3b054e3e3
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ httplib2-0.4.0.tar.gz
|
||||
/httplib2-0.9.1.tar.gz
|
||||
/httplib2-0.9.2.tar.gz
|
||||
/httplib2-0.10.3.tar.gz
|
||||
/httplib2-0.11.3.tar.gz
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
|
||||
--- httplib2-0.9.orig/python2/httplib2/__init__.py 2015-04-03 12:56:04.834370332 -0600
|
||||
+++ httplib2-0.9/python2/httplib2/__init__.py 2015-04-03 12:58:16.441925454 -0600
|
||||
@@ -838,7 +838,11 @@
|
||||
diff -Nur httplib2-0.11.3.orig/python2/httplib2/__init__.py httplib2-0.11.3/python2/httplib2/__init__.py
|
||||
--- httplib2-0.11.3.orig/python2/httplib2/__init__.py 2018-06-10 17:27:19.397359583 -0700
|
||||
+++ httplib2-0.11.3/python2/httplib2/__init__.py 2018-06-10 17:27:57.789525463 -0700
|
||||
@@ -895,7 +895,11 @@
|
||||
else:
|
||||
port = dict(https=443, http=80)[method]
|
||||
|
||||
- proxy_type = 3 # socks.PROXY_TYPE_HTTP
|
||||
- proxy_type = 3 # socks.PROXY_TYPE_HTTP
|
||||
+ if method == 'http':
|
||||
+ proxy_type = 4 # socks.PROXY_TYPE_HTTP_NO_TUNNEL
|
||||
+ else:
|
||||
+ proxy_type = 3 # socks.PROXY_TYPE_HTTP
|
||||
+
|
||||
return ProxyInfo(
|
||||
pi = ProxyInfo(
|
||||
proxy_type = proxy_type,
|
||||
proxy_host = host,
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
|
||||
--- httplib2-0.9.orig/python2/httplib2/__init__.py 2014-04-14 06:52:57.000000000 -0600
|
||||
+++ httplib2-0.9/python2/httplib2/__init__.py 2014-05-23 21:17:02.082118837 -0600
|
||||
@@ -191,8 +191,10 @@
|
||||
diff -Nur httplib2-0.11.3.orig/python2/httplib2/__init__.py httplib2-0.11.3/python2/httplib2/__init__.py
|
||||
--- httplib2-0.11.3.orig/python2/httplib2/__init__.py 2018-06-10 17:12:37.289548256 -0700
|
||||
+++ httplib2-0.11.3/python2/httplib2/__init__.py 2018-06-10 17:16:52.193649649 -0700
|
||||
@@ -218,8 +218,9 @@
|
||||
CA_CERTS = ca_certs_locater.get()
|
||||
except ImportError:
|
||||
# Default CA certificates file bundled with httplib2.
|
||||
- CA_CERTS = os.path.join(
|
||||
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+# CA_CERTS = os.path.join(
|
||||
+# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+# Use Fedora system-wide shared certificate store for security, consistency.
|
||||
+ #CA_CERTS = os.path.join(
|
||||
+ # os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+ CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
|
||||
|
||||
# Which headers are hop-by-hop headers by default
|
||||
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
||||
--- httplib2-0.9/python3/httplib2/__init__.py 2014-04-14 05:52:57.000000000 -0700
|
||||
+++ httplib2-0.9/python3/httplib2/__init__.py.new 2015-01-12 17:22:19.815505848 -0800
|
||||
@@ -124,8 +124,10 @@
|
||||
diff -Nur httplib2-0.11.3.orig/python3/httplib2/__init__.py httplib2-0.11.3/python3/httplib2/__init__.py
|
||||
--- httplib2-0.11.3.orig/python3/httplib2/__init__.py 2018-03-29 19:28:43.000000000 -0700
|
||||
+++ httplib2-0.11.3/python3/httplib2/__init__.py 2018-06-10 17:18:19.267025891 -0700
|
||||
@@ -125,8 +125,9 @@
|
||||
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
||||
|
||||
# Default CA certificates file bundled with httplib2.
|
||||
@ -24,8 +24,7 @@ diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/ht
|
||||
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+#CA_CERTS = os.path.join(
|
||||
+# os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
||||
+# Use Fedora system-wide shared certificate store for security, consistency.
|
||||
+CA_CERTS = "/etc/pki/tls/certs/ca-bundle.crt"
|
||||
|
||||
def _get_end2end_headers(response):
|
||||
hopbyhop = list(HOP_BY_HOP)
|
||||
# PROTOCOL_TLS is python 3.5.3+. PROTOCOL_SSLv23 is deprecated.
|
||||
# Both PROTOCOL_TLS and PROTOCOL_SSLv23 are equivalent and means:
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
%endif
|
||||
|
||||
Name: python-httplib2
|
||||
Version: 0.10.3
|
||||
Release: 3%{?dist}
|
||||
Version: 0.11.3
|
||||
Release: 1%{?dist}
|
||||
Summary: A comprehensive HTTP client library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
@ -101,6 +101,9 @@ popd
|
||||
%endif # with_python3
|
||||
|
||||
%changelog
|
||||
* Sun Jun 10 2018 Kevin Fenzi <kevin@scrye.com> - 0.11.3-1
|
||||
- Update to 0.11.3. Fixes bug #1559204
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (httplib2-0.10.3.tar.gz) = d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
|
||||
SHA512 (httplib2-0.11.3.tar.gz) = e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
|
||||
|
||||
Loading…
Reference in New Issue
Block a user