Permalink
Browse files

Fix bug #57

  • Loading branch information...
1 parent 00a352e commit 1a7609f7ede6ed44853bfee2a80dda98184d29b5 @jcgregorio jcgregorio committed Jul 16, 2009
Showing with 6 additions and 2 deletions.
  1. 0 CHANGELOG
  2. 0 MANIFEST
  3. 0 Makefile
  4. 0 README
  5. 0 doc/html/_sources/index.txt
  6. 0 doc/html/_sources/libhttplib2.txt
  7. BIN doc/html/_static/contents.png
  8. 0 doc/html/_static/default.css
  9. 0 doc/html/_static/doctools.js
  10. BIN doc/html/_static/file.png
  11. 0 doc/html/_static/interface.js
  12. 0 doc/html/_static/jquery.js
  13. BIN doc/html/_static/minus.png
  14. BIN doc/html/_static/navigation.png
  15. BIN doc/html/_static/plus.png
  16. 0 doc/html/_static/pygments.css
  17. 0 doc/html/_static/rightsidebar.css
  18. 0 doc/html/_static/searchtools.js
  19. 0 doc/html/_static/sphinxdoc.css
  20. 0 doc/html/_static/stickysidebar.css
  21. 0 doc/html/_static/traditional.css
  22. 0 doc/html/genindex.html
  23. 0 doc/html/index.html
  24. 0 doc/html/libhttplib2.html
  25. 0 doc/html/modindex.html
  26. 0 doc/html/search.html
  27. 0 doc/html/searchindex.json
  28. +2 −2 httplib2/__init__.py
  29. 0 httplib2/iri2uri.py
  30. +4 −0 httplib2test.py
  31. 0 index.html
  32. 0 libhttplib2.tex
  33. 0 ref.tex
  34. 0 ref/about.html
  35. BIN ref/blank.png
  36. 0 ref/cache-objects.html
  37. 0 ref/contents.html
  38. BIN ref/contents.png
  39. 0 ref/http-objects.html
  40. 0 ref/httplib2-example.html
  41. 0 ref/images.idx
  42. BIN ref/img1.old
  43. BIN ref/img1.png
  44. 0 ref/img2.old
  45. 0 ref/img2.png
  46. 0 ref/index.html
  47. BIN ref/index.png
  48. 0 ref/modimages.idx
  49. 0 ref/module-httplib2.html
  50. BIN ref/modules.png
  51. BIN ref/next.png
  52. 0 ref/node2.html
  53. BIN ref/previous.png
  54. BIN ref/pyfav.png
  55. 0 ref/ref.css
  56. 0 ref/ref.html
  57. 0 ref/response-objects.html
  58. BIN ref/up.png
  59. 0 setup.py
  60. 0 test/.htaccess
  61. 0 test/300/final-destination.txt
  62. 0 test/300/with-location-header.asis
  63. 0 test/300/without-location-header.asis
  64. 0 test/301/final-destination.txt
  65. 0 test/301/onestep.asis
  66. 0 test/302/.myhtaccess
  67. 0 test/302/final-destination.txt
  68. 0 test/302/no-location.asis
  69. 0 test/302/onestep.asis
  70. 0 test/302/twostep.asis
  71. 0 test/303/final-destination.txt
  72. 0 test/304/last-modified-only/.htaccess
  73. 0 test/304/last-modified-only/last-modified-only.txt
  74. 0 test/304/test_etag.txt
  75. 0 test/307/final-destination.txt
  76. 0 test/307/onestep.asis
  77. 0 test/410/410.asis
  78. 0 test/basic-nested/.htaccess
  79. 0 test/basic-nested/passwdfile
  80. 0 test/basic-nested/subdir/.htaccess
  81. 0 test/basic-nested/subdir/passwdfile
  82. 0 test/basic/.htaccess
  83. 0 test/basic/passwdfile
  84. 0 test/basic2/.htaccess
  85. 0 test/basic2/passwdfile
  86. BIN test/deflate/deflated-content
  87. 0 test/deflate/deflated-headers.txt
  88. BIN test/deflate/deflated.asis
  89. 0 test/deflate/failed-compression.asis
  90. 0 test/digest-expire/.htaccess
  91. 0 test/digest-expire/file.txt
  92. 0 test/digest/.htaccess
  93. 0 test/digest/file.txt
  94. 0 test/duplicate-headers/multilink.asis
  95. 0 test/gzip/.htaccess
  96. 0 test/gzip/failed-compression.asis
  97. 0 test/gzip/final-destination.txt
  98. 0 test/no-store/no-store.asis
  99. 0 test/test.asis
View
0 CHANGELOG 100644 → 100755
No changes.
View
0 MANIFEST 100644 → 100755
No changes.
View
0 Makefile 100644 → 100755
No changes.
View
0 README 100644 → 100755
No changes.
View
0 doc/html/_sources/index.txt 100644 → 100755
No changes.
View
0 doc/html/_sources/libhttplib2.txt 100644 → 100755
No changes.
View
0 doc/html/_static/contents.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 doc/html/_static/default.css 100644 → 100755
No changes.
View
0 doc/html/_static/doctools.js 100644 → 100755
No changes.
View
0 doc/html/_static/file.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 doc/html/_static/interface.js 100644 → 100755
No changes.
View
0 doc/html/_static/jquery.js 100644 → 100755
No changes.
View
0 doc/html/_static/minus.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 doc/html/_static/navigation.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 doc/html/_static/plus.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 doc/html/_static/pygments.css 100644 → 100755
No changes.
View
0 doc/html/_static/rightsidebar.css 100644 → 100755
No changes.
View
0 doc/html/_static/searchtools.js 100644 → 100755
No changes.
View
0 doc/html/_static/sphinxdoc.css 100644 → 100755
No changes.
View
No changes.
View
0 doc/html/_static/traditional.css 100644 → 100755
No changes.
View
0 doc/html/genindex.html 100644 → 100755
No changes.
View
0 doc/html/index.html 100644 → 100755
No changes.
View
0 doc/html/libhttplib2.html 100644 → 100755
No changes.
View
0 doc/html/modindex.html 100644 → 100755
No changes.
View
0 doc/html/search.html 100644 → 100755
No changes.
View
0 doc/html/searchindex.json 100644 → 100755
No changes.
View
4 httplib2/__init__.py 100644 → 100755
@@ -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."
View
0 httplib2/iri2uri.py 100644 → 100755
No changes.
View
@@ -611,6 +611,10 @@ def testIndividualTimeout(self):
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")
View
0 index.html 100644 → 100755
No changes.
View
0 libhttplib2.tex 100644 → 100755
No changes.
View
0 ref.tex 100644 → 100755
No changes.
View
0 ref/about.html 100644 → 100755
No changes.
View
0 ref/blank.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/cache-objects.html 100644 → 100755
No changes.
View
0 ref/contents.html 100644 → 100755
No changes.
View
0 ref/contents.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/http-objects.html 100644 → 100755
No changes.
View
0 ref/httplib2-example.html 100644 → 100755
No changes.
View
0 ref/images.idx 100644 → 100755
No changes.
View
0 ref/img1.old 100644 → 100755
No changes.
View
0 ref/img1.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/img2.old 100644 → 100755
No changes.
View
0 ref/img2.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/index.html 100644 → 100755
No changes.
View
0 ref/index.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/modimages.idx 100644 → 100755
No changes.
View
0 ref/module-httplib2.html 100644 → 100755
No changes.
View
0 ref/modules.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/next.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/node2.html 100644 → 100755
No changes.
View
0 ref/previous.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/pyfav.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ref/ref.css 100644 → 100755
No changes.
View
0 ref/ref.html 100644 → 100755
No changes.
View
0 ref/response-objects.html 100644 → 100755
No changes.
View
0 ref/up.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 setup.py 100644 → 100755
No changes.
View
0 test/.htaccess 100644 → 100755
No changes.
View
0 test/300/final-destination.txt 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
0 test/301/final-destination.txt 100644 → 100755
No changes.
View
0 test/301/onestep.asis 100644 → 100755
No changes.
View
0 test/302/.myhtaccess 100644 → 100755
No changes.
View
0 test/302/final-destination.txt 100644 → 100755
No changes.
View
0 test/302/no-location.asis 100644 → 100755
No changes.
View
0 test/302/onestep.asis 100644 → 100755
No changes.
View
0 test/302/twostep.asis 100644 → 100755
No changes.
View
0 test/303/final-destination.txt 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
0 test/304/test_etag.txt 100644 → 100755
No changes.
View
0 test/307/final-destination.txt 100644 → 100755
No changes.
View
0 test/307/onestep.asis 100644 → 100755
No changes.
View
0 test/410/410.asis 100644 → 100755
No changes.
View
0 test/basic-nested/.htaccess 100644 → 100755
No changes.
View
0 test/basic-nested/passwdfile 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
0 test/basic/.htaccess 100644 → 100755
No changes.
View
0 test/basic/passwdfile 100644 → 100755
No changes.
View
0 test/basic2/.htaccess 100644 → 100755
No changes.
View
0 test/basic2/passwdfile 100644 → 100755
No changes.
View
0 test/deflate/deflated-content 100644 → 100755
No changes.
View
0 test/deflate/deflated-headers.txt 100644 → 100755
No changes.
View
0 test/deflate/deflated.asis 100644 → 100755
No changes.
View
No changes.
View
0 test/digest-expire/.htaccess 100644 → 100755
No changes.
View
0 test/digest-expire/file.txt 100644 → 100755
No changes.
View
0 test/digest/.htaccess 100644 → 100755
No changes.
View
0 test/digest/file.txt 100644 → 100755
No changes.
View
No changes.
View
0 test/gzip/.htaccess 100644 → 100755
No changes.
View
0 test/gzip/failed-compression.asis 100644 → 100755
No changes.
View
0 test/gzip/final-destination.txt 100644 → 100755
No changes.
View
0 test/no-store/no-store.asis 100644 → 100755
No changes.
View
0 test/test.asis 100644 → 100755
No changes.

0 comments on commit 1a7609f

Please sign in to comment.