186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

upgraded the nginx core to 1.5.7.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2013-12-15 13:21:56 -08:00
parent 02614af5ed
commit 8cec47f755
18 changed files with 2181 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/nginx-1.5.7-cache_lock_hang_in_subreq.patch Normal file
View File

@ -0,0 +1,22 @@
--- nginx-1.5.7/src/http/ngx_http_file_cache.c 2013-10-08 05:07:14.000000000 -0700
+++ nginx-1.5.7-patched/src/http/ngx_http_file_cache.c 2013-10-26 14:47:56.184041728 -0700
@@ -432,6 +432,7 @@ ngx_http_file_cache_lock_wait_handler(ng
ngx_uint_t wait;
ngx_msec_t timer;
ngx_http_cache_t *c;
+ ngx_connection_t *conn;
ngx_http_request_t *r;
ngx_http_file_cache_t *cache;
@@ -471,7 +472,10 @@ wakeup:
c->waiting = 0;
r->main->blocked--;
- r->connection->write->handler(r->connection->write);
+
+ conn = r->connection;
+ r->write_event_handler(r);
+ ngx_http_run_posted_requests(conn);
}