# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1323708541 -10800
# Node ID 156d489a0d1319ae2df625521a76a3e527c5a5c2
# Parent 189afff6503fdb14e2ba72336a68d6673637f7d7
Fixed incorrect use of r->http_version in scgi module.

The r->http_version is a version of client's request, and modules must
not set it unless they are really willing to downgrade protocol version
used for a response (i.e. to HTTP/0.9 if no response headers are available).
In neither case r->http_version may be upgraded.

The former code downgraded response from HTTP/1.1 to HTTP/1.0 for no reason,
causing various problems (see ticket #66). It was also possible that
HTTP/0.9 requests were upgraded to HTTP/1.0.

diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -857,11 +857,7 @@ ngx_http_scgi_process_status_line(ngx_ht
}

if (rc == NGX_ERROR) {
-
- r->http_version = NGX_HTTP_VERSION_9;
-
u->process_header = ngx_http_scgi_process_header;
-
return ngx_http_scgi_process_header(r);
}

@@ -961,10 +957,6 @@ ngx_http_scgi_process_header(ngx_http_re
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http scgi header done");

- if (r->http_version > NGX_HTTP_VERSION_9) {
- return NGX_OK;
- }
-
u = r->upstream;

if (u->headers_in.status) {
@@ -978,17 +970,15 @@ ngx_http_scgi_process_header(ngx_http_re
return NGX_HTTP_UPSTREAM_INVALID_HEADER;
}

- r->http_version = NGX_HTTP_VERSION_10;
u->headers_in.status_n = status;
u->headers_in.status_line = *status_line;

} else if (u->headers_in.location) {
- r->http_version = NGX_HTTP_VERSION_10;
u->headers_in.status_n = 302;
ngx_str_set(&u->headers_in.status_line,
"302 Moved Temporarily");

- } else {
+ } else if (u->headers_in.status_n == 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"upstream sent neither valid HTTP/1.0 header "
"nor \"Status\" header line");

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel