diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-04-21 11:14:49 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-04-21 11:16:33 -0700 |
commit | ba916e542a46686185cb701e87a98a617c0f4078 (patch) | |
tree | fd2930b9f9649298146c07a9f9e08ce905f8b6e4 /ext | |
parent | b5ff27899a3caf8a66be1d024e727ac166dd3b3f (diff) | |
download | unicorn-ba916e542a46686185cb701e87a98a617c0f4078.tar.gz |
This means "Host: foo-bar:" (trailing colon) will assume server_port is 80, not a blank string.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/unicorn/http11/http11.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/unicorn/http11/http11.c b/ext/unicorn/http11/http11.c index f8ee151..36e0e54 100644 --- a/ext/unicorn/http11/http11.c +++ b/ext/unicorn/http11/http11.c @@ -288,9 +288,11 @@ static void header_done(void *data, const char *at, size_t length) if ((temp = rb_hash_aref(req, global_http_host)) != Qnil) { char *colon = memchr(RSTRING_PTR(temp), ':', RSTRING_LEN(temp)); if (colon) { + long port_start = colon - RSTRING_PTR(temp) + 1; + server_name = rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)); - server_port = rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, - RSTRING_LEN(temp)); + if ((RSTRING_LEN(temp) - port_start) > 0) + server_port = rb_str_substr(temp, port_start, RSTRING_LEN(temp)); } else { server_name = temp; } |