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

renamed upstream-truncation.patch to upstream_trauncation.patch and also added a test for the case that r->upstream->pipe is NULL.

This commit is contained in:
agentzh (Yichun Zhang) 2013-04-05 12:48:59 -07:00
parent e7053c9ca9
commit 5fb8647d23
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
patches/nginx-1.2.7-upstream-truncation.patch → patches/nginx-1.2.7-upstream_truncation.patch
View File

@ -1,5 +1,5 @@
--- nginx-1.2.7/src/http/ngx_http_upstream.c 2013-02-11 06:39:49.000000000 -0800 --- nginx-1.2.7/src/http/ngx_http_upstream.c 2013-02-11 06:39:49.000000000 -0800
+++ nginx-1.2.7-patched/src/http/ngx_http_upstream.c 2013-04-04 18:18:09.749357094 -0700 +++ nginx-1.2.7-patched/src/http/ngx_http_upstream.c 2013-04-05 12:24:34.108742922 -0700
@@ -2399,7 +2399,7 @@ ngx_http_upstream_process_non_buffered_u @@ -2399,7 +2399,7 @@ ngx_http_upstream_process_non_buffered_u
if (c->read->timedout) { if (c->read->timedout) {
@ -9,21 +9,7 @@
return; return;
} }
@@ -2415,11 +2415,13 @@ ngx_http_upstream_process_non_buffered_r @@ -2446,13 +2446,20 @@ ngx_http_upstream_process_non_buffered_r
ssize_t n;
ngx_buf_t *b;
ngx_int_t rc;
+ ngx_event_pipe_t *p;
ngx_connection_t *downstream, *upstream;
ngx_http_upstream_t *u;
ngx_http_core_loc_conf_t *clcf;
u = r->upstream;
+ p = u->pipe;
downstream = r->connection;
upstream = u->peer.connection;
@@ -2446,13 +2448,19 @@ ngx_http_upstream_process_non_buffered_r
if (u->busy_bufs == NULL) { if (u->busy_bufs == NULL) {
if (u->length == 0 if (u->length == 0
@ -31,7 +17,8 @@
- || upstream->read->error) - || upstream->read->error)
+ || (upstream->read->eof + || (upstream->read->eof
+ && u->length == -1 + && u->length == -1
+ && p->length == -1)) + && u->pipe
+ && u->pipe->length == -1))
{ {
ngx_http_upstream_finalize_request(r, u, 0); ngx_http_upstream_finalize_request(r, u, 0);
return; return;
@ -45,7 +32,7 @@
b->pos = b->start; b->pos = b->start;
b->last = b->start; b->last = b->start;
} }
@@ -2720,7 +2728,9 @@ ngx_http_upstream_process_request(ngx_ht @@ -2720,7 +2727,9 @@ ngx_http_upstream_process_request(ngx_ht
#endif #endif
@ -56,7 +43,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http upstream exit: %p", p->out); "http upstream exit: %p", p->out);
#if 0 #if 0
@@ -2729,6 +2739,14 @@ ngx_http_upstream_process_request(ngx_ht @@ -2729,6 +2738,14 @@ ngx_http_upstream_process_request(ngx_ht
ngx_http_upstream_finalize_request(r, u, 0); ngx_http_upstream_finalize_request(r, u, 0);
return; return;
} }
@ -71,7 +58,7 @@
} }
if (p->downstream_error) { if (p->downstream_error) {
@@ -3087,7 +3105,8 @@ ngx_http_upstream_finalize_request(ngx_h @@ -3087,7 +3104,8 @@ ngx_http_upstream_finalize_request(ngx_h
if (u->header_sent if (u->header_sent
&& rc != NGX_HTTP_REQUEST_TIME_OUT && rc != NGX_HTTP_REQUEST_TIME_OUT

4
util/mirror-tarballs
View File

@ -109,8 +109,8 @@ echo "$info_txt applying the location_if_inherits_proxy patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch || exit 1 patch -p1 < $root/patches/nginx-$main_ver-location_if_inherits_proxy.patch || exit 1
echo echo
echo "$info_txt applying the upstream-truncation patch for nginx" echo "$info_txt applying the upstream_truncation patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-upstream-truncation.patch || exit 1 patch -p1 < $root/patches/nginx-$main_ver-upstream_truncation.patch || exit 1
echo echo
echo "$info_txt applying the channel-uninit-params patch for nginx" echo "$info_txt applying the channel-uninit-params patch for nginx"