--- /usr/lib/python2.7/wsgiref/simple_server.py	2014-03-28 12:07:57.931703375 -0700
+++ /home/abraithwaite/simple_server.py	2014-03-31 08:20:50.754546880 -0700
@@ -96,8 +96,7 @@
         if length:
             env['CONTENT_LENGTH'] = length
 
-        for h in self.headers.headers:
-            k,v = h.split(':',1)
+        for k,v in self.headers.dict.items():
             k=k.replace('-','_').upper(); v=v.strip()
             if k in env:
                 continue                    # skip content length, type,etc.