Backed out changeset 0e6e9a97df17

AUTHORS

@@ -26,7 +26,7 @@ Thanks To
 * Chuck Thier, reporting a bug in processes.py
 * Brantley Harris, reporting bug #4
 * Taso Du Val, reproing an exception squelching bug, saving children's lives  ;-)
-* R. Tyler Ballance, bug report on tpool on Windows, help with improving corolocal module, keen eye for redundancy
+* R. Tyler Ballance, bug report on tpool on Windows, help with improving corolocal module
 * Sergey Shepelev, PEP 8 police  :-), reporting bug #5
 * Luci Stanescu, for reporting twisted hub bug
 * Marcus Cavanaugh, for test case code that has been incredibly useful in tracking down bugs

eventlet/wsgi.py

@@ -280,9 +280,9 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
         finally:
             if hasattr(result, 'close'):
                 result.close()
-            if self.environ['wsgi.input'].position < self.environ.get('CONTENT_LENGTH', 0):
+            if self.environ['eventlet.input'].position < self.environ.get('CONTENT_LENGTH', 0):
                 ## Read and discard body
-                self.environ['wsgi.input'].read()
+                self.environ['eventlet.input'].read()
             finish = time.time()
 
             self.server.log_message('%s - - [%s] "%s" %s %s %.6f' % (
@@ -348,7 +348,7 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
             wfile = None
             wfile_line = None
         chunked = env.get('HTTP_TRANSFER_ENCODING', '').lower() == 'chunked'
-        env['wsgi.input'] = Input(
+        env['wsgi.input'] = env['eventlet.input'] = Input(
             self.rfile, length, wfile=wfile, wfile_line=wfile_line,
             chunked_input=chunked)