Fix bug #57
diff --git a/CHANGELOG b/CHANGELOG
old mode 100644
new mode 100755
diff --git a/MANIFEST b/MANIFEST
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/README b/README
old mode 100644
new mode 100755
diff --git a/doc/html/_sources/index.txt b/doc/html/_sources/index.txt
old mode 100644
new mode 100755
diff --git a/doc/html/_sources/libhttplib2.txt b/doc/html/_sources/libhttplib2.txt
old mode 100644
new mode 100755
diff --git a/doc/html/_static/contents.png b/doc/html/_static/contents.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/doc/html/_static/default.css b/doc/html/_static/default.css
old mode 100644
new mode 100755
diff --git a/doc/html/_static/doctools.js b/doc/html/_static/doctools.js
old mode 100644
new mode 100755
diff --git a/doc/html/_static/file.png b/doc/html/_static/file.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/doc/html/_static/interface.js b/doc/html/_static/interface.js
old mode 100644
new mode 100755
diff --git a/doc/html/_static/jquery.js b/doc/html/_static/jquery.js
old mode 100644
new mode 100755
diff --git a/doc/html/_static/minus.png b/doc/html/_static/minus.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/doc/html/_static/navigation.png b/doc/html/_static/navigation.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/doc/html/_static/plus.png b/doc/html/_static/plus.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/doc/html/_static/pygments.css b/doc/html/_static/pygments.css
old mode 100644
new mode 100755
diff --git a/doc/html/_static/rightsidebar.css b/doc/html/_static/rightsidebar.css
old mode 100644
new mode 100755
diff --git a/doc/html/_static/searchtools.js b/doc/html/_static/searchtools.js
old mode 100644
new mode 100755
diff --git a/doc/html/_static/sphinxdoc.css b/doc/html/_static/sphinxdoc.css
old mode 100644
new mode 100755
diff --git a/doc/html/_static/stickysidebar.css b/doc/html/_static/stickysidebar.css
old mode 100644
new mode 100755
diff --git a/doc/html/_static/traditional.css b/doc/html/_static/traditional.css
old mode 100644
new mode 100755
diff --git a/doc/html/genindex.html b/doc/html/genindex.html
old mode 100644
new mode 100755
diff --git a/doc/html/index.html b/doc/html/index.html
old mode 100644
new mode 100755
diff --git a/doc/html/libhttplib2.html b/doc/html/libhttplib2.html
old mode 100644
new mode 100755
diff --git a/doc/html/modindex.html b/doc/html/modindex.html
old mode 100644
new mode 100755
diff --git a/doc/html/search.html b/doc/html/search.html
old mode 100644
new mode 100755
diff --git a/doc/html/searchindex.json b/doc/html/searchindex.json
old mode 100644
new mode 100755
diff --git a/httplib2/__init__.py b/httplib2/__init__.py
old mode 100644
new mode 100755
index 2848be7..684e1ce
--- a/httplib2/__init__.py
+++ b/httplib2/__init__.py
@@ -742,10 +742,10 @@
def __init__(self, host, port=None, key_file=None, cert_file=None,
strict=None, timeout=None, proxy_info=None):
- self.timeout = timeout
- self.proxy_info = proxy_info
httplib.HTTPSConnection.__init__(self, host, port=port, key_file=key_file,
cert_file=cert_file, strict=strict)
+ self.timeout = timeout
+ self.proxy_info = proxy_info
def connect(self):
"Connect to a host on a given (SSL) port."
diff --git a/httplib2/iri2uri.py b/httplib2/iri2uri.py
old mode 100644
new mode 100755
diff --git a/httplib2test.py b/httplib2test.py
index cc0e578..b812a53 100755
--- a/httplib2test.py
+++ b/httplib2test.py
@@ -611,6 +611,10 @@
self.assertTrue(content.startswith("Request Timeout"))
+ def testHTTPSInitTimeout(self):
+ c = httplib2.HTTPSConnectionWithTimeout('localhost', 80, timeout=47)
+ self.assertEqual(47, c.timeout)
+
def testGetDeflate(self):
# Test that we support deflate compression
uri = urlparse.urljoin(base, "deflate/deflated.asis")
diff --git a/index.html b/index.html
old mode 100644
new mode 100755
diff --git a/libhttplib2.tex b/libhttplib2.tex
old mode 100644
new mode 100755
diff --git a/ref.tex b/ref.tex
old mode 100644
new mode 100755
diff --git a/ref/about.html b/ref/about.html
old mode 100644
new mode 100755
diff --git a/ref/blank.png b/ref/blank.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/cache-objects.html b/ref/cache-objects.html
old mode 100644
new mode 100755
diff --git a/ref/contents.html b/ref/contents.html
old mode 100644
new mode 100755
diff --git a/ref/contents.png b/ref/contents.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/http-objects.html b/ref/http-objects.html
old mode 100644
new mode 100755
diff --git a/ref/httplib2-example.html b/ref/httplib2-example.html
old mode 100644
new mode 100755
diff --git a/ref/images.idx b/ref/images.idx
old mode 100644
new mode 100755
diff --git a/ref/img1.old b/ref/img1.old
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/img1.png b/ref/img1.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/img2.old b/ref/img2.old
old mode 100644
new mode 100755
diff --git a/ref/img2.png b/ref/img2.png
old mode 100644
new mode 100755
diff --git a/ref/index.html b/ref/index.html
old mode 100644
new mode 100755
diff --git a/ref/index.png b/ref/index.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/modimages.idx b/ref/modimages.idx
old mode 100644
new mode 100755
diff --git a/ref/module-httplib2.html b/ref/module-httplib2.html
old mode 100644
new mode 100755
diff --git a/ref/modules.png b/ref/modules.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/next.png b/ref/next.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/node2.html b/ref/node2.html
old mode 100644
new mode 100755
diff --git a/ref/previous.png b/ref/previous.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/pyfav.png b/ref/pyfav.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/ref/ref.css b/ref/ref.css
old mode 100644
new mode 100755
diff --git a/ref/ref.html b/ref/ref.html
old mode 100644
new mode 100755
diff --git a/ref/response-objects.html b/ref/response-objects.html
old mode 100644
new mode 100755
diff --git a/ref/up.png b/ref/up.png
old mode 100644
new mode 100755
Binary files differ
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
diff --git a/test/.htaccess b/test/.htaccess
old mode 100644
new mode 100755
diff --git a/test/300/final-destination.txt b/test/300/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/300/with-location-header.asis b/test/300/with-location-header.asis
old mode 100644
new mode 100755
diff --git a/test/300/without-location-header.asis b/test/300/without-location-header.asis
old mode 100644
new mode 100755
diff --git a/test/301/final-destination.txt b/test/301/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/301/onestep.asis b/test/301/onestep.asis
old mode 100644
new mode 100755
diff --git a/test/302/.myhtaccess b/test/302/.myhtaccess
old mode 100644
new mode 100755
diff --git a/test/302/final-destination.txt b/test/302/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/302/no-location.asis b/test/302/no-location.asis
old mode 100644
new mode 100755
diff --git a/test/302/onestep.asis b/test/302/onestep.asis
old mode 100644
new mode 100755
diff --git a/test/302/twostep.asis b/test/302/twostep.asis
old mode 100644
new mode 100755
diff --git a/test/303/final-destination.txt b/test/303/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/304/last-modified-only/.htaccess b/test/304/last-modified-only/.htaccess
old mode 100644
new mode 100755
diff --git a/test/304/last-modified-only/last-modified-only.txt b/test/304/last-modified-only/last-modified-only.txt
old mode 100644
new mode 100755
diff --git a/test/304/test_etag.txt b/test/304/test_etag.txt
old mode 100644
new mode 100755
diff --git a/test/307/final-destination.txt b/test/307/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/307/onestep.asis b/test/307/onestep.asis
old mode 100644
new mode 100755
diff --git a/test/410/410.asis b/test/410/410.asis
old mode 100644
new mode 100755
diff --git a/test/basic-nested/.htaccess b/test/basic-nested/.htaccess
old mode 100644
new mode 100755
diff --git a/test/basic-nested/passwdfile b/test/basic-nested/passwdfile
old mode 100644
new mode 100755
diff --git a/test/basic-nested/subdir/.htaccess b/test/basic-nested/subdir/.htaccess
old mode 100644
new mode 100755
diff --git a/test/basic-nested/subdir/passwdfile b/test/basic-nested/subdir/passwdfile
old mode 100644
new mode 100755
diff --git a/test/basic/.htaccess b/test/basic/.htaccess
old mode 100644
new mode 100755
diff --git a/test/basic/passwdfile b/test/basic/passwdfile
old mode 100644
new mode 100755
diff --git a/test/basic2/.htaccess b/test/basic2/.htaccess
old mode 100644
new mode 100755
diff --git a/test/basic2/passwdfile b/test/basic2/passwdfile
old mode 100644
new mode 100755
diff --git a/test/deflate/deflated-content b/test/deflate/deflated-content
old mode 100644
new mode 100755
Binary files differ
diff --git a/test/deflate/deflated-headers.txt b/test/deflate/deflated-headers.txt
old mode 100644
new mode 100755
diff --git a/test/deflate/deflated.asis b/test/deflate/deflated.asis
old mode 100644
new mode 100755
Binary files differ
diff --git a/test/deflate/failed-compression.asis b/test/deflate/failed-compression.asis
old mode 100644
new mode 100755
diff --git a/test/digest-expire/.htaccess b/test/digest-expire/.htaccess
old mode 100644
new mode 100755
diff --git a/test/digest-expire/file.txt b/test/digest-expire/file.txt
old mode 100644
new mode 100755
diff --git a/test/digest/.htaccess b/test/digest/.htaccess
old mode 100644
new mode 100755
diff --git a/test/digest/file.txt b/test/digest/file.txt
old mode 100644
new mode 100755
diff --git a/test/duplicate-headers/multilink.asis b/test/duplicate-headers/multilink.asis
old mode 100644
new mode 100755
diff --git a/test/gzip/.htaccess b/test/gzip/.htaccess
old mode 100644
new mode 100755
diff --git a/test/gzip/failed-compression.asis b/test/gzip/failed-compression.asis
old mode 100644
new mode 100755
diff --git a/test/gzip/final-destination.txt b/test/gzip/final-destination.txt
old mode 100644
new mode 100755
diff --git a/test/no-store/no-store.asis b/test/no-store/no-store.asis
old mode 100644
new mode 100755
diff --git a/test/test.asis b/test/test.asis
old mode 100644
new mode 100755
