diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-22 17:25:46 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-22 17:25:46 -0400 |
| commit | 3f70b281ca8446c34cd8c259850a68dc2a107ba0 (patch) | |
| tree | 30381e3d5c4ff36d02ebd7ab4c91c33a6dc3e226 | |
| parent | 036a633c5414887cc7c080c9d2ab813f539bd14a (diff) | |
| parent | a39dd2ff1992f81e98a4d3307aee53fbc7a405cf (diff) | |
| download | pyramid-3f70b281ca8446c34cd8c259850a68dc2a107ba0.tar.gz pyramid-3f70b281ca8446c34cd8c259850a68dc2a107ba0.tar.bz2 pyramid-3f70b281ca8446c34cd8c259850a68dc2a107ba0.zip | |
Merge branch '1.3-branch'
| -rw-r--r-- | CHANGES.txt | 10 | ||||
| -rw-r--r-- | pyramid/scripts/prequest.py | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e978f61f0..7fd8b7a64 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,13 @@ +Next release +============ + +Bug Fixes +--------- + +- Add ``REMOTE_ADDR`` to the ``prequest`` WSGI environ dict for benefit of + the debug toolbar, which effectively requires it to be present to work + properly. + 1.3 (2012-03-21) ================ diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py index 5423a6316..13406372a 100644 --- a/pyramid/scripts/prequest.py +++ b/pyramid/scripts/prequest.py @@ -112,6 +112,7 @@ class PRequestCommand(object): 'SERVER_PORT': '80', # always mandatory 'SERVER_PROTOCOL': 'HTTP/1.0', 'CONTENT_TYPE': 'text/plain', + 'REMOTE_ADDR':'127.0.0.1', 'wsgi.run_once': True, 'wsgi.multithread': False, 'wsgi.multiprocess': False, |