about summary refs log tree commit homepage
path: root/ext
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-04-05 12:36:29 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-04-05 12:36:29 +0000
commit6947497b6001ca9f46009cd78f9d55db4d0fc007 (patch)
treef8df3861497cceef23346fb57255e84d56bfa5d6 /ext
parentc607d8cdbc179adc730d83de98f57233470d39d6 (diff)
downloadunicorn-6947497b6001ca9f46009cd78f9d55db4d0fc007.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@148 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'ext')
-rw-r--r--ext/http11/http11.c2
-rw-r--r--ext/http11/http11_parser.rl2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/http11/http11.c b/ext/http11/http11.c
index 9e2cc6f..ffdbee3 100644
--- a/ext/http11/http11.c
+++ b/ext/http11/http11.c
@@ -135,7 +135,7 @@ void header_done(void *data, const char *at, size_t length)
 
   ctype = rb_hash_aref(req, global_http_content_type);
   if(ctype != Qnil) {
-    rb_hash_aset(req, global_content_type, Qnil);
+    rb_hash_aset(req, global_content_type, ctype);
   }
 
   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
diff --git a/ext/http11/http11_parser.rl b/ext/http11/http11_parser.rl
index 6a256a6..af3a444 100644
--- a/ext/http11/http11_parser.rl
+++ b/ext/http11/http11_parser.rl
@@ -99,7 +99,7 @@
 
         field_value = any* >start_value %write_value;
 
-        message_header = field_name ":" field_value $0 CRLF >1;
+        message_header = field_name ":" field_value :> CRLF;
         
         Request = Request_Line (message_header)* ( CRLF @done);