summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-06-19 15:47:19 -0400
committerTres Seaver <tseaver@palladion.com>2013-06-19 15:47:19 -0400
commitdc7c72a2d1354d7adead65f29bbdd8e0d9d07055 (patch)
tree3c7f9c42378f5a5022672d1f52551436ff097145
parentcd9d7f5b3b087cb151052315ec6decf9e4786475 (diff)
parent1a1756542d2b259f48b9f8959277f2151ccee7ed (diff)
downloadpyramid-dc7c72a2d1354d7adead65f29bbdd8e0d9d07055.tar.gz
pyramid-dc7c72a2d1354d7adead65f29bbdd8e0d9d07055.tar.bz2
pyramid-dc7c72a2d1354d7adead65f29bbdd8e0d9d07055.zip
Merge branch 'master' into merwok-master
-rw-r--r--pyramid/scripts/prequest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py
index 82380b8ca..d1ef9fa83 100644
--- a/pyramid/scripts/prequest.py
+++ b/pyramid/scripts/prequest.py
@@ -110,9 +110,9 @@ class PRequestCommand(object):
environ = {
'REQUEST_METHOD': request_method,
'SCRIPT_NAME': '', # may be empty if app is at the root
- 'PATH_INFO': path,
+ 'PATH_INFO': path,
'SERVER_NAME': 'localhost', # always mandatory
- 'SERVER_PORT': '80', # always mandatory
+ 'SERVER_PORT': '80', # always mandatory
'SERVER_PROTOCOL': 'HTTP/1.0',
'CONTENT_TYPE': 'text/plain',
'REMOTE_ADDR':'127.0.0.1',