Fix bug #57

99 files changed, 6 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8138c04..8138c04 100644..100755
--- a/CHANGELOG
+++ b/CHANGELOG
diff --git a/MANIFEST b/MANIFEST
index b780f65..b780f65 100644..100755
--- a/MANIFEST
+++ b/MANIFEST
diff --git a/Makefile b/Makefile
index 12ca5ce..12ca5ce 100644..100755
--- a/Makefile
+++ b/Makefile
diff --git a/README b/README
index 194e7d1..194e7d1 100644..100755
--- a/README
+++ b/README
diff --git a/doc/html/_sources/index.txt b/doc/html/_sources/index.txt
index c435cab..c435cab 100644..100755
--- a/doc/html/_sources/index.txt
+++ b/doc/html/_sources/index.txt
diff --git a/doc/html/_sources/libhttplib2.txt b/doc/html/_sources/libhttplib2.txt
index 9783c47..9783c47 100644..100755
--- a/doc/html/_sources/libhttplib2.txt
+++ b/doc/html/_sources/libhttplib2.txt
diff --git a/doc/html/_static/contents.png b/doc/html/_static/contents.png
index 7fb8215..7fb8215 100644..100755
--- a/doc/html/_static/contents.png
+++ b/doc/html/_static/contents.png
diff --git a/doc/html/_static/default.css b/doc/html/_static/default.css
index ed177c5..ed177c5 100644..100755
--- a/doc/html/_static/default.css
+++ b/doc/html/_static/default.css
diff --git a/doc/html/_static/doctools.js b/doc/html/_static/doctools.js
index b915584..b915584 100644..100755
--- a/doc/html/_static/doctools.js
+++ b/doc/html/_static/doctools.js
diff --git a/doc/html/_static/file.png b/doc/html/_static/file.png
index d18082e..d18082e 100644..100755
--- a/doc/html/_static/file.png
+++ b/doc/html/_static/file.png
diff --git a/doc/html/_static/interface.js b/doc/html/_static/interface.js
index 91a0d4f..91a0d4f 100644..100755
--- a/doc/html/_static/interface.js
+++ b/doc/html/_static/interface.js
diff --git a/doc/html/_static/jquery.js b/doc/html/_static/jquery.js
index 3747929..3747929 100644..100755
--- a/doc/html/_static/jquery.js
+++ b/doc/html/_static/jquery.js
diff --git a/doc/html/_static/minus.png b/doc/html/_static/minus.png
index da1c562..da1c562 100644..100755
--- a/doc/html/_static/minus.png
+++ b/doc/html/_static/minus.png
diff --git a/doc/html/_static/navigation.png b/doc/html/_static/navigation.png
index 1081dc1..1081dc1 100644..100755
--- a/doc/html/_static/navigation.png
+++ b/doc/html/_static/navigation.png
diff --git a/doc/html/_static/plus.png b/doc/html/_static/plus.png
index b3cb374..b3cb374 100644..100755
--- a/doc/html/_static/plus.png
+++ b/doc/html/_static/plus.png
diff --git a/doc/html/_static/pygments.css b/doc/html/_static/pygments.css
index 1f2d2b6..1f2d2b6 100644..100755
--- a/doc/html/_static/pygments.css
+++ b/doc/html/_static/pygments.css
diff --git a/doc/html/_static/rightsidebar.css b/doc/html/_static/rightsidebar.css
index bc604a8..bc604a8 100644..100755
--- a/doc/html/_static/rightsidebar.css
+++ b/doc/html/_static/rightsidebar.css
diff --git a/doc/html/_static/searchtools.js b/doc/html/_static/searchtools.js
index 5fed111..5fed111 100644..100755
--- a/doc/html/_static/searchtools.js
+++ b/doc/html/_static/searchtools.js
diff --git a/doc/html/_static/sphinxdoc.css b/doc/html/_static/sphinxdoc.css
index 2c63178..2c63178 100644..100755
--- a/doc/html/_static/sphinxdoc.css
+++ b/doc/html/_static/sphinxdoc.css
diff --git a/doc/html/_static/stickysidebar.css b/doc/html/_static/stickysidebar.css
index dfc99c7..dfc99c7 100644..100755
--- a/doc/html/_static/stickysidebar.css
+++ b/doc/html/_static/stickysidebar.css
diff --git a/doc/html/_static/traditional.css b/doc/html/_static/traditional.css
index 8c224c0..8c224c0 100644..100755
--- a/doc/html/_static/traditional.css
+++ b/doc/html/_static/traditional.css
diff --git a/doc/html/genindex.html b/doc/html/genindex.html
index 2c3b4f7..2c3b4f7 100644..100755
--- a/doc/html/genindex.html
+++ b/doc/html/genindex.html
diff --git a/doc/html/index.html b/doc/html/index.html
index d241a3e..d241a3e 100644..100755
--- a/doc/html/index.html
+++ b/doc/html/index.html
diff --git a/doc/html/libhttplib2.html b/doc/html/libhttplib2.html
index 78426b1..78426b1 100644..100755
--- a/doc/html/libhttplib2.html
+++ b/doc/html/libhttplib2.html
diff --git a/doc/html/modindex.html b/doc/html/modindex.html
index ac64b92..ac64b92 100644..100755
--- a/doc/html/modindex.html
+++ b/doc/html/modindex.html
diff --git a/doc/html/search.html b/doc/html/search.html
index b680024..b680024 100644..100755
--- a/doc/html/search.html
+++ b/doc/html/search.html
diff --git a/doc/html/searchindex.json b/doc/html/searchindex.json
index 4342f48..4342f48 100644..100755
--- a/doc/html/searchindex.json
+++ b/doc/html/searchindex.json
diff --git a/httplib2/__init__.py b/httplib2/__init__.py
index 2848be7..684e1ce 100644..100755
--- a/httplib2/__init__.py
+++ b/httplib2/__init__.py
@@ -742,10 +742,10 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
 
     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
index 70667ed..70667ed 100644..100755
--- a/httplib2/iri2uri.py
+++ b/httplib2/iri2uri.py
diff --git a/httplib2test.py b/httplib2test.py
index cc0e578..b812a53 100755
--- a/httplib2test.py
+++ b/httplib2test.py
@@ -611,6 +611,10 @@ class HttpTest(unittest.TestCase):
         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
index 0e91a33..0e91a33 100644..100755
--- a/index.html
+++ b/index.html
diff --git a/libhttplib2.tex b/libhttplib2.tex
index 4f93e29..4f93e29 100644..100755
--- a/libhttplib2.tex
+++ b/libhttplib2.tex
diff --git a/ref.tex b/ref.tex
index 8093e3b..8093e3b 100644..100755
--- a/ref.tex
+++ b/ref.tex
diff --git a/ref/about.html b/ref/about.html
index b452de2..b452de2 100644..100755
--- a/ref/about.html
+++ b/ref/about.html
diff --git a/ref/blank.png b/ref/blank.png
index 2af5639..2af5639 100644..100755
--- a/ref/blank.png
+++ b/ref/blank.png
diff --git a/ref/cache-objects.html b/ref/cache-objects.html
index dcf9465..dcf9465 100644..100755
--- a/ref/cache-objects.html
+++ b/ref/cache-objects.html
diff --git a/ref/contents.html b/ref/contents.html
index cfee565..cfee565 100644..100755
--- a/ref/contents.html
+++ b/ref/contents.html
diff --git a/ref/contents.png b/ref/contents.png
index 3429be0..3429be0 100644..100755
--- a/ref/contents.png
+++ b/ref/contents.png
diff --git a/ref/http-objects.html b/ref/http-objects.html
index 597b7d5..597b7d5 100644..100755
--- a/ref/http-objects.html
+++ b/ref/http-objects.html
diff --git a/ref/httplib2-example.html b/ref/httplib2-example.html
index 756942b..756942b 100644..100755
--- a/ref/httplib2-example.html
+++ b/ref/httplib2-example.html
diff --git a/ref/images.idx b/ref/images.idx
index e69de29..e69de29 100644..100755
--- a/ref/images.idx
+++ b/ref/images.idx
diff --git a/ref/img1.old b/ref/img1.old
index c9ce471..c9ce471 100644..100755
--- a/ref/img1.old
+++ b/ref/img1.old
diff --git a/ref/img1.png b/ref/img1.png
index c9ce471..c9ce471 100644..100755
--- a/ref/img1.png
+++ b/ref/img1.png
diff --git a/ref/img2.old b/ref/img2.old
index e69de29..e69de29 100644..100755
--- a/ref/img2.old
+++ b/ref/img2.old
diff --git a/ref/img2.png b/ref/img2.png
index e69de29..e69de29 100644..100755
--- a/ref/img2.png
+++ b/ref/img2.png
diff --git a/ref/index.html b/ref/index.html
index 3627a94..3627a94 100644..100755
--- a/ref/index.html
+++ b/ref/index.html
diff --git a/ref/index.png b/ref/index.png
index cd918af..cd918af 100644..100755
--- a/ref/index.png
+++ b/ref/index.png
diff --git a/ref/modimages.idx b/ref/modimages.idx
index e69de29..e69de29 100644..100755
--- a/ref/modimages.idx
+++ b/ref/modimages.idx
diff --git a/ref/module-httplib2.html b/ref/module-httplib2.html
index ce4d931..ce4d931 100644..100755
--- a/ref/module-httplib2.html
+++ b/ref/module-httplib2.html
diff --git a/ref/modules.png b/ref/modules.png
index 8fa8b75..8fa8b75 100644..100755
--- a/ref/modules.png
+++ b/ref/modules.png
diff --git a/ref/next.png b/ref/next.png
index cfe5e51..cfe5e51 100644..100755
--- a/ref/next.png
+++ b/ref/next.png
diff --git a/ref/node2.html b/ref/node2.html
index e7f5de6..e7f5de6 100644..100755
--- a/ref/node2.html
+++ b/ref/node2.html
diff --git a/ref/previous.png b/ref/previous.png
index 497def4..497def4 100644..100755
--- a/ref/previous.png
+++ b/ref/previous.png
diff --git a/ref/pyfav.png b/ref/pyfav.png
index d2d8669..d2d8669 100644..100755
--- a/ref/pyfav.png
+++ b/ref/pyfav.png
diff --git a/ref/ref.css b/ref/ref.css
index 06a613c..06a613c 100644..100755
--- a/ref/ref.css
+++ b/ref/ref.css
diff --git a/ref/ref.html b/ref/ref.html
index 3627a94..3627a94 100644..100755
--- a/ref/ref.html
+++ b/ref/ref.html
diff --git a/ref/response-objects.html b/ref/response-objects.html
index e3fbab4..e3fbab4 100644..100755
--- a/ref/response-objects.html
+++ b/ref/response-objects.html
diff --git a/ref/up.png b/ref/up.png
index a90e028..a90e028 100644..100755
--- a/ref/up.png
+++ b/ref/up.png
diff --git a/setup.py b/setup.py
index d18a2c9..d18a2c9 100644..100755
--- a/setup.py
+++ b/setup.py
diff --git a/test/.htaccess b/test/.htaccess
index 78b80f6..78b80f6 100644..100755
--- a/test/.htaccess
+++ b/test/.htaccess
diff --git a/test/300/final-destination.txt b/test/300/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/300/final-destination.txt
+++ b/test/300/final-destination.txt
diff --git a/test/300/with-location-header.asis b/test/300/with-location-header.asis
index 16dbf9f..16dbf9f 100644..100755
--- a/test/300/with-location-header.asis
+++ b/test/300/with-location-header.asis
diff --git a/test/300/without-location-header.asis b/test/300/without-location-header.asis
index 4625e31..4625e31 100644..100755
--- a/test/300/without-location-header.asis
+++ b/test/300/without-location-header.asis
diff --git a/test/301/final-destination.txt b/test/301/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/301/final-destination.txt
+++ b/test/301/final-destination.txt
diff --git a/test/301/onestep.asis b/test/301/onestep.asis
index 7360725..7360725 100644..100755
--- a/test/301/onestep.asis
+++ b/test/301/onestep.asis
diff --git a/test/302/.myhtaccess b/test/302/.myhtaccess
index 844154f..844154f 100644..100755
--- a/test/302/.myhtaccess
+++ b/test/302/.myhtaccess
diff --git a/test/302/final-destination.txt b/test/302/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/302/final-destination.txt
+++ b/test/302/final-destination.txt
diff --git a/test/302/no-location.asis b/test/302/no-location.asis
index 4f9d717..4f9d717 100644..100755
--- a/test/302/no-location.asis
+++ b/test/302/no-location.asis
diff --git a/test/302/onestep.asis b/test/302/onestep.asis
index 3db9033..3db9033 100644..100755
--- a/test/302/onestep.asis
+++ b/test/302/onestep.asis
diff --git a/test/302/twostep.asis b/test/302/twostep.asis
index ad0d457..ad0d457 100644..100755
--- a/test/302/twostep.asis
+++ b/test/302/twostep.asis
diff --git a/test/303/final-destination.txt b/test/303/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/303/final-destination.txt
+++ b/test/303/final-destination.txt
diff --git a/test/304/last-modified-only/.htaccess b/test/304/last-modified-only/.htaccess
index 7ec3ed9..7ec3ed9 100644..100755
--- a/test/304/last-modified-only/.htaccess
+++ b/test/304/last-modified-only/.htaccess
diff --git a/test/304/last-modified-only/last-modified-only.txt b/test/304/last-modified-only/last-modified-only.txt
index baad073..baad073 100644..100755
--- a/test/304/last-modified-only/last-modified-only.txt
+++ b/test/304/last-modified-only/last-modified-only.txt
diff --git a/test/304/test_etag.txt b/test/304/test_etag.txt
index baad073..baad073 100644..100755
--- a/test/304/test_etag.txt
+++ b/test/304/test_etag.txt
diff --git a/test/307/final-destination.txt b/test/307/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/307/final-destination.txt
+++ b/test/307/final-destination.txt
diff --git a/test/307/onestep.asis b/test/307/onestep.asis
index 314cfa0..314cfa0 100644..100755
--- a/test/307/onestep.asis
+++ b/test/307/onestep.asis
diff --git a/test/410/410.asis b/test/410/410.asis
index 9bf5f76..9bf5f76 100644..100755
--- a/test/410/410.asis
+++ b/test/410/410.asis
diff --git a/test/basic-nested/.htaccess b/test/basic-nested/.htaccess
index 21623cd..21623cd 100644..100755
--- a/test/basic-nested/.htaccess
+++ b/test/basic-nested/.htaccess
diff --git a/test/basic-nested/passwdfile b/test/basic-nested/passwdfile
index 7de4f23..7de4f23 100644..100755
--- a/test/basic-nested/passwdfile
+++ b/test/basic-nested/passwdfile
diff --git a/test/basic-nested/subdir/.htaccess b/test/basic-nested/subdir/.htaccess
index 1fe3c22..1fe3c22 100644..100755
--- a/test/basic-nested/subdir/.htaccess
+++ b/test/basic-nested/subdir/.htaccess
diff --git a/test/basic-nested/subdir/passwdfile b/test/basic-nested/subdir/passwdfile
index 2ddbadc..2ddbadc 100644..100755
--- a/test/basic-nested/subdir/passwdfile
+++ b/test/basic-nested/subdir/passwdfile
diff --git a/test/basic/.htaccess b/test/basic/.htaccess
index 21623cd..21623cd 100644..100755
--- a/test/basic/.htaccess
+++ b/test/basic/.htaccess
diff --git a/test/basic/passwdfile b/test/basic/passwdfile
index 7de4f23..7de4f23 100644..100755
--- a/test/basic/passwdfile
+++ b/test/basic/passwdfile
diff --git a/test/basic2/.htaccess b/test/basic2/.htaccess
index 1fe3c22..1fe3c22 100644..100755
--- a/test/basic2/.htaccess
+++ b/test/basic2/.htaccess
diff --git a/test/basic2/passwdfile b/test/basic2/passwdfile
index 2ddbadc..2ddbadc 100644..100755
--- a/test/basic2/passwdfile
+++ b/test/basic2/passwdfile
diff --git a/test/deflate/deflated-content b/test/deflate/deflated-content
index 4a548b4..4a548b4 100644..100755
--- a/test/deflate/deflated-content
+++ b/test/deflate/deflated-content
diff --git a/test/deflate/deflated-headers.txt b/test/deflate/deflated-headers.txt
index 54409ad..54409ad 100644..100755
--- a/test/deflate/deflated-headers.txt
+++ b/test/deflate/deflated-headers.txt
diff --git a/test/deflate/deflated.asis b/test/deflate/deflated.asis
index cdb0c02..cdb0c02 100644..100755
--- a/test/deflate/deflated.asis
+++ b/test/deflate/deflated.asis
diff --git a/test/deflate/failed-compression.asis b/test/deflate/failed-compression.asis
index 06f075a..06f075a 100644..100755
--- a/test/deflate/failed-compression.asis
+++ b/test/deflate/failed-compression.asis
diff --git a/test/digest-expire/.htaccess b/test/digest-expire/.htaccess
index 66cc47a..66cc47a 100644..100755
--- a/test/digest-expire/.htaccess
+++ b/test/digest-expire/.htaccess
diff --git a/test/digest-expire/file.txt b/test/digest-expire/file.txt
index d39bb09..d39bb09 100644..100755
--- a/test/digest-expire/file.txt
+++ b/test/digest-expire/file.txt
diff --git a/test/digest/.htaccess b/test/digest/.htaccess
index 4831a12..4831a12 100644..100755
--- a/test/digest/.htaccess
+++ b/test/digest/.htaccess
diff --git a/test/digest/file.txt b/test/digest/file.txt
index d39bb09..d39bb09 100644..100755
--- a/test/digest/file.txt
+++ b/test/digest/file.txt
diff --git a/test/duplicate-headers/multilink.asis b/test/duplicate-headers/multilink.asis
index aac20e5..aac20e5 100644..100755
--- a/test/duplicate-headers/multilink.asis
+++ b/test/duplicate-headers/multilink.asis
diff --git a/test/gzip/.htaccess b/test/gzip/.htaccess
index fedf381..fedf381 100644..100755
--- a/test/gzip/.htaccess
+++ b/test/gzip/.htaccess
diff --git a/test/gzip/failed-compression.asis b/test/gzip/failed-compression.asis
index 06f075a..06f075a 100644..100755
--- a/test/gzip/failed-compression.asis
+++ b/test/gzip/failed-compression.asis
diff --git a/test/gzip/final-destination.txt b/test/gzip/final-destination.txt
index 4ffba65..4ffba65 100644..100755
--- a/test/gzip/final-destination.txt
+++ b/test/gzip/final-destination.txt
diff --git a/test/no-store/no-store.asis b/test/no-store/no-store.asis
index 160ad44..160ad44 100644..100755
--- a/test/no-store/no-store.asis
+++ b/test/no-store/no-store.asis
diff --git a/test/test.asis b/test/test.asis
index d1d567b..d1d567b 100644..100755
--- a/test/test.asis
+++ b/test/test.asis