summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-08-09 05:01:41 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-08-09 05:01:41 (GMT)
commitcffb9dee673cd00ee341bdd504066af67e49f09b (patch)
tree23313729cc211e3e89886e07b8e3a54d811240a8 /Lib
parent12c484dab8608b5f597a7abbec08fd9d21b4c042 (diff)
downloadcpython-cffb9dee673cd00ee341bdd504066af67e49f09b.zip
cpython-cffb9dee673cd00ee341bdd504066af67e49f09b.tar.gz
cpython-cffb9dee673cd00ee341bdd504066af67e49f09b.tar.bz2
SF patch #747364: BaseHTTPServer doesn't need StringIO intermediary
(Contributed by Andrew Dalke.)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/BaseHTTPServer.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index edb15ab..15e7525 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -75,7 +75,6 @@ import time
import socket # For gethostbyaddr()
import mimetools
import SocketServer
-import cStringIO
# Default error message
DEFAULT_ERROR_MESSAGE = """\
@@ -276,17 +275,8 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
return False
self.command, self.path, self.request_version = command, path, version
- # Deal with pipelining
- bytes = ""
- while 1:
- line = self.rfile.readline()
- bytes = bytes + line
- if line == '\r\n' or line == '\n' or line == '':
- break
-
# Examine the headers and look for a Connection directive
- hfile = cStringIO.StringIO(bytes)
- self.headers = self.MessageClass(hfile)
+ self.headers = self.MessageClass(self.rfile, 0)
conntype = self.headers.get('Connection', "")
if conntype.lower() == 'close':