diff options
| author | nginx <nginx@nginx.org> | 2013-02-19 15:28:29 +0000 |
|---|---|---|
| committer | Jon Kolb <jon@b0g.us> | 2013-02-19 15:28:29 +0000 |
| commit | a36b88c56061d08f8fbe96a51489bf3381792aca (patch) | |
| tree | fe157c41a9e920b0b05a343f2dc85312f080b6f4 /src/http/ngx_http_variables.c | |
| parent | bf3178867712d61cd5bb7692e6f837c4b0c51d8c (diff) | |
| download | nginx-a36b88c56061d08f8fbe96a51489bf3381792aca.tar.gz | |
Changes with nginx 1.3.13 19 Feb 2013v1.3.13
*) Change: a compiler with name "cc" is now used by default.
*) Feature: support for proxying of WebSocket connections.
Thanks to Apcera and CloudBees for sponsoring this work.
*) Feature: the "auth_basic_user_file" directive supports "{SHA}"
password encryption method.
Thanks to Louis Opter.
Diffstat (limited to 'src/http/ngx_http_variables.c')
| -rw-r--r-- | src/http/ngx_http_variables.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index 0c6872fe2..b8190b030 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -1747,7 +1747,11 @@ ngx_http_variable_sent_connection(ngx_http_request_t *r, size_t len; char *p; - if (r->keepalive) { + if (r->headers_out.status == NGX_HTTP_SWITCHING_PROTOCOLS) { + len = sizeof("upgrade") - 1; + p = "upgrade"; + + } else if (r->keepalive) { len = sizeof("keep-alive") - 1; p = "keep-alive"; |