now we skip NULL chains in our output filters and also removed the SUBREQUEST_IN_MEMORY flag for our srcache_store subrequests because it will cause mysterious hanging issues when memcached returns CLIENT_ERROR for "get".

agentzh · agentzh · commit 9fa518fceb2f · 2011-03-05T14:34:10.000+08:00
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -285,6 +285,10 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     dd_enter();
 
+    if (in == NULL) {
+        return ngx_http_next_body_filter(r, NULL);
+    }
+
     ctx = ngx_http_get_module_ctx(r, ngx_http_srcache_filter_module);
 
     if (ctx == NULL || ctx->from_cache) {
@@ -346,7 +350,7 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     }
 
     if (ctx->store_response) {
-        dd("storing the response");
+        dd("storing the response: %p", in);
 
         last = 0;
 
@@ -1065,7 +1069,6 @@ ngx_http_srcache_store_subrequest(ngx_http_request_t *r,
 
     ngx_http_srcache_parsed_request_t  *parsed_sr;
 
-
     dd_enter();
     dd("store subrequest");
 
@@ -1143,11 +1146,14 @@ ngx_http_srcache_store_subrequest(ngx_http_request_t *r,
     dd("store args: %.*s", (int) parsed_sr->args.len,
             parsed_sr->args.data);
 
-    flags |= NGX_HTTP_SUBREQUEST_IN_MEMORY;
+#if 0
+    flags |= NGX_HTTP_SUBREQUEST_IN_MEMORY|NGX_HTTP_SUBREQUEST_WAITED;
+#endif
 
     if (r->parent == NULL) {
         rc = ngx_http_subrequest(r, &parsed_sr->location, &parsed_sr->args,
             &sr, NULL, flags);
+
     } else {
         rc = ngx_http_subrequest(r->parent, &parsed_sr->location, &parsed_sr->args,
             &sr, NULL, flags);
diff --git a/util/build.sh b/util/build.sh
@@ -21,14 +21,10 @@ fi
 #cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
 #patch -p0 < nginx-$version-no_pool.patch || exit 1
 
-if [ -n "$2" ]; then
-    cd nginx-$version-$2/
-else
-    cd nginx-$version/
-fi
+cd nginx-$version/
 
 if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
-    ./configure --prefix=/opt/nginx \
+    ./configure --prefix=$root/work/nginx \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \
@@ -57,11 +53,11 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
   #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
 
 fi
-if [ -f /opt/nginx/sbin/nginx ]; then
-    rm -f /opt/nginx/sbin/nginx
+if [ -f $root/work/nginx/sbin/nginx ]; then
+    rm -f $root/work/nginx/sbin/nginx
 fi
-if [ -f /opt/nginx/logs/nginx.pid ]; then
-    kill `cat /opt/nginx/logs/nginx.pid`
+if [ -f $root/work/nginx/logs/nginx.pid ]; then
+    kill `cat $root/work/nginx/logs/nginx.pid`
 fi
 make -j3
 make install
