Merge of r4372, r4373, r4374:
SCGI fixes: *) 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. *) Removed duplicate function declaration. *) Removed error if there is no Status header. The SCGI specification doesn't specify format of the response, and assuming CGI specs should be used there is no reason to complain. RFC 3875 explicitly states that "A Status header field is optional, and status 200 'OK' is assumed if it is omitted".
This commit is contained in:
parent
d750b1e99e
commit
f6ee2be6a0
|
@ -36,7 +36,6 @@ static ngx_int_t ngx_http_scgi_create_request(ngx_http_request_t *r);
|
|||
static ngx_int_t ngx_http_scgi_reinit_request(ngx_http_request_t *r);
|
||||
static ngx_int_t ngx_http_scgi_process_status_line(ngx_http_request_t *r);
|
||||
static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
|
||||
static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
|
||||
static void ngx_http_scgi_abort_request(ngx_http_request_t *r);
|
||||
static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
|
||||
|
||||
|
@ -824,11 +823,7 @@ ngx_http_scgi_process_status_line(ngx_http_request_t *r)
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -928,12 +923,12 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
|
|||
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||
"http scgi header done");
|
||||
|
||||
if (r->http_version > NGX_HTTP_VERSION_9) {
|
||||
u = r->upstream;
|
||||
|
||||
if (u->headers_in.status_n) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
u = r->upstream;
|
||||
|
||||
if (u->headers_in.status) {
|
||||
status_line = &u->headers_in.status->value;
|
||||
|
||||
|
@ -945,20 +940,15 @@ ngx_http_scgi_process_header(ngx_http_request_t *r)
|
|||
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 {
|
||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
"upstream sent neither valid HTTP/1.0 header "
|
||||
"nor \"Status\" header line");
|
||||
u->headers_in.status_n = 200;
|
||||
ngx_str_set(&u->headers_in.status_line, "200 OK");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue