now we also allow "0" to indicate false values for srcache_store_skip and srcache_fetch_skip. also added more docs to README.

agentzh · agentzh · commit 480de4cc352f · 2011-05-04T19:42:57.000+08:00
diff --git a/README b/README
@@ -113,7 +113,12 @@ Caveat
 Directives
     srcache_fetch <method> <uri> <args>?
 
-    srcache_fetch_skip
+    srcache_fetch_skip <flag>
+        Default: srcache_fetch_skip 0
+
+        The <flag> argument supports nginx variables.
+        When this argument's value is not empty AND not equal to "0",
+        then the fetching process will be unconditionally skipped.
 
     srcache_store <method> <uri> <args>?
 
@@ -130,7 +135,24 @@ Directives
 
         When 0 is specified (the default value), there's no limit check at all.
 
-    srcache_store_skip
+    srcache_store_skip <flag>
+        Default: srcache_store_skip 0
+
+        The <flag> argument supports nginx variables.
+        When this argument's value is not empty AND not
+        equal to "0", then the storing process will be
+        unconditionally skipped.
+
+        Here's an example using Lua to set $nocache to avoid
+        storing URIs that contain the string "/tmp":
+
+            set_by_lua $nocache '
+                if string.match(ngx.var.uri, "/tmp") then
+                  return 1
+                end
+                return 0';
+
+            srcache_store_skip $nocache;
 
 Installation
     1. Grab the nginx source code from nginx.net (< http://nginx.net/ >), for
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -218,8 +218,12 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
             && skip.len
             && (skip.len != 1 || skip.data[0] != '0'))
     {
-        dd("bypass by srcache store skip");
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                "srcache_store skipped due to the true value fed into "
+                "srcache_store_skip: \"%V\"", &skip);
+
         ctx->store_skip = 1;
+
         return ngx_http_next_header_filter(r);
     }
 
@@ -666,9 +670,13 @@ ngx_http_srcache_access_handler(ngx_http_request_t *r)
 
     if (conf->fetch_skip != NULL
             && ngx_http_complex_value(r, conf->fetch_skip, &skip) == NGX_OK
-            && skip.len != 0)
+            && skip.len
+            && (skip.len != 1 || skip.data[0] != '0'))
     {
-        dd("bypass by srcache_fetch_skip");
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                "srcache_fetch skipped due to the true value fed into "
+                "srcache_fetch_skip: \"%V\"", &skip);
+
         return NGX_DECLINED;
     }
 
diff --git a/util/build.sh b/util/build.sh
@@ -23,9 +23,9 @@ if [ ! -s "nginx-$version.tar.gz" ]; then
     tar -xzvf nginx-$version.tar.gz || exit 1
 fi
 
-#tar -xzvf nginx-$version.tar.gz || exit 1
-#cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
-#patch -p0 < nginx-$version-no_pool.patch || exit 1
+tar -xzvf nginx-$version.tar.gz || exit 1
+cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
+patch -p0 < nginx-$version-no_pool.patch || exit 1
 #cp ~/work/nginx-$version-valgrind_fix.patch ./ || exit 1
 #patch -p0 < nginx-$version-valgrind_fix.patch || exit 1
 
diff --git a/valgrind.suppress b/valgrind.suppress
@@ -275,4 +275,17 @@
    fun:ngx_single_process_cycle
    fun:main
 }
-
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_pcalloc
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   fun:ngx_alloc
+   fun:ngx_palloc
+}
