Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7514

Browse Source
This commit is contained in:
Hakase
2019-06-04 19:54:29 +09:00
parent 3f31c9270d
commit 3e1e852389
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nginx-http-flv-module
+1 -1
Submodule lib/nginx-http-flv-module updated: 6f733fa773...facb13cd01
lib/openssl
+1 -1
Submodule lib/openssl updated: 64d458de91...9a23f88dc2
src/http/ngx_http_upstream.c
+8 -11
View File
@@ -597,10 +597,6 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
u->cache_status = NGX_HTTP_CACHE_MISS; u->cache_status = NGX_HTTP_CACHE_MISS;
u->request_sent = 1; u->request_sent = 1;
} }
if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) {
rc = NGX_ERROR;
}
} }
if (rc != NGX_DECLINED) { if (rc != NGX_DECLINED) {
@@ -902,9 +898,14 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
|| c->stale_updating) && !r->background || c->stale_updating) && !r->background
&& u->conf->cache_background_update) && u->conf->cache_background_update)
{ {
r->cache->background = 1; if (ngx_http_upstream_cache_background_update(r, u) == NGX_OK) {
u->cache_status = rc; r->cache->background = 1;
rc = NGX_OK; u->cache_status = rc;
rc = NGX_OK;
} else {
rc = NGX_ERROR;
}
} }
break; break;
@@ -1106,10 +1107,6 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
{ {
ngx_http_request_t *sr; ngx_http_request_t *sr;
if (!r->cached || !r->cache->background) {
return NGX_OK;
}
if (r == r->main) { if (r == r->main) {
r->preserve_body = 1; r->preserve_body = 1;
} }