From 10493143c392bbab43bca56bb13942230e298e9d Mon Sep 17 00:00:00 2001 From: Allan Saddi Date: Thu, 11 Sep 2008 12:28:52 -0700 Subject: Add an indication as to which header fails assertion when passing in non-string header names and/or values. --- ChangeLog | 5 +++++ flup/server/ajp_base.py | 4 ++-- flup/server/fcgi_base.py | 4 ++-- flup/server/scgi_base.py | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 726ad56..58fc63e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-11 Allan Saddi + + * Add an indication as to which header fails assertion when + passing in non-string header names and/or values. + 2008-08-20 Allan Saddi * Add support for setting umask for UNIX domain sockets from diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py index e4c38f2..2acff01 100644 --- a/flup/server/ajp_base.py +++ b/flup/server/ajp_base.py @@ -886,8 +886,8 @@ class BaseAJPServer(object): assert type(response_headers) is list, 'Headers must be a list' if __debug__: for name,val in response_headers: - assert type(name) is str, 'Header names must be strings' - assert type(val) is str, 'Header values must be strings' + assert type(name) is str, 'Header name "%s" must be a string' % name + assert type(val) is str, 'Value of header "%s" must be a string' % name headers_set[:] = [status, response_headers] return write diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py index e012c94..3c059f5 100644 --- a/flup/server/fcgi_base.py +++ b/flup/server/fcgi_base.py @@ -1103,8 +1103,8 @@ class BaseFCGIServer(object): assert type(response_headers) is list, 'Headers must be a list' if __debug__: for name,val in response_headers: - assert type(name) is str, 'Header names must be strings' - assert type(val) is str, 'Header values must be strings' + assert type(name) is str, 'Header name "%s" must be a string' % name + assert type(val) is str, 'Value of header "%s" must be a string' % name headers_set[:] = [status, response_headers] return write diff --git a/flup/server/scgi_base.py b/flup/server/scgi_base.py index 0db511e..cfa6662 100644 --- a/flup/server/scgi_base.py +++ b/flup/server/scgi_base.py @@ -443,8 +443,8 @@ class BaseSCGIServer(object): assert type(response_headers) is list, 'Headers must be a list' if __debug__: for name,val in response_headers: - assert type(name) is str, 'Header names must be strings' - assert type(val) is str, 'Header values must be strings' + assert type(name) is str, 'Header name "%s" must be a string' % name + assert type(val) is str, 'Value of header "%s" must be a string' % name headers_set[:] = [status, response_headers] return write -- cgit v1.2.1