Mercurial > hg > nginx
changeset 2348:8298d1be0b44 stable-0.6
r2068 merge:
the "Expect" header support
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 27 Nov 2008 14:22:34 +0000 |
parents | dc52b3f7591e |
children | 81f4bf441eb0 |
files | src/http/modules/ngx_http_proxy_module.c src/http/ngx_http_core_module.c src/http/ngx_http_request.c src/http/ngx_http_request.h |
diffstat | 4 files changed, 56 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Thu Nov 27 14:13:48 2008 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Thu Nov 27 14:22:34 2008 +0000 @@ -424,6 +424,7 @@ { ngx_string("Host"), ngx_string("$proxy_host") }, { ngx_string("Connection"), ngx_string("close") }, { ngx_string("Keep-Alive"), ngx_string("") }, + { ngx_string("Expect"), ngx_string("") }, { ngx_null_string, ngx_null_string } };
--- a/src/http/ngx_http_core_module.c Thu Nov 27 14:13:48 2008 +0000 +++ b/src/http/ngx_http_core_module.c Thu Nov 27 14:22:34 2008 +0000 @@ -30,6 +30,7 @@ static ngx_int_t ngx_http_core_find_location(ngx_http_request_t *r, ngx_array_t *locations, ngx_uint_t regex_start, size_t len); +static ngx_int_t ngx_http_core_send_continue(ngx_http_request_t *r); static ngx_int_t ngx_http_core_preconfiguration(ngx_conf_t *cf); static void *ngx_http_core_create_main_conf(ngx_conf_t *cf); @@ -785,7 +786,7 @@ { u_char *p; size_t len; - ngx_int_t rc; + ngx_int_t rc, expect; ngx_http_core_loc_conf_t *clcf; ngx_http_core_srv_conf_t *cscf; @@ -832,6 +833,14 @@ return NGX_OK; } + if (r->headers_in.expect) { + expect = ngx_http_core_send_continue(r); + + if (expect != NGX_OK) { + ngx_http_finalize_request(r, expect); + return NGX_OK; + } + } if (rc == NGX_HTTP_LOCATION_AUTO_REDIRECT) { r->headers_out.location = ngx_list_push(&r->headers_out.headers); @@ -1252,6 +1261,45 @@ } +static ngx_int_t +ngx_http_core_send_continue(ngx_http_request_t *r) +{ + ngx_int_t n; + ngx_str_t *expect; + + if (r->expect_tested) { + return NGX_OK; + } + + r->expect_tested = 1; + + expect = &r->headers_in.expect->value; + + if (expect->len != sizeof("100-continue") - 1 + || ngx_strncasecmp(expect->data, (u_char *) "100-continue", + sizeof("100-continue") - 1) + != 0) + { + return NGX_OK; + } + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "send 100 Continue"); + + n = r->connection->send(r->connection, + (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF, + sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1); + + if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) { + return NGX_OK; + } + + /* we assume that such small packet should be send successfully */ + + return NGX_HTTP_INTERNAL_SERVER_ERROR; +} + + ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r) {
--- a/src/http/ngx_http_request.c Thu Nov 27 14:13:48 2008 +0000 +++ b/src/http/ngx_http_request.c Thu Nov 27 14:22:34 2008 +0000 @@ -109,6 +109,10 @@ offsetof(ngx_http_headers_in_t, transfer_encoding), ngx_http_process_header_line }, + { ngx_string("Expect"), + offsetof(ngx_http_headers_in_t, expect), + ngx_http_process_unique_header_line }, + #if (NGX_HTTP_GZIP) { ngx_string("Accept-Encoding"), offsetof(ngx_http_headers_in_t, accept_encoding),
--- a/src/http/ngx_http_request.h Thu Nov 27 14:13:48 2008 +0000 +++ b/src/http/ngx_http_request.h Thu Nov 27 14:22:34 2008 +0000 @@ -171,6 +171,7 @@ ngx_table_elt_t *if_range; ngx_table_elt_t *transfer_encoding; + ngx_table_elt_t *expect; #if (NGX_HTTP_GZIP) ngx_table_elt_t *accept_encoding; @@ -467,6 +468,7 @@ unsigned request_complete:1; unsigned request_output:1; unsigned header_sent:1; + unsigned expect_tested:1; unsigned done:1; unsigned utf8:1;