fthielen/nginx-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Downgrade auf Nginx 1.13.3

Browse Source
This commit is contained in:
fthielen
2017-08-15 10:34:44 +02:00
parent 812e82efb9
commit cf5a226c52
46 changed files with 455 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/ngx_http_upstream.c
View File

@@ -427,7 +427,7 @@ static ngx_http_variable_t ngx_http_upstream_vars[] = {
{ ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable,
0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 },
ngx_http_null_variable
{ ngx_null_string, NULL, NULL, 0, 0, 0 }
};
@@ -1077,10 +1077,6 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
return NGX_OK;
}
if (r == r->main) {
r->preserve_body = 1;
}
if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
NGX_HTTP_SUBREQUEST_CLONE
|NGX_HTTP_SUBREQUEST_BACKGROUND)
@@ -2861,9 +2857,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
u->pipe->downstream_error = 1;
}
if (r->request_body && r->request_body->temp_file
&& r == r->main && !r->preserve_body)
{
if (r->request_body && r->request_body->temp_file) {
ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
r->request_body->temp_file->file.fd = NGX_INVALID_FILE;
}
@@ -4509,7 +4503,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
}
if (*p >= '0' && *p <= '9') {
n = n * 10 + (*p - '0');
n = n * 10 + *p - '0';
continue;
}
@@ -4537,7 +4531,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
}
if (*p >= '0' && *p <= '9') {
n = n * 10 + (*p - '0');
n = n * 10 + *p - '0';
continue;
}
@@ -4560,7 +4554,7 @@ ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
}
if (*p >= '0' && *p <= '9') {
n = n * 10 + (*p - '0');
n = n * 10 + *p - '0';
continue;
}