Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_upstream.c @ 398:9d81578d04bb NGINX_0_7_11
nginx 0.7.11
*) Change: now ngx_http_charset_module does not work by default with
text/css MIME type.
*) Feature: now nginx returns the 405 status code for POST method
requesting a static file only if the file exists.
*) Feature: the "proxy_ssl_session_reuse" directive.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after the "X-Accel-Redirect" redirection was used;
*) Bugfix: if a directory has search only rights and the first index
file was absent, then nginx returned the 500 status code.
*) Bugfix: in inclusive locations; the bugs had appeared in 0.7.1.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 18 Aug 2008 00:00:00 +0400 |
parents | 34fb3a573548 |
children | a8e3f1441eec |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -789,10 +789,12 @@ ngx_http_upstream_ssl_init_connection(ng c->sendfile = 0; u->output.sendfile = 0; - if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { - ngx_http_upstream_finalize_request(r, u, - NGX_HTTP_INTERNAL_SERVER_ERROR); - return; + if (u->conf->ssl_session_reuse) { + if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { + ngx_http_upstream_finalize_request(r, u, + NGX_HTTP_INTERNAL_SERVER_ERROR); + return; + } } r->connection->log->action = "SSL handshaking to upstream"; @@ -819,7 +821,9 @@ ngx_http_upstream_ssl_handshake(ngx_conn if (c->ssl->handshaked) { - u->peer.save_session(&u->peer, u->peer.data); + if (u->conf->ssl_session_reuse) { + u->peer.save_session(&u->peer, u->peer.data); + } c->write->handler = ngx_http_upstream_send_request_handler; c->read->handler = ngx_http_upstream_process_header; @@ -1300,6 +1304,8 @@ ngx_http_upstream_process_header(ngx_eve r->method = NGX_HTTP_GET; } + r->valid_unparsed_uri = 0; + ngx_http_internal_redirect(r, uri, &args); return; }