bugfix: the main request might prematurely terminate if the srcache_store subrequest was finalized with error codes.

agentzh · agentzh · commit 9d56ff943b23 · 2012-09-05T17:15:44.000-07:00
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -578,7 +578,7 @@ static ngx_int_t
 ngx_http_srcache_store_post_subrequest(ngx_http_request_t *r, void *data,
         ngx_int_t rc)
 {
-    return rc;
+    return NGX_OK;
 }
 
 
diff --git a/t/bugs.t b/t/bugs.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (4 * blocks() + 2);
+plan tests => repeat_each() * (4 * blocks() + 4);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -489,3 +489,110 @@ I do like you
 --- no_error_log
 [error]
 
+
+
+=== TEST 15: exit(ngx.ERROR) in srcache_store
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_store PUT /sub;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        content_by_lua '
+            ngx.exit(ngx.ERROR)
+        ';
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_srcache_store_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+
+--- stap_out
+finalize: 0
+finalize: -1
+post subreq: rc=-1, status=0
+finalize: 0
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: exit(500) in srcache_store
+--- config
+    memc_read_timeout 200ms;
+    location /foo {
+        satisfy any;
+
+        default_type text/css;
+
+        srcache_store PUT /sub;
+
+        echo I do like you;
+    }
+
+    location /sub {
+        return 500;
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_upstream_finalize_request) {
+    printf("upstream fin req: error=%d eof=%d rc=%d\n",
+        $r->upstream->peer->connection->read->error,
+        $r->upstream->peer->connection->read->eof,
+        $rc)
+    print_ubacktrace()
+}
+F(ngx_connection_error) {
+    printf("conn err: %d: %s\n", $err, user_string($text))
+    #print_ubacktrace()
+}
+F(ngx_http_srcache_store_post_subrequest) {
+    printf("post subreq: rc=%d, status=%d\n", $rc, $r->headers_out->status)
+    #print_ubacktrace()
+}
+F(ngx_http_finalize_request) {
+    printf("finalize: %d\n", $rc)
+}
+
+--- stap_out
+finalize: 0
+finalize: 500
+post subreq: rc=500, status=0
+finalize: 0
+
+--- response_headers
+Content-Type: text/css
+--- response_body
+I do like you
+--- no_error_log
+[error]
+

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ static ngx_int_t`
`578`	`578`	`ngx_http_srcache_store_post_subrequest(ngx_http_request_t r, void data,`
`579`	`579`	`ngx_int_t rc)`
`580`	`580`	`{`
`581`		`- return rc;`
	`581`	`+ return NGX_OK;`
`582`	`582`	`}`
`583`	`583`
`584`	`584`