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

updated the dtrace patch as well as the nonbuffered-upstream-truncation patch.

Browse Source
This commit is contained in:
agentzh (Yichun Zhang)
2012-09-09 12:53:03 -07:00
parent 3001c7a52e
commit 6a37c9bfdc
3 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
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-05 20:57:44.832566031 -0700
+++ nginx-1.2.3-patched/src/http/ngx_http_upstream.c 2012-09-09 11:37:23.672421961 -0700
@@ -2383,7 +2383,7 @@
if (c->read->timedout) {
@ -9,15 +9,14 @@
return;
}
@@ -2429,14 +2429,16 @@
@@ -2430,13 +2430,17 @@
if (u->busy_bufs == NULL) {
- if (u->length == 0
if (u->length == 0
- || upstream->read->eof
- || upstream->read->error)
- {
+ if (u->length == 0) {
+ || (upstream->read->eof && u->headers_in.content_length_n == -1))
{
ngx_http_upstream_finalize_request(r, u, 0);
return;
}
@ -30,7 +29,26 @@
b->pos = b->start;
b->last = b->start;
}
@@ -3073,6 +3075,13 @@
@@ -2710,7 +2714,17 @@
#if 0
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
#endif
- ngx_http_upstream_finalize_request(r, u, 0);
+
+ if (p->upstream_done
+ || (p->upstream_eof && u->headers_in.content_length_n == -1))
+ {
+ 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 @@
&& rc != NGX_HTTP_REQUEST_TIME_OUT
&& (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
{