|
|
|
@ -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/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 @@
|
|
|
|
@@ -2383,7 +2383,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
if (c->read->timedout) {
|
|
|
|
if (c->read->timedout) {
|
|
|
|
@ -29,7 +29,7 @@
|
|
|
|
b->pos = b->start;
|
|
|
|
b->pos = b->start;
|
|
|
|
b->last = b->start;
|
|
|
|
b->last = b->start;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -2710,7 +2714,17 @@
|
|
|
|
@@ -2710,7 +2714,16 @@
|
|
|
|
#if 0
|
|
|
|
#if 0
|
|
|
|
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
|
|
|
|
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@ -41,14 +41,13 @@
|
|
|
|
+ ngx_http_upstream_finalize_request(r, u, 0);
|
|
|
|
+ ngx_http_upstream_finalize_request(r, u, 0);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
|
|
|
|
+ ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
|
|
|
|
+ ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -3073,6 +3087,13 @@
|
|
|
|
@@ -3073,6 +3086,13 @@
|
|
|
|
&& rc != NGX_HTTP_REQUEST_TIME_OUT
|
|
|
|
&& rc != NGX_HTTP_REQUEST_TIME_OUT
|
|
|
|
&& (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
|
|
|
|
&& (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
agentzh (Yichun Zhang)
12 years ago