diff --git a/cherrypy/wsgiserver/__init__.py b/cherrypy/wsgiserver/__init__.py
index <HASH>..<HASH> 100644
--- a/cherrypy/wsgiserver/__init__.py
+++ b/cherrypy/wsgiserver/__init__.py
@@ -345,6 +345,7 @@ class HTTPRequest(object):
             self.simple_response(400, "Malformed Request-Line")
             return
         
+        environ["REQUEST_URI"] = path
         environ["REQUEST_METHOD"] = method
         
         # path may be an abs_path (including "http://host.domain.tld");
@@ -398,10 +399,6 @@ class HTTPRequest(object):
         environ["SERVER_PROTOCOL"] = req_protocol
         self.response_protocol = "HTTP/%s.%s" % min(rp, sp)
         
-        # If the Request-URI was an absoluteURI, use its location atom.
-        if location:
-            environ["SERVER_NAME"] = location
-        
         # then all the http headers
         try:
             self.read_headers()
Buh. SERVER_NAME shouldn't change based on client behaviors. Also added WSGI environ['REQUEST_URI'] so apps can know when absolute URI's were used, etc.