Merge pull request #259 from Pylons/proxy-header-middleware

move proxy headers to a middleware and return 400 for malformed values

.coveragerc

@@ -0,0 +1,14 @@
+[run]
+parallel = true
+concurrency =
+    thread
+    multiprocessing
+source =
+    waitress
+
+omit =
+    waitress/tests/fixtureapps/getline.py
+
+[report]
+show_missing = true
+precision = 2

.gitignore

@@ -2,6 +2,7 @@
 *.pyc
 env*/
 .coverage
+.coverage.*
 .idea/
 .tox/
 nosetests.xml

setup.cfg

@@ -3,7 +3,6 @@ zip_ok = false
 
 [nosetests]
 match=^test
-where=waitress
 nocapture=1
 cover-package=waitress
 cover-erase=1

tox.ini

@@ -6,7 +6,7 @@ envlist =
 
 [testenv]
 commands =
-    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
+    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:waitress}
 
 extras =
     testing
@@ -21,7 +21,7 @@ extras =
 
 [py-cover]
 commands =
-    coverage run --source=waitress --parallel-mode {envbindir}/nosetests
+    coverage run {envbindir}/nosetests waitress
     coverage combine
     coverage xml -o {envname}.xml
 
@@ -31,22 +31,23 @@ extras =
 [testenv:py27-cover]
 commands =
     {[py-cover]commands}
+
 setenv =
     COVERAGE_FILE=.coverage.py2
 
 [testenv:py35-cover]
 commands =
     {[py-cover]commands}
+
 setenv =
     COVERAGE_FILE=.coverage.py3
 
 [testenv:coverage]
 basepython = python3.5
 commands =
-    coverage erase
     coverage combine
     coverage xml
-    coverage report --show-missing --fail-under=100 --omit=waitress/tests/fixtureapps/getline.py
+    coverage report --show-missing --fail-under=100
 deps =
     coverage
 setenv =

waitress/adjustments.py

@@ -17,7 +17,7 @@
 import socket
 import warnings
 
-from .utilities import PROXY_HEADERS
+from .proxy_headers import PROXY_HEADERS
 from .compat import (
     PY2,
     WIN,
@@ -27,7 +27,10 @@
 
 truthy = frozenset(('t', 'true', 'y', 'yes', 'on', '1'))
 
-KNOWN_PROXY_HEADERS = {header.lower().replace('_', '-') for header in PROXY_HEADERS}
+KNOWN_PROXY_HEADERS = frozenset(
+    header.lower().replace('_', '-')
+    for header in PROXY_HEADERS
+)
 
 def asbool(s):
     """ Return the boolean value ``True`` if the case-lowered value of string