186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed an extra line from the nonbuffered-upstream-truncation patch.

This commit is contained in:
agentzh (Yichun Zhang) 2012-09-09 21:58:41 -07:00
parent 02153fd2c8
commit 9e9cf9630c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch
View File

@ -1,5 +1,5 @@
--- nginx-1.2.3/src/http/ngx_http_upstream.c 2012-08-06 10:34:08.000000000 -0700
+++ nginx-1.2.3-patched/src/http/ngx_http_upstream.c 2012-09-09 11:37:23.672421961 -0700
+++ nginx-1.2.3-patched/src/http/ngx_http_upstream.c 2012-09-09 21:58:04.727761891 -0700
@@ -2383,7 +2383,7 @@
if (c->read->timedout) {
@ -29,7 +29,7 @@
b->pos = b->start;
b->last = b->start;
}
@@ -2710,7 +2714,17 @@
@@ -2710,7 +2714,16 @@
#if 0
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
#endif
@ -41,14 +41,13 @@
+ ngx_http_upstream_finalize_request(r, u, 0);
+
+ } else {
+
+ ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
+ }
+
return;
}
}
@@ -3073,6 +3087,13 @@
@@ -3073,6 +3086,13 @@
&& rc != NGX_HTTP_REQUEST_TIME_OUT
&& (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
{