cpython-lru_cache-weakref: Lib/httplib.py annotate

annotate Lib/httplib.py @ 54294:dba767bc3155 legacy-trunk

remove mention of old ctypes version

author	Benjamin Peterson <benjamin@python.org>
date	Sat, 23 May 2009 20:59:09 +0000
parents	87115c727102
children	e7b4a443f764

rev	line source
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1 """HTTP/1.1 client library
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	2
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	3 <intro stuff goes here>
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	4 <other stuff, too>
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	5
39293 efbaec9674df Minor typo fixes Andrew M. Kuchling <amk@amk.ca> parents: 39190 diff changeset	6 HTTPConnection goes through a number of "states", which define when a client
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	7 may legally make another request or fetch the response for a particular
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	8 request. This diagram details these state transitions:
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	9
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	10 (null)
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	11 \|
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	12 \| HTTPConnection()
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	13 v
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	14 Idle
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	15 \|
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	16 \| putrequest()
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	17 v
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	18 Request-started
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	19 \|
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	20 \| ( putheader() )* endheaders()
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	21 v
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	22 Request-sent
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	23 \|
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	24 \| response = getresponse()
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	25 v
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	26 Unread-response [Response-headers-read]
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	27 \|\____________________
15845 210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	28 \| \|
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	29 \| response.read() \| putrequest()
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	30 v v
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	31 Idle Req-started-unread-response
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	32 ______/\|
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	33 / \|
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	34 response.read() \| \| ( putheader() )* endheaders()
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	35 v v
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	36 Request-started Req-sent-unread-response
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	37 \|
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	38 \| response.read()
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	39 v
210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	40 Request-sent
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	41
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	42 This diagram presents the following rules:
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	43 -- a second request may not be started until {response-headers-read}
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	44 -- a response [object] cannot be retrieved until {request-sent}
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	45 -- there is no differentiation between an unread response body and a
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	46 partially read response body
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	47
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	48 Note: this enforcement is applied by the HTTPConnection class. The
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	49 HTTPResponse class does not enforce this state machine, which
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	50 implies sophisticated clients may accelerate the request/response
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	51 pipeline. Caution should be taken, though: accelerating the states
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	52 beyond the above pattern may imply knowledge of the server's
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	53 connection-close behavior for certain requests. For example, it
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	54 is impossible to tell whether the server will close the connection
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	55 UNTIL the response headers have been read; this means that further
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	56 requests cannot be placed into the pipeline until it is known that
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	57 the server will NOT be closing the connection.
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	58
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	59 Logical State __state __response
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	60 ------------- ------- ----------
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	61 Idle _CS_IDLE None
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	62 Request-started _CS_REQ_STARTED None
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	63 Request-sent _CS_REQ_SENT None
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	64 Unread-response _CS_IDLE <response_class>
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	65 Req-started-unread-response _CS_REQ_STARTED <response_class>
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	66 Req-sent-unread-response _CS_REQ_SENT <response_class>
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	67 """
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	68
6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	69 import socket
48948 d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 48249 diff changeset	70 from sys import py3kwarning
22192 044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	71 from urlparse import urlsplit
43161 9cfad9a5c83b deprecate use of FakeSocket Bill Janssen <janssen@parc.com> parents: 43093 diff changeset	72 import warnings
48948 d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 48249 diff changeset	73 with warnings.catch_warnings():
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 48249 diff changeset	74 if py3kwarning:
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 48249 diff changeset	75 warnings.filterwarnings("ignore", ".*mimetools has been removed",
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 48249 diff changeset	76 DeprecationWarning)
48249 918a918a9996 Silence the DeprecationWarning raised in httplib when mimetools is imported. Brett Cannon <bcannon@gmail.com> parents: 47909 diff changeset	77 import mimetools
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	78
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	79 try:
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	80 from cStringIO import StringIO
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	81 except ImportError:
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	82 from StringIO import StringIO
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	83
43093 1d57fb7efb15 Don't lie in __all__ attributes when SSL is not available: only add the SSL Thomas Wouters <thomas@python.org> parents: 43008 diff changeset	84 __all__ = ["HTTP", "HTTPResponse", "HTTPConnection",
18013 99aea6f5cebd more public symbols for __all__ Skip Montanaro <skip@pobox.com> parents: 17482 diff changeset	85 "HTTPException", "NotConnected", "UnknownProtocol",
24042 63fbbed10714 Simplify HTTPSConnection constructor. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24038 diff changeset	86 "UnknownTransferEncoding", "UnimplementedFileMode",
63fbbed10714 Simplify HTTPSConnection constructor. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24038 diff changeset	87 "IncompleteRead", "InvalidURL", "ImproperConnectionState",
63fbbed10714 Simplify HTTPSConnection constructor. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24038 diff changeset	88 "CannotSendRequest", "CannotSendHeader", "ResponseNotReady",
36559 09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	89 "BadStatusLine", "error", "responses"]
16160 46920b60cd33 added a few more __all__ lists Skip Montanaro <skip@pobox.com> parents: 15878 diff changeset	90
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	91 HTTP_PORT = 80
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	92 HTTPS_PORT = 443
28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	93
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	94 _UNKNOWN = 'UNKNOWN'
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	95
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	96 # connection states
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	97 _CS_IDLE = 'Idle'
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	98 _CS_REQ_STARTED = 'Request-started'
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	99 _CS_REQ_SENT = 'Request-sent'
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	100
33506 4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	101 # status codes
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	102 # informational
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	103 CONTINUE = 100
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	104 SWITCHING_PROTOCOLS = 101
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	105 PROCESSING = 102
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	106
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	107 # successful
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	108 OK = 200
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	109 CREATED = 201
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	110 ACCEPTED = 202
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	111 NON_AUTHORITATIVE_INFORMATION = 203
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	112 NO_CONTENT = 204
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	113 RESET_CONTENT = 205
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	114 PARTIAL_CONTENT = 206
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	115 MULTI_STATUS = 207
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	116 IM_USED = 226
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	117
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	118 # redirection
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	119 MULTIPLE_CHOICES = 300
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	120 MOVED_PERMANENTLY = 301
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	121 FOUND = 302
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	122 SEE_OTHER = 303
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	123 NOT_MODIFIED = 304
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	124 USE_PROXY = 305
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	125 TEMPORARY_REDIRECT = 307
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	126
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	127 # client error
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	128 BAD_REQUEST = 400
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	129 UNAUTHORIZED = 401
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	130 PAYMENT_REQUIRED = 402
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	131 FORBIDDEN = 403
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	132 NOT_FOUND = 404
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	133 METHOD_NOT_ALLOWED = 405
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	134 NOT_ACCEPTABLE = 406
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	135 PROXY_AUTHENTICATION_REQUIRED = 407
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	136 REQUEST_TIMEOUT = 408
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	137 CONFLICT = 409
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	138 GONE = 410
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	139 LENGTH_REQUIRED = 411
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	140 PRECONDITION_FAILED = 412
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	141 REQUEST_ENTITY_TOO_LARGE = 413
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	142 REQUEST_URI_TOO_LONG = 414
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	143 UNSUPPORTED_MEDIA_TYPE = 415
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	144 REQUESTED_RANGE_NOT_SATISFIABLE = 416
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	145 EXPECTATION_FAILED = 417
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	146 UNPROCESSABLE_ENTITY = 422
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	147 LOCKED = 423
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	148 FAILED_DEPENDENCY = 424
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	149 UPGRADE_REQUIRED = 426
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	150
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	151 # server error
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	152 INTERNAL_SERVER_ERROR = 500
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	153 NOT_IMPLEMENTED = 501
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	154 BAD_GATEWAY = 502
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	155 SERVICE_UNAVAILABLE = 503
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	156 GATEWAY_TIMEOUT = 504
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	157 HTTP_VERSION_NOT_SUPPORTED = 505
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	158 INSUFFICIENT_STORAGE = 507
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	159 NOT_EXTENDED = 510
4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	160
36559 09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	161 # Mapping status codes to official W3C names
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	162 responses = {
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	163 100: 'Continue',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	164 101: 'Switching Protocols',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	165
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	166 200: 'OK',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	167 201: 'Created',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	168 202: 'Accepted',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	169 203: 'Non-Authoritative Information',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	170 204: 'No Content',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	171 205: 'Reset Content',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	172 206: 'Partial Content',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	173
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	174 300: 'Multiple Choices',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	175 301: 'Moved Permanently',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	176 302: 'Found',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	177 303: 'See Other',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	178 304: 'Not Modified',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	179 305: 'Use Proxy',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	180 306: '(Unused)',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	181 307: 'Temporary Redirect',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	182
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	183 400: 'Bad Request',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	184 401: 'Unauthorized',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	185 402: 'Payment Required',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	186 403: 'Forbidden',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	187 404: 'Not Found',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	188 405: 'Method Not Allowed',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	189 406: 'Not Acceptable',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	190 407: 'Proxy Authentication Required',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	191 408: 'Request Timeout',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	192 409: 'Conflict',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	193 410: 'Gone',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	194 411: 'Length Required',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	195 412: 'Precondition Failed',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	196 413: 'Request Entity Too Large',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	197 414: 'Request-URI Too Long',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	198 415: 'Unsupported Media Type',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	199 416: 'Requested Range Not Satisfiable',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	200 417: 'Expectation Failed',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	201
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	202 500: 'Internal Server Error',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	203 501: 'Not Implemented',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	204 502: 'Bad Gateway',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	205 503: 'Service Unavailable',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	206 504: 'Gateway Timeout',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	207 505: 'HTTP Version Not Supported',
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	208 }
09230357f927 Move "httpresponses" dict from urllib2 to httplib where it belongs. Georg Brandl <georg@python.org> parents: 35652 diff changeset	209
35652 6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	210 # maximal amount of data to read at one time in _safe_read
6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	211 MAXAMOUNT = 1048576
6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	212
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	213 class HTTPMessage(mimetools.Message):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	214
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	215 def addheader(self, key, value):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	216 """Add header for field key handling repeats."""
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	217 prev = self.dict.get(key)
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	218 if prev is None:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	219 self.dict[key] = value
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	220 else:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	221 combined = ", ".join((prev, value))
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	222 self.dict[key] = combined
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	223
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	224 def addcontinue(self, key, more):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	225 """Add more field data from a continuation line."""
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	226 prev = self.dict[key]
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	227 self.dict[key] = prev + "\n " + more
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	228
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	229 def readheaders(self):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	230 """Read header lines.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	231
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	232 Read header lines up to the entirely blank line that terminates them.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	233 The (normally blank) line that ends the headers is skipped, but not
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	234 included in the returned list. If a non-header line ends the headers,
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	235 (which is an error), an attempt is made to backspace over it; it is
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	236 never included in the returned list.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	237
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	238 The variable self.status is set to the empty string if all went well,
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	239 otherwise it is an error message. The variable self.headers is a
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	240 completely uninterpreted list of lines contained in the header (so
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	241 printing them will reproduce the header exactly as it appears in the
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	242 file).
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	243
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	244 If multiple header fields with the same name occur, they are combined
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	245 according to the rules in RFC 2616 sec 4.2:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	246
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	247 Appending each subsequent field-value to the first, each separated
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	248 by a comma. The order in which header fields with the same field-name
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	249 are received is significant to the interpretation of the combined
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	250 field value.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	251 """
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	252 # XXX The implementation overrides the readheaders() method of
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	253 # rfc822.Message. The base class design isn't amenable to
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	254 # customized behavior here so the method here is a copy of the
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	255 # base class code with a few small changes.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	256
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	257 self.dict = {}
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	258 self.unixfrom = ''
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	259 self.headers = hlist = []
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	260 self.status = ''
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	261 headerseen = ""
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	262 firstline = 1
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	263 startofline = unread = tell = None
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	264 if hasattr(self.fp, 'unread'):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	265 unread = self.fp.unread
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	266 elif self.seekable:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	267 tell = self.fp.tell
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	268 while True:
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	269 if tell:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	270 try:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	271 startofline = tell()
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	272 except IOError:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	273 startofline = tell = None
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	274 self.seekable = 0
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	275 line = self.fp.readline()
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	276 if not line:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	277 self.status = 'EOF in headers'
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	278 break
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	279 # Skip unix From name time lines
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	280 if firstline and line.startswith('From '):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	281 self.unixfrom = self.unixfrom + line
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	282 continue
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	283 firstline = 0
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	284 if headerseen and line[0] in ' \t':
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	285 # XXX Not sure if continuation lines are handled properly
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	286 # for http and/or for repeating headers
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	287 # It's a continuation line.
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	288 hlist.append(line)
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	289 self.addcontinue(headerseen, line.strip())
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	290 continue
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	291 elif self.iscomment(line):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	292 # It's a comment. Ignore it.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	293 continue
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	294 elif self.islast(line):
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	295 # Note! No pushback here! The delimiter line gets eaten.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	296 break
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	297 headerseen = self.isheader(line)
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	298 if headerseen:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	299 # It's a legal header line, save it.
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	300 hlist.append(line)
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	301 self.addheader(headerseen, line[len(headerseen)+1:].strip())
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	302 continue
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	303 else:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	304 # It's not a header line; throw it back and stop here.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	305 if not self.dict:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	306 self.status = 'No headers'
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	307 else:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	308 self.status = 'Non-header line where header expected'
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	309 # Try to undo the read.
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	310 if unread:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	311 unread(line)
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	312 elif tell:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	313 self.fp.seek(startofline)
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	314 else:
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	315 self.status = self.status + '; bad seek'
aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	316 break
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	317
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	318 class HTTPResponse:
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	319
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	320 # strict: If true, raise BadStatusLine if the status line can't be
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	321 # parsed as a valid HTTP/1.0 or 1.1 status line. By default it is
24378 c9de55fbb2b1 typo Skip Montanaro <skip@pobox.com> parents: 24264 diff changeset	322 # false because it prevents clients from talking to HTTP/0.9
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	323 # servers. Note that a response with a sufficiently corrupted
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	324 # status line will look like an HTTP/0.9 response.
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	325
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	326 # See RFC 2616 sec 19.6 and RFC 1945 sec 6 for details.
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	327
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	328 def __init__(self, sock, debuglevel=0, strict=0, method=None, buffering=False):
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	329 if buffering:
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	330 # The caller won't be using any sock.recv() calls, so buffering
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	331 # is fine and recommendef for performance
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	332 self.fp = sock.makefile('rb')
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	333 else:
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	334 # The buffer size is specified as zero, because the headers of
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	335 # the response are read with readline(). If the reads were
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	336 # buffered the readline() calls could consume some of the
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	337 # response, which make be read via a recv() on the underlying
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	338 # socket.
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	339 self.fp = sock.makefile('rb', 0)
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	340 self.debuglevel = debuglevel
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	341 self.strict = strict
28978 83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	342 self._method = method
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	343
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	344 self.msg = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	345
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	346 # from the Status-Line of the response
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	347 self.version = _UNKNOWN # HTTP-Version
3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	348 self.status = _UNKNOWN # Status-Code
3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	349 self.reason = _UNKNOWN # Reason-Phrase
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	350
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	351 self.chunked = _UNKNOWN # is "chunked" being used?
3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	352 self.chunk_left = _UNKNOWN # bytes left to read in current chunk
3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	353 self.length = _UNKNOWN # number of bytes left in response
3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	354 self.will_close = _UNKNOWN # conn will close at end of response
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	355
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	356 def _read_status(self):
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	357 # Initialize with Simple-Response defaults
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	358 line = self.fp.readline()
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	359 if self.debuglevel > 0:
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	360 print "reply:", repr(line)
29688 9fe67f7f3459 Fix sf bug 666219: assertion error in httplib. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29584 diff changeset	361 if not line:
9fe67f7f3459 Fix sf bug 666219: assertion error in httplib. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29584 diff changeset	362 # Presumably, the server closed the connection before
9fe67f7f3459 Fix sf bug 666219: assertion error in httplib. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29584 diff changeset	363 # sending a valid response.
9fe67f7f3459 Fix sf bug 666219: assertion error in httplib. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29584 diff changeset	364 raise BadStatusLine(line)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	365 try:
15582 6179d4afa4e4 Get rid of string functions. Guido van Rossum <guido@python.org> parents: 15503 diff changeset	366 [version, status, reason] = line.split(None, 2)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	367 except ValueError:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	368 try:
15582 6179d4afa4e4 Get rid of string functions. Guido van Rossum <guido@python.org> parents: 15503 diff changeset	369 [version, status] = line.split(None, 1)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	370 reason = ""
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	371 except ValueError:
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	372 # empty version will cause next test to fail and status
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	373 # will be treated as 0.9 response.
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	374 version = ""
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	375 if not version.startswith('HTTP/'):
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	376 if self.strict:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	377 self.close()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	378 raise BadStatusLine(line)
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	379 else:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	380 # assume it's a Simple-Response from an 0.9 server
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	381 self.fp = LineAndFileWrapper(line, self.fp)
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	382 return "HTTP/0.9", 200, ""
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	383
17482 2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	384 # The status code is a three-digit number
2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	385 try:
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	386 status = int(status)
17482 2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	387 if status < 100 or status > 999:
2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	388 raise BadStatusLine(line)
2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	389 except ValueError:
2265032efc9f SF patch #405845 by Martin von Löwis Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	390 raise BadStatusLine(line)
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	391 return version, status, reason
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	392
24216 c8a19a428358 Change _begin() back to begin(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24168 diff changeset	393 def begin(self):
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	394 if self.msg is not None:
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	395 # we've already started reading the response
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	396 return
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	397
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	398 # read until we get a non-100 response
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	399 while True:
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	400 version, status, reason = self._read_status()
33506 4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	401 if status != CONTINUE:
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	402 break
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	403 # skip the header from the 100 response
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	404 while True:
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	405 skip = self.fp.readline().strip()
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	406 if not skip:
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	407 break
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	408 if self.debuglevel > 0:
9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	409 print "header:", skip
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24262 diff changeset	410
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	411 self.status = status
15582 6179d4afa4e4 Get rid of string functions. Guido van Rossum <guido@python.org> parents: 15503 diff changeset	412 self.reason = reason.strip()
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	413 if version == 'HTTP/1.0':
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	414 self.version = 10
15182 b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	415 elif version.startswith('HTTP/1.'):
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	416 self.version = 11 # use HTTP/1.1 code for HTTP/1.x where x>=1
15182 b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	417 elif version == 'HTTP/0.9':
b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	418 self.version = 9
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	419 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	420 raise UnknownProtocol(version)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	421
15182 b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	422 if self.version == 9:
35158 daebfde0e1cf backport bug [ 1155638 ] self.length shield exception in httplib Georg Brandl <georg@python.org> parents: 33933 diff changeset	423 self.length = None
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	424 self.chunked = 0
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	425 self.will_close = 1
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	426 self.msg = HTTPMessage(StringIO())
15182 b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	427 return
b3387eeba68d If the status line is invalid, assume it is a pre-1.0 response. The Jeremy Hylton <jeremy@alum.mit.edu> parents: 14740 diff changeset	428
24123 aa6217bf9776 Fix for SF bug #432621: httplib: multiple Set-Cookie headers Jeremy Hylton <jeremy@alum.mit.edu> parents: 24120 diff changeset	429 self.msg = HTTPMessage(self.fp, 0)
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	430 if self.debuglevel > 0:
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	431 for hdr in self.msg.headers:
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	432 print "header:", hdr,
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	433
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	434 # don't let the msg keep an fp
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	435 self.msg.fp = None
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	436
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	437 # are we using the chunked-style of transfer encoding?
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	438 tr_enc = self.msg.getheader('transfer-encoding')
25107 0ecb3cabf40b SF bug [ 600488 ] Robustness tweak to httplib.py Jeremy Hylton <jeremy@alum.mit.edu> parents: 24674 diff changeset	439 if tr_enc and tr_enc.lower() == "chunked":
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	440 self.chunked = 1
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	441 self.chunk_left = None
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	442 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	443 self.chunked = 0
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	444
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	445 # will the connection close at the end of the response?
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	446 self.will_close = self._check_close()
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	447
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	448 # do we have a Content-Length?
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	449 # NOTE: RFC 2616, S4.4, #3 says we ignore this if tr_enc is "chunked"
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	450 length = self.msg.getheader('content-length')
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	451 if length and not self.chunked:
14560 eeb8ee488106 cope with weird Content-Length values returned from servers by Jeremy Hylton <jeremy@alum.mit.edu> parents: 14140 diff changeset	452 try:
eeb8ee488106 cope with weird Content-Length values returned from servers by Jeremy Hylton <jeremy@alum.mit.edu> parents: 14140 diff changeset	453 self.length = int(length)
eeb8ee488106 cope with weird Content-Length values returned from servers by Jeremy Hylton <jeremy@alum.mit.edu> parents: 14140 diff changeset	454 except ValueError:
eeb8ee488106 cope with weird Content-Length values returned from servers by Jeremy Hylton <jeremy@alum.mit.edu> parents: 14140 diff changeset	455 self.length = None
45494 7efa4d1bced3 #1627: httplib now ignores negative Content-Length headers. Georg Brandl <georg@python.org> parents: 45493 diff changeset	456 else:
7efa4d1bced3 #1627: httplib now ignores negative Content-Length headers. Georg Brandl <georg@python.org> parents: 45493 diff changeset	457 if self.length < 0: # ignore nonsensical negative lengths
7efa4d1bced3 #1627: httplib now ignores negative Content-Length headers. Georg Brandl <georg@python.org> parents: 45493 diff changeset	458 self.length = None
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	459 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	460 self.length = None
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	461
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	462 # does the body have a fixed length? (of zero)
33506 4b8198a74873 Patch #1025790: Add status code constants to httplib. Martin v. Löwis <martin@v.loewis.de> parents: 33496 diff changeset	463 if (status == NO_CONTENT or status == NOT_MODIFIED or
28978 83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	464 100 <= status < 200 or # 1xx codes
83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	465 self._method == 'HEAD'):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	466 self.length = 0
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	467
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	468 # if the connection remains open, and we aren't using chunked, and
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	469 # a content-length was not provided, then assume that the connection
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	470 # WILL close.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	471 if not self.will_close and \
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	472 not self.chunked and \
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	473 self.length is None:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	474 self.will_close = 1
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	475
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	476 def _check_close(self):
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	477 conn = self.msg.getheader('connection')
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	478 if self.version == 11:
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	479 # An HTTP/1.1 proxy is assumed to stay open unless
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	480 # explicitly closed.
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	481 conn = self.msg.getheader('connection')
31967 3d046d063a84 Replace str.find()!=1 with the more readable "in" operator. Raymond Hettinger <python@rcn.com> parents: 31389 diff changeset	482 if conn and "close" in conn.lower():
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	483 return True
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	484 return False
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	485
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	486 # Some HTTP/1.0 implementations have support for persistent
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	487 # connections, using rules different than HTTP/1.1.
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	488
44218 77cb8ff34912 Fix tpyo. Georg Brandl <georg@python.org> parents: 43584 diff changeset	489 # For older HTTP, Keep-Alive indicates persistent connection.
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	490 if self.msg.getheader('keep-alive'):
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	491 return False
26387 fcf9734e1021 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 26188 diff changeset	492
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	493 # At least Akamai returns a "Connection: Keep-Alive" header,
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	494 # which was supposed to be sent by the client.
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	495 if conn and "keep-alive" in conn.lower():
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	496 return False
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	497
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	498 # Proxy-Connection is a netscape hack.
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	499 pconn = self.msg.getheader('proxy-connection')
31967 3d046d063a84 Replace str.find()!=1 with the more readable "in" operator. Raymond Hettinger <python@rcn.com> parents: 31389 diff changeset	500 if pconn and "keep-alive" in pconn.lower():
26187 ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	501 return False
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	502
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	503 # otherwise, assume it will close
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	504 return True
ae169f5b94e0 Fix SF bug #637789: Handle Proxy-Connection header. Jeremy Hylton <jeremy@alum.mit.edu> parents: 26126 diff changeset	505
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	506 def close(self):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	507 if self.fp:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	508 self.fp.close()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	509 self.fp = None
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	510
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	511 def isclosed(self):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	512 # NOTE: it is possible that we will not ever call self.close(). This
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	513 # case occurs when will_close is TRUE, length is None, and we
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	514 # read up to the last byte, but NOT past it.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	515 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	516 # IMPLIES: if will_close is FALSE, then self.close() will ALWAYS be
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	517 # called, meaning self.isclosed() is meaningful.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	518 return self.fp is None
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	519
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	520 # XXX It would be nice to have readline and __iter__ for this, too.
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	521
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	522 def read(self, amt=None):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	523 if self.fp is None:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	524 return ''
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	525
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	526 if self.chunked:
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	527 return self._read_chunked(amt)
26126 98f3fd1ed42f Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 25112 diff changeset	528
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	529 if amt is None:
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	530 # unbounded read
33933 eb231544c1ad Fix for SF bug 988120 via patch 1061941. Jeremy Hylton <jeremy@alum.mit.edu> parents: 33761 diff changeset	531 if self.length is None:
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	532 s = self.fp.read()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	533 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	534 s = self._safe_read(self.length)
33933 eb231544c1ad Fix for SF bug 988120 via patch 1061941. Jeremy Hylton <jeremy@alum.mit.edu> parents: 33761 diff changeset	535 self.length = 0
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	536 self.close() # we read everything
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	537 return s
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	538
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	539 if self.length is not None:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	540 if amt > self.length:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	541 # clip the read to the "end of response"
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	542 amt = self.length
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	543
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	544 # we do not use _safe_read() here because this may be a .will_close
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	545 # connection, and the user is reading more bytes than will be provided
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	546 # (for example, reading in 1k chunks)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	547 s = self.fp.read(amt)
33933 eb231544c1ad Fix for SF bug 988120 via patch 1061941. Jeremy Hylton <jeremy@alum.mit.edu> parents: 33761 diff changeset	548 if self.length is not None:
eb231544c1ad Fix for SF bug 988120 via patch 1061941. Jeremy Hylton <jeremy@alum.mit.edu> parents: 33761 diff changeset	549 self.length -= len(s)
43584 da44334ebea2 Issue #1580738. When HTTPConnection reads the whole stream with read(), Facundo Batista <facundobatista@gmail.com> parents: 43325 diff changeset	550 if not self.length:
da44334ebea2 Issue #1580738. When HTTPConnection reads the whole stream with read(), Facundo Batista <facundobatista@gmail.com> parents: 43325 diff changeset	551 self.close()
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	552 return s
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	553
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	554 def _read_chunked(self, amt):
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	555 assert self.chunked != _UNKNOWN
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	556 chunk_left = self.chunk_left
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	557 value = ''
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	558
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	559 # XXX This accumulates chunks by repeated string concatenation,
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	560 # which is not efficient as the number or size of chunks gets big.
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	561 while True:
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	562 if chunk_left is None:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	563 line = self.fp.readline()
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	564 i = line.find(';')
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	565 if i >= 0:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	566 line = line[:i] # strip chunk-extensions
45493 21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	567 try:
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	568 chunk_left = int(line, 16)
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	569 except ValueError:
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	570 # close the connection as protocol synchronisation is
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	571 # probably lost
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	572 self.close()
21a5e9a5483a #900744: If an invalid chunked-encoding header is sent by a server, Georg Brandl <georg@python.org> parents: 45468 diff changeset	573 raise IncompleteRead(value)
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	574 if chunk_left == 0:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	575 break
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	576 if amt is None:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	577 value += self._safe_read(chunk_left)
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	578 elif amt < chunk_left:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	579 value += self._safe_read(amt)
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	580 self.chunk_left = chunk_left - amt
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	581 return value
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	582 elif amt == chunk_left:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	583 value += self._safe_read(amt)
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	584 self._safe_read(2) # toss the CRLF at the end of the chunk
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	585 self.chunk_left = None
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	586 return value
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	587 else:
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	588 value += self._safe_read(chunk_left)
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	589 amt -= chunk_left
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	590
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	591 # we read the whole chunk, get another
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	592 self._safe_read(2) # toss the CRLF at the end of the chunk
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	593 chunk_left = None
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	594
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	595 # read and discard trailer up to the CRLF terminator
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	596 ### note: we shouldn't have any trailers!
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	597 while True:
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	598 line = self.fp.readline()
45298 8eb8e9a3260d Patch #1966: Break infinite loop in httplib when the servers Martin v. Löwis <martin@v.loewis.de> parents: 44218 diff changeset	599 if not line:
8eb8e9a3260d Patch #1966: Break infinite loop in httplib when the servers Martin v. Löwis <martin@v.loewis.de> parents: 44218 diff changeset	600 # a vanishingly small number of sites EOF without
8eb8e9a3260d Patch #1966: Break infinite loop in httplib when the servers Martin v. Löwis <martin@v.loewis.de> parents: 44218 diff changeset	601 # sending the trailer
8eb8e9a3260d Patch #1966: Break infinite loop in httplib when the servers Martin v. Löwis <martin@v.loewis.de> parents: 44218 diff changeset	602 break
25112 f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	603 if line == '\r\n':
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	604 break
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	605
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	606 # we read everything; close the "file"
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	607 self.close()
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	608
f0ff060cd194 Move code for reading chunked responses in helper function, Jeremy Hylton <jeremy@alum.mit.edu> parents: 25107 diff changeset	609 return value
26126 98f3fd1ed42f Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 25112 diff changeset	610
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	611 def _safe_read(self, amt):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	612 """Read the number of bytes requested, compensating for partial reads.
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	613
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	614 Normally, we have a blocking socket, but a read() can be interrupted
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	615 by a signal (resulting in a partial read).
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	616
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	617 Note that we cannot distinguish between EOF and an interrupt when zero
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	618 bytes have been read. IncompleteRead() will be raised in this
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	619 situation.
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	620
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	621 This function should be used when <amt> bytes "should" be present for
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	622 reading. If the bytes are truly not available (due to EOF), then the
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	623 IncompleteRead exception can be used to detect the problem.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	624 """
35652 6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	625 s = []
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	626 while amt > 0:
35652 6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	627 chunk = self.fp.read(min(amt, MAXAMOUNT))
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	628 if not chunk:
51951 87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	629 raise IncompleteRead(''.join(s), amt)
35652 6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	630 s.append(chunk)
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	631 amt -= len(chunk)
35652 6a20831d357d bug [ 1296004 ] MemoryError in httplib Georg Brandl <georg@python.org> parents: 35158 diff changeset	632 return ''.join(s)
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	633
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	634 def getheader(self, name, default=None):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	635 if self.msg is None:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	636 raise ResponseNotReady()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	637 return self.msg.getheader(name, default)
11527 28b8585354de OpenSSL support. This is based on patches for a version of SSLeay by Guido van Rossum <guido@python.org> parents: 7122 diff changeset	638
33173 e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	639 def getheaders(self):
e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	640 """Return list of (header, value) tuples."""
e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	641 if self.msg is None:
e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	642 raise ResponseNotReady()
e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	643 return self.msg.items()
e05e9d05830d Patch #800236: add HTTPResponse.getheaders(). Martin v. Löwis <martin@v.loewis.de> parents: 33001 diff changeset	644
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	645
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	646 class HTTPConnection:
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	647
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	648 _http_vsn = 11
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	649 _http_vsn_str = 'HTTP/1.1'
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	650
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	651 response_class = HTTPResponse
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	652 default_port = HTTP_PORT
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	653 auto_open = 1
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	654 debuglevel = 0
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	655 strict = 0
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	656
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 45494 diff changeset	657 def __init__(self, host, port=None, strict=None,
e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 45494 diff changeset	658 timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
41288 a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a Facundo Batista <facundobatista@gmail.com> parents: 41285 diff changeset	659 self.timeout = timeout
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	660 self.sock = None
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	661 self._buffer = []
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	662 self.__response = None
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	663 self.__state = _CS_IDLE
28978 83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	664 self._method = None
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24262 diff changeset	665
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	666 self._set_hostport(host, port)
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	667 if strict is not None:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	668 self.strict = strict
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	669
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	670 def _set_hostport(self, host, port):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	671 if port is None:
33488 71ed4b35fdc4 Search from the end of the host/port combination to find the colon which Skip Montanaro <skip@pobox.com> parents: 33173 diff changeset	672 i = host.rfind(':')
33491 0c299cabf4f0 missed the obvious test case and corresponding fix Skip Montanaro <skip@pobox.com> parents: 33488 diff changeset	673 j = host.rfind(']') # ipv6 addresses have [...]
0c299cabf4f0 missed the obvious test case and corresponding fix Skip Montanaro <skip@pobox.com> parents: 33488 diff changeset	674 if i > j:
22494 7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	675 try:
7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	676 port = int(host[i+1:])
7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	677 except ValueError:
24088 b74d4a59793a Convert raise to call exception class. Add whitespace. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24042 diff changeset	678 raise InvalidURL("nonnumeric port: '%s'" % host[i+1:])
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	679 host = host[:i]
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	680 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	681 port = self.default_port
33761 d1228127d294 SF bug #1046855: httplib index out of range Raymond Hettinger <python@rcn.com> parents: 33506 diff changeset	682 if host and host[0] == '[' and host[-1] == ']':
33496 9e2b94a3b5dc Remove tabs. Brett Cannon <bcannon@gmail.com> parents: 33493 diff changeset	683 host = host[1:-1]
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	684 self.host = host
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	685 self.port = port
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	686
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	687 def set_debuglevel(self, level):
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	688 self.debuglevel = level
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	689
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	690 def connect(self):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	691 """Connect to the host and port specified in __init__."""
41305 8be744d5c567 Some nits. Georg Brandl <georg@python.org> parents: 41288 diff changeset	692 self.sock = socket.create_connection((self.host,self.port),
8be744d5c567 Some nits. Georg Brandl <georg@python.org> parents: 41288 diff changeset	693 self.timeout)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	694
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	695 def close(self):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	696 """Close the connection to the HTTP server."""
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	697 if self.sock:
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	698 self.sock.close() # close it manually... there may be other refs
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	699 self.sock = None
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	700 if self.__response:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	701 self.__response.close()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	702 self.__response = None
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	703 self.__state = _CS_IDLE
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	704
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	705 def send(self, str):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	706 """Send `str' to the server."""
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	707 if self.sock is None:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	708 if self.auto_open:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	709 self.connect()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	710 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	711 raise NotConnected()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	712
24264 18c1b290e484 Fix typos and such caught by the pycheckerbot. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24263 diff changeset	713 # send the data to the server. if we get a broken pipe, then close
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	714 # the socket. we want to reconnect when somebody tries to send again.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	715 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	716 # NOTE: we DO propagate the error, though, because we cannot simply
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	717 # ignore the error... the caller will know if they can retry.
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	718 if self.debuglevel > 0:
1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	719 print "send:", repr(str)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	720 try:
40333 90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	721 blocksize=8192
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	722 if hasattr(str,'read') :
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	723 if self.debuglevel > 0: print "sendIng a read()able"
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	724 data=str.read(blocksize)
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	725 while data:
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	726 self.sock.sendall(data)
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	727 data=str.read(blocksize)
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	728 else:
90d355829bbb Patch #1065257: Support passing open files as body in Martin v. Löwis <martin@v.loewis.de> parents: 39293 diff changeset	729 self.sock.sendall(str)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	730 except socket.error, v:
15868 3060cbfa01be Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 15859 diff changeset	731 if v[0] == 32: # Broken pipe
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	732 self.close()
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	733 raise
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	734
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	735 def _output(self, s):
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	736 """Add a line of output to the current request buffer.
24674 3269bdd65988 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24378 diff changeset	737
24264 18c1b290e484 Fix typos and such caught by the pycheckerbot. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24263 diff changeset	738 Assumes that the line does not end with \\r\\n.
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	739 """
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	740 self._buffer.append(s)
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	741
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	742 def _send_output(self, message_body=None):
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	743 """Send the currently buffered request and clear the buffer.
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	744
24264 18c1b290e484 Fix typos and such caught by the pycheckerbot. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24263 diff changeset	745 Appends an extra \\r\\n to the buffer.
50672 07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	746 A message_body may be specified, to be appended to the request.
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	747 """
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	748 self._buffer.extend(("", ""))
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	749 msg = "\r\n".join(self._buffer)
3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	750 del self._buffer[:]
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	751 # If msg and message_body are sent in a single send() call,
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	752 # it will avoid performance problems caused by the interaction
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	753 # between delayed ack and the Nagle algorithim.
50672 07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	754 if isinstance(message_body, str):
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	755 msg += message_body
50672 07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	756 message_body = None
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	757 self.send(msg)
50672 07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	758 if message_body is not None:
07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	759 #message_body was not a string (i.e. it is a file) and
07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	760 #we must run the risk of Nagle
07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	761 self.send(message_body)
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	762
30976 ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	763 def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	764 """Send a request to the server.
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	765
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	766 `method' specifies an HTTP request method, e.g. 'GET'.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	767 `url' specifies the object being requested, e.g. '/index.html'.
30976 ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	768 `skip_host' if True does not add automatically a 'Host:' header
ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	769 `skip_accept_encoding' if True does not add automatically an
ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	770 'Accept-Encoding:' header
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	771 """
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	772
29584 da0248fcfc52 Deal with a couple XXX comments which asked questions. Greg Stein <gstein@lyra.org> parents: 29465 diff changeset	773 # if a prior response has been completed, then forget about it.
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	774 if self.__response and self.__response.isclosed():
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	775 self.__response = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	776
31389 aca1ce1b4b61 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 30976 diff changeset	777
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	778 # in certain cases, we cannot issue another request on this connection.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	779 # this occurs when:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	780 # 1) we are in the process of sending a request. (_CS_REQ_STARTED)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	781 # 2) a response to a previous request has signalled that it is going
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	782 # to close the connection upon completion.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	783 # 3) the headers for the previous response have not been read, thus
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	784 # we cannot determine whether point (2) is true. (_CS_REQ_SENT)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	785 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	786 # if there is no prior response, then we can request at will.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	787 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	788 # if point (2) is true, then we will have passed the socket to the
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	789 # response (effectively meaning, "there is no prior response"), and
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	790 # will open a new one when a new request is made.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	791 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	792 # Note: if a prior response exists, then we can start a new request.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	793 # We are not allowed to begin fetching the response to this new
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	794 # request, however, until that prior response is complete.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	795 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	796 if self.__state == _CS_IDLE:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	797 self.__state = _CS_REQ_STARTED
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	798 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	799 raise CannotSendRequest()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	800
28978 83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	801 # Save the method we use, we need it later in the response phase
83fe0f5c9359 SF bug 622042: Don't expect response body from HEAD request. Jeremy Hylton <jeremy@alum.mit.edu> parents: 28671 diff changeset	802 self._method = method
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	803 if not url:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	804 url = '/'
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	805 str = '%s %s %s' % (method, url, self._http_vsn_str)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	806
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	807 self._output(str)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	808
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	809 if self._http_vsn == 11:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	810 # Issue some standard headers for better HTTP/1.1 compliance
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	811
22202 5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	812 if not skip_host:
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	813 # this header is issued only for HTTP/1.1
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	814 # connections. more specifically, this means it is
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	815 # only issued when the client uses the new
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	816 # HTTPConnection() class. backwards-compat clients
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	817 # will be using HTTP/1.0 and those clients may be
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	818 # issuing this header themselves. we should NOT issue
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	819 # it twice; some web servers (such as Apache) barf
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	820 # when they see two Host: headers
15859 31967a233600 SF Patch #103232 by dougfort: Preserve Nonstandard Port Number in Host Guido van Rossum <guido@python.org> parents: 15845 diff changeset	821
22202 5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	822 # If we need a non-standard port,include it in the
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	823 # header. If the request is going through a proxy,
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	824 # but the host of the actual URL, not the host of the
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	825 # proxy.
22192 044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	826
22202 5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	827 netloc = ''
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	828 if url.startswith('http'):
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	829 nil, netloc, nil, nil, nil = urlsplit(url)
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	830
5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	831 if netloc:
38104 88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	832 try:
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	833 netloc_enc = netloc.encode("ascii")
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	834 except UnicodeEncodeError:
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	835 netloc_enc = netloc.encode("idna")
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	836 self.putheader('Host', netloc_enc)
22202 5f2c0f6f0af7 Fix SF bug 525520. Jeremy Hylton <jeremy@alum.mit.edu> parents: 22192 diff changeset	837 else:
38104 88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	838 try:
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	839 host_enc = self.host.encode("ascii")
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	840 except UnicodeEncodeError:
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	841 host_enc = self.host.encode("idna")
47909 08c5c8c114b2 - Issue #3094: httplib.HTTPSConnection Host: headers no longer include the Gregory P. Smith <greg@mad-scientist.com> parents: 47372 diff changeset	842 if self.port == self.default_port:
38104 88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	843 self.putheader('Host', host_enc)
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	844 else:
88b89f96b97f RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Georg Brandl <georg@python.org> parents: 36559 diff changeset	845 self.putheader('Host', "%s:%s" % (host_enc, self.port))
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	846
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	847 # note: we are assuming that clients will not attempt to set these
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	848 # headers since this library must deal with the
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	849 # consequences. this also means that when the supporting
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	850 # libraries are updated to recognize other forms, then this
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	851 # code should be changed (removed or updated).
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	852
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	853 # we only want a Content-Encoding of "identity" since we don't
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	854 # support encodings such as x-gzip or x-deflate.
30976 ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	855 if not skip_accept_encoding:
ead4c61219d0 Patch #831747: Add skip_accept_encoding parameter to putrequest. Martin v. Löwis <martin@v.loewis.de> parents: 30888 diff changeset	856 self.putheader('Accept-Encoding', 'identity')
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	857
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	858 # we can accept "chunked" Transfer-Encodings, but no others
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	859 # NOTE: no TE header implies only "chunked"
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	860 #self.putheader('TE', 'chunked')
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	861
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	862 # if TE is supplied in the header, then it must appear in a
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	863 # Connection header.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	864 #self.putheader('Connection', 'TE')
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	865
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	866 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	867 # For HTTP/1.0, the server will assume "not chunked"
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	868 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	869
49726 0ad07078433a The docs for httplib.HTTPConnection.putheader() have claimed for quite a while Brett Cannon <bcannon@gmail.com> parents: 48948 diff changeset	870 def putheader(self, header, *values):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	871 """Send a request header line to the server.
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	872
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	873 For example: h.putheader('Accept', 'text/html')
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	874 """
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	875 if self.__state != _CS_REQ_STARTED:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	876 raise CannotSendHeader()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	877
49726 0ad07078433a The docs for httplib.HTTPConnection.putheader() have claimed for quite a while Brett Cannon <bcannon@gmail.com> parents: 48948 diff changeset	878 str = '%s: %s' % (header, '\r\n\t'.join(values))
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	879 self._output(str)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	880
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	881 def endheaders(self, message_body=None):
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	882 """Indicate that the last header line has been sent to the server.
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	883
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	884 This method sends the request to the server. The optional
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	885 message_body argument can be used to pass message body
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	886 associated with the request. The message body will be sent in
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	887 the same packet as the message headers if possible. The
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	888 message_body should be a string.
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	889 """
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	890 if self.__state == _CS_REQ_STARTED:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	891 self.__state = _CS_REQ_SENT
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	892 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	893 raise CannotSendHeader()
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	894 self._send_output(message_body)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	895
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	896 def request(self, method, url, body=None, headers={}):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	897 """Send a complete request to the server."""
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	898
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	899 try:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	900 self._send_request(method, url, body, headers)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	901 except socket.error, v:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	902 # trap 'Broken pipe' if we're allowed to automatically reconnect
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	903 if v[0] != 32 or not self.auto_open:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	904 raise
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	905 # try one more time
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	906 self._send_request(method, url, body, headers)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	907
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	908 def _set_content_length(self, body):
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	909 # Set the content-length based on the body.
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	910 thelen = None
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	911 try:
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	912 thelen = str(len(body))
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	913 except TypeError, te:
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	914 # If this is a file-like object, try to
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	915 # fstat its file descriptor
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	916 import os
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	917 try:
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	918 thelen = str(os.fstat(body.fileno()).st_size)
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	919 except (AttributeError, OSError):
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	920 # Don't send a length if this failed
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	921 if self.debuglevel > 0: print "Cannot stat!!"
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	922
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	923 if thelen is not None:
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	924 self.putheader('Content-Length', thelen)
ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	925
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	926 def _send_request(self, method, url, body, headers):
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	927 # honour explicitly requested Host: and Accept-Encoding headers
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	928 header_names = dict.fromkeys([k.lower() for k in headers])
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	929 skips = {}
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	930 if 'host' in header_names:
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	931 skips['skip_host'] = 1
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	932 if 'accept-encoding' in header_names:
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	933 skips['skip_accept_encoding'] = 1
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	934
33001 4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	935 self.putrequest(method, url, **skips)
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	936
4fd59651fe3f SF bug 874842 and patch 997626: httplib bugs Jeremy Hylton <jeremy@alum.mit.edu> parents: 32252 diff changeset	937 if body and ('content-length' not in header_names):
49890 ef0c5ca45441 Send HTTP headers and message body in a single send() call. Jeremy Hylton <jeremy@alum.mit.edu> parents: 49726 diff changeset	938 self._set_content_length(body)
28083 29965d0d4650 Module review: Raymond Hettinger <python@rcn.com> parents: 28063 diff changeset	939 for hdr, value in headers.iteritems():
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	940 self.putheader(hdr, value)
50672 07bbc2e20aa4 Issue 4336: HTTPRequest._send_output() now deals with the case of the message body not being a string. This allows clients to use endheaders(message_body) instead of endheaders() + send(message_body) without making any extra checks. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 49890 diff changeset	941 self.endheaders(body)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	942
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	943 def getresponse(self, buffering=False):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	944 "Get the response from the server."
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	945
29584 da0248fcfc52 Deal with a couple XXX comments which asked questions. Greg Stein <gstein@lyra.org> parents: 29465 diff changeset	946 # if a prior response has been completed, then forget about it.
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	947 if self.__response and self.__response.isclosed():
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	948 self.__response = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	949
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	950 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	951 # if a prior response exists, then it must be completed (otherwise, we
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	952 # cannot read this response's header to determine the connection-close
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	953 # behavior)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	954 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	955 # note: if a prior response existed, but was connection-close, then the
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	956 # socket and response were made independent of this HTTPConnection
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	957 # object since a new request requires that we open a whole new
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	958 # connection
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	959 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	960 # this means the prior response had one of two states:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	961 # 1) will_close: this connection was reset and the prior socket and
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	962 # response operate independently
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	963 # 2) persistent: the response was retained and we await its
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	964 # isclosed() status to become true.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	965 #
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	966 if self.__state != _CS_REQ_SENT or self.__response:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	967 raise ResponseNotReady()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	968
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	969 args = (self.sock,)
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	970 kwds = {"strict":self.strict, "method":self._method}
14672 1b20ad6eb501 Do not close socket when a Content-Length is 0. This make the Jeremy Hylton <jeremy@alum.mit.edu> parents: 14560 diff changeset	971 if self.debuglevel > 0:
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	972 args += (self.debuglevel,)
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	973 if buffering:
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	974 #only add this keyword if non-default, for compatibility with
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	975 #other response_classes.
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	976 kwds["buffering"] = True;
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	977 response = self.response_class(args, *kwds)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	978
24216 c8a19a428358 Change _begin() back to begin(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 24168 diff changeset	979 response.begin()
24038 9377158652dd Fixes for two separate HTTP/1.1 bugs: 100 responses and HTTPS connections. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23620 diff changeset	980 assert response.will_close != _UNKNOWN
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	981 self.__state = _CS_IDLE
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	982
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	983 if response.will_close:
41285 02574f485b15 Bug #978833: Revert r50844, as it broke _socketobject.dup. Martin v. Löwis <martin@v.loewis.de> parents: 40732 diff changeset	984 # this effectively passes the connection to the response
02574f485b15 Bug #978833: Revert r50844, as it broke _socketobject.dup. Martin v. Löwis <martin@v.loewis.de> parents: 40732 diff changeset	985 self.close()
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	986 else:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	987 # remember this, so we can tell when it is complete
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	988 self.__response = response
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	989
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	990 return response
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	991
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	992
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	993 class HTTP:
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	994 "Compatibility class with httplib.py from 1.5."
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	995
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	996 _http_vsn = 10
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	997 _http_vsn_str = 'HTTP/1.0'
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	998
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	999 debuglevel = 0
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1000
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1001 _connection_class = HTTPConnection
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1002
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1003 def __init__(self, host='', port=None, strict=None):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1004 "Provide a default host, since the superclass requires one."
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1005
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1006 # some joker passed 0 explicitly, meaning default port
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1007 if port == 0:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1008 port = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1009
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1010 # Note that we may pass an empty string as the host; this will throw
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1011 # an error when we attempt to connect. Presumably, the client code
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1012 # will call connect before then, with a proper host.
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1013 self._setup(self._connection_class(host, port, strict))
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1014
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1015 def _setup(self, conn):
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1016 self._conn = conn
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1017
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1018 # set up delegation to flesh out interface
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1019 self.send = conn.send
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1020 self.putrequest = conn.putrequest
49726 0ad07078433a The docs for httplib.HTTPConnection.putheader() have claimed for quite a while Brett Cannon <bcannon@gmail.com> parents: 48948 diff changeset	1021 self.putheader = conn.putheader
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1022 self.endheaders = conn.endheaders
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1023 self.set_debuglevel = conn.set_debuglevel
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1024
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1025 conn._http_vsn = self._http_vsn
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1026 conn._http_vsn_str = self._http_vsn_str
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1027
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1028 self.file = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1029
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1030 def connect(self, host=None, port=None):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1031 "Accept arguments to set the host/port, since the superclass doesn't."
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1032
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1033 if host is not None:
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1034 self._conn._set_hostport(host, port)
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1035 self._conn.connect()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1036
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1037 def getfile(self):
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1038 "Provide a getfile, since the superclass' does not use this concept."
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1039 return self.file
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1040
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1041 def getreply(self, buffering=False):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1042 """Compat definition since superclass does not define it.
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1043
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1044 Returns a tuple consisting of:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1045 - server status code (e.g. '200' if all goes well)
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1046 - server "reason" corresponding to status code
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1047 - any RFC822 headers in the response from the server
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1048 """
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1049 try:
50734 d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1050 if not buffering:
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1051 response = self._conn.getresponse()
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1052 else:
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1053 #only add this keyword if non-default for compatibility
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1054 #with other connection classes
d09d6fe31b61 Issue 4879: Allow buffering for HTTPResponse Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 50672 diff changeset	1055 response = self._conn.getresponse(buffering)
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1056 except BadStatusLine, e:
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1057 ### hmm. if getresponse() ever closes the socket on a bad request,
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1058 ### then we are going to have problems with self.sock
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1059
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1060 ### should we keep this behavior? do people use it?
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1061 # keep the socket open (as a file), and return it
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1062 self.file = self._conn.sock.makefile('rb', 0)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1063
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1064 # close our socket -- we want to restart after any protocol error
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1065 self.close()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1066
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1067 self.headers = None
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1068 return -1, e.line, None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1069
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1070 self.headers = response.msg
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1071 self.file = response.fp
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1072 return response.status, response.reason, response.msg
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1073
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1074 def close(self):
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1075 self._conn.close()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1076
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1077 # note that self.file == response.fp, which gets closed by the
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1078 # superclass. just clear the object ref here.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1079 ### hmm. messy. if status==-1, then self.file is owned by us.
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1080 ### well... we aren't explicitly closing, but losing this ref will
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1081 ### do it
b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1082 self.file = None
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1083
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1084 try:
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1085 import ssl
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1086 except ImportError:
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1087 pass
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1088 else:
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1089 class HTTPSConnection(HTTPConnection):
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1090 "This class allows communication via SSL."
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1091
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1092 default_port = HTTPS_PORT
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1093
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1094 def __init__(self, host, port=None, key_file=None, cert_file=None,
47372 e2c5ae30cffe Fixed the semantic of timeout for socket.create_connection and Facundo Batista <facundobatista@gmail.com> parents: 45494 diff changeset	1095 strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1096 HTTPConnection.__init__(self, host, port, strict, timeout)
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1097 self.key_file = key_file
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1098 self.cert_file = cert_file
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1099
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1100 def connect(self):
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1101 "Connect to a host on a given (SSL) port."
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1102
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1103 sock = socket.create_connection((self.host, self.port), self.timeout)
43325 193020bf52dc More work on SSL support. Bill Janssen <janssen@parc.com> parents: 43161 diff changeset	1104 self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1105
43093 1d57fb7efb15 Don't lie in __all__ attributes when SSL is not available: only add the SSL Thomas Wouters <thomas@python.org> parents: 43008 diff changeset	1106 __all__.append("HTTPSConnection")
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1107
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1108 class HTTPS(HTTP):
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1109 """Compatibility with 1.5 httplib interface
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1110
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1111 Python 1.5.2 did not have an HTTPS class, but it defined an
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1112 interface for sending http requests that is also useful for
15845 210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	1113 https.
13787 1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1114 """
1f966f0d467c add support for HTTPS Jeremy Hylton <jeremy@alum.mit.edu> parents: 13636 diff changeset	1115
14740 8bb6dca66ecd Indent _connection_class so that it becomes HTTPS._connection_class. Martin v. Löwis <martin@v.loewis.de> parents: 14672 diff changeset	1116 _connection_class = HTTPSConnection
15845 210bbe53b6d4 No text file relying on significant trailing whitespace is robust under Tim Peters <tim.peters@gmail.com> parents: 15844 diff changeset	1117
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1118 def __init__(self, host='', port=None, key_file=None, cert_file=None,
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1119 strict=None):
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1120 # provide a default host, pass the X509 cert info
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1121
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1122 # urf. compensate for bad input.
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1123 if port == 0:
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1124 port = None
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1125 self._setup(self._connection_class(host, port, key_file,
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1126 cert_file, strict))
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1127
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1128 # we never actually use these for anything, but we keep them
17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1129 # here for compatibility with post-1.5.2 CVS.
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1130 self.key_file = key_file
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1131 self.cert_file = cert_file
19367 17802077e77c Resolve patch #449367. Greg Stein <gstein@lyra.org> parents: 18902 diff changeset	1132
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1133
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1134 def FakeSocket (sock, sslobj):
43161 9cfad9a5c83b deprecate use of FakeSocket Bill Janssen <janssen@parc.com> parents: 43093 diff changeset	1135 warnings.warn("FakeSocket is deprecated, and won't be in 3.x. " +
43325 193020bf52dc More work on SSL support. Bill Janssen <janssen@parc.com> parents: 43161 diff changeset	1136 "Use the result of ssl.wrap_socket() directly instead.",
43161 9cfad9a5c83b deprecate use of FakeSocket Bill Janssen <janssen@parc.com> parents: 43093 diff changeset	1137 DeprecationWarning, stacklevel=2)
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1138 return sslobj
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1139
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1140
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1141 class HTTPException(Exception):
24120 b51a578f5769 Fix SF bug #575360 Jeremy Hylton <jeremy@alum.mit.edu> parents: 24119 diff changeset	1142 # Subclasses that define an __init__ must call Exception.__init__
b51a578f5769 Fix SF bug #575360 Jeremy Hylton <jeremy@alum.mit.edu> parents: 24119 diff changeset	1143 # or define self.args. Otherwise, str() will fail.
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1144 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1145
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1146 class NotConnected(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1147 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1148
22494 7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	1149 class InvalidURL(HTTPException):
7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	1150 pass
7224a1df4809 add InvalidURL exception - raised if port is given but empty or non-numeric Skip Montanaro <skip@pobox.com> parents: 22403 diff changeset	1151
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1152 class UnknownProtocol(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1153 def __init__(self, version):
24120 b51a578f5769 Fix SF bug #575360 Jeremy Hylton <jeremy@alum.mit.edu> parents: 24119 diff changeset	1154 self.args = version,
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1155 self.version = version
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1156
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1157 class UnknownTransferEncoding(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1158 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1159
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1160 class UnimplementedFileMode(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1161 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1162
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1163 class IncompleteRead(HTTPException):
51951 87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1164 def __init__(self, partial, expected=None):
24120 b51a578f5769 Fix SF bug #575360 Jeremy Hylton <jeremy@alum.mit.edu> parents: 24119 diff changeset	1165 self.args = partial,
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1166 self.partial = partial
51951 87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1167 self.expected = expected
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1168 def __repr__(self):
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1169 if self.expected is not None:
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1170 e = ', %i more expected' % self.expected
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1171 else:
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1172 e = ''
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1173 return 'IncompleteRead(%i bytes read%s)' % (len(self.partial), e)
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1174 def __str__(self):
87115c727102 give httplib.IncompleteRead a more sane repr #4308 Benjamin Peterson <benjamin@python.org> parents: 50734 diff changeset	1175 return repr(self)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1176
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1177 class ImproperConnectionState(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1178 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1179
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1180 class CannotSendRequest(ImproperConnectionState):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1181 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1182
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1183 class CannotSendHeader(ImproperConnectionState):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1184 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1185
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1186 class ResponseNotReady(ImproperConnectionState):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1187 pass
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1188
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1189 class BadStatusLine(HTTPException):
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1190 def __init__(self, line):
24120 b51a578f5769 Fix SF bug #575360 Jeremy Hylton <jeremy@alum.mit.edu> parents: 24119 diff changeset	1191 self.args = line,
13636 b5120f58c5da no changes other than indentation level (now 4) and comment reflow. Greg Stein <gstein@lyra.org> parents: 13019 diff changeset	1192 self.line = line
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1193
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1194 # for backwards compatibility
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1195 error = HTTPException
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1196
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1197 class LineAndFileWrapper:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1198 """A limited file-like object for HTTP/0.9 responses."""
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1199
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1200 # The status-line parsing code calls readline(), which normally
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1201 # get the HTTP status line. For a 0.9 response, however, this is
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1202 # actually the first line of the body! Clients need to get a
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1203 # readable file object that contains that line.
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1204
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1205 def __init__(self, line, file):
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1206 self._line = line
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1207 self._file = file
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1208 self._line_consumed = 0
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1209 self._line_offset = 0
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1210 self._line_left = len(line)
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1211
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1212 def __getattr__(self, attr):
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1213 return getattr(self._file, attr)
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1214
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1215 def _done(self):
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1216 # called when the last byte is read from the line. After the
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1217 # call, all read methods are delegated to the underlying file
28063 c3665df66d6d typo Skip Montanaro <skip@pobox.com> parents: 26387 diff changeset	1218 # object.
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1219 self._line_consumed = 1
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1220 self.read = self._file.read
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1221 self.readline = self._file.readline
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1222 self.readlines = self._file.readlines
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1223
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1224 def read(self, amt=None):
32252 a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1225 if self._line_consumed:
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1226 return self._file.read(amt)
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1227 assert self._line_left
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1228 if amt is None or amt > self._line_left:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1229 s = self._line[self._line_offset:]
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1230 self._done()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1231 if amt is None:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1232 return s + self._file.read()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1233 else:
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24262 diff changeset	1234 return s + self._file.read(amt - len(s))
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1235 else:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1236 assert amt <= self._line_left
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1237 i = self._line_offset
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1238 j = i + amt
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1239 s = self._line[i:j]
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1240 self._line_offset = j
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1241 self._line_left -= amt
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1242 if self._line_left == 0:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1243 self._done()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1244 return s
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24262 diff changeset	1245
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1246 def readline(self):
32252 a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1247 if self._line_consumed:
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1248 return self._file.readline()
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1249 assert self._line_left
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1250 s = self._line[self._line_offset:]
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1251 self._done()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1252 return s
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1253
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1254 def readlines(self, size=None):
32252 a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1255 if self._line_consumed:
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1256 return self._file.readlines(size)
a72bc4257336 Fix a bug that robotparser starves memory when the server responses Hye-Shik Chang <hyeshik@gmail.com> parents: 31967 diff changeset	1257 assert self._line_left
24119 f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1258 L = [self._line[self._line_offset:]]
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1259 self._done()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1260 if size is None:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1261 return L + self._file.readlines()
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1262 else:
f33bb9c131f8 Handle HTTP/0.9 responses. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24088 diff changeset	1263 return L + self._file.readlines(size)
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1264
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	1265 def test():
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1266 """Test this module.
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1267
24168 fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1268 A hodge podge of tests collected here, because they have too many
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1269 external dependencies for the regular test suite.
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1270 """
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1271
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1272 import sys
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1273 import getopt
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1274 opts, args = getopt.getopt(sys.argv[1:], 'd')
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1275 dl = 0
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1276 for o, a in opts:
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1277 if o == '-d': dl = dl + 1
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1278 host = 'www.python.org'
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1279 selector = '/'
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1280 if args[0:]: host = args[0]
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1281 if args[1:]: selector = args[1]
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1282 h = HTTP()
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1283 h.set_debuglevel(dl)
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1284 h.connect(host)
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1285 h.putrequest('GET', selector)
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1286 h.endheaders()
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1287 status, reason, headers = h.getreply()
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1288 print 'status =', status
4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1289 print 'reason =', reason
24168 fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1290 print "read", len(h.getfile().read())
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1291 print
f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1292 if headers:
15582 6179d4afa4e4 Get rid of string functions. Guido van Rossum <guido@python.org> parents: 15503 diff changeset	1293 for header in headers.headers: print header.strip()
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1294 print
13019 4a3e9871b41b initial commit of a new HTTP library, supporting HTTP/1.1 and persistent Greg Stein <gstein@lyra.org> parents: 12716 diff changeset	1295
22192 044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1296 # minimal test that code to extract host from url works
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1297 class HTTP11(HTTP):
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1298 _http_vsn = 11
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1299 _http_vsn_str = 'HTTP/1.1'
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1300
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1301 h = HTTP11('www.python.org')
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1302 h.putrequest('GET', 'http://www.python.org/~jeremy/')
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1303 h.endheaders()
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1304 h.getreply()
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1305 h.close()
044f9e71320f SF bug report #405939: wrong Host header with proxy Jeremy Hylton <jeremy@alum.mit.edu> parents: 21962 diff changeset	1306
43008 4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1307 try:
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1308 import ssl
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1309 except ImportError:
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1310 pass
4771639fc049 This contains a number of things: Bill Janssen <janssen@parc.com> parents: 42385 diff changeset	1311 else:
24263 e6033254df21 Whitespace normalization. Tim Peters <tim.peters@gmail.com> parents: 24262 diff changeset	1312
24168 fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1313 for host, selector in (('sourceforge.net', '/projects/python'),
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1314 ):
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1315 print "https://%s%s" % (host, selector)
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1316 hs = HTTPS()
24262 3b571e32a6e4 Send HTTP requests with a single send() call instead of many. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24216 diff changeset	1317 hs.set_debuglevel(dl)
24168 fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1318 hs.connect(host)
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1319 hs.putrequest('GET', selector)
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1320 hs.endheaders()
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1321 status, reason, headers = hs.getreply()
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1322 print 'status =', status
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1323 print 'reason =', reason
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1324 print "read", len(hs.getfile().read())
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1325 print
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1326 if headers:
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1327 for header in headers.headers: print header.strip()
fdd836575248 Fix for SF bug 579107. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24123 diff changeset	1328 print
1555 6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	1329
6d35308261f4 Towards a standard access mechanism for URLs. Guido van Rossum <guido@python.org> parents: diff changeset	1330 if __name__ == '__main__':
6787 f6954274e1ca Doc strings by Mitch Chapman (with a little reformatting). Guido van Rossum <guido@python.org> parents: 5974 diff changeset	1331 test()

Mercurial > cpython-lru_cache-weakref

annotate Lib/httplib.py @ 54294:dba767bc3155 legacy-trunk