diff --git a/VERSION b/VERSION
index c7b4727a..99ba518b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-10 11:43:02) dev
+Version 2.1.0 (2012-10-10 11:57:26) dev
diff --git a/gluon/rocket.py b/gluon/rocket.py
index ebe44db8..616c0bc9 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1466,7 +1466,7 @@ class Worker(Thread):
                     except UnicodeDecodeError:
                         self.err_log.warning('Invalid request header: '+repr(l))
 
-                if l.strip() == '':
+                if l.strip().replace('\0','') == '':
                     break
                 elif l[0] in ' \t' and lname:
                     # Some headers take more than one line