From b20dca2f1ab4b419bf496fb3212ce424b529ac2b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 9 Aug 2009 04:07:15 -0700 Subject: http: join repeated headers with a comma Since Rack requires a Hash object, this is joined in in accordance with rfc2616, section 4.2[1]. Of course, it's up to the framework or application to handle such requests. I could optimize this to avoid creating a single garbage String object, but I don't think it's common enough to worry about... [1] - http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2 --- ext/unicorn_http/unicorn_http.rl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ext/unicorn_http/unicorn_http.rl') diff --git a/ext/unicorn_http/unicorn_http.rl b/ext/unicorn_http/unicorn_http.rl index edf39ae..e985e0e 100644 --- a/ext/unicorn_http/unicorn_http.rl +++ b/ext/unicorn_http/unicorn_http.rl @@ -57,6 +57,7 @@ static void write_value(VALUE req, struct http_parser *hp, { VALUE f = find_common_field(PTR_TO(start.field), hp->s.field_len); VALUE v; + VALUE e; VALIDATE_MAX_LENGTH(LEN(mark, p), FIELD_VALUE); v = STR_NEW(mark, p); @@ -76,10 +77,16 @@ static void write_value(VALUE req, struct http_parser *hp, } else if (f == g_http_trailer) { hp->flags |= UH_FL_HASTRAILER; invalid_if_trailer(hp->flags); - } else if (f == g_http_host && rb_hash_aref(req, f) != Qnil) { - return; /* full URLs in REQUEST_URI take precedence */ } - rb_hash_aset(req, f, v); + + e = rb_hash_aref(req, f); + if (e == Qnil) { + rb_hash_aset(req, f, v); + } else if (f != g_http_host) { + /* full URLs in REQUEST_URI take precedence for the Host: header */ + rb_str_buf_cat(e, ",", 1); + rb_str_buf_append(e, v); + } } /** Machine **/ -- cgit v1.2.3-24-ge0c7