Merge branch 'master' of github.com:agentzh/memc-nginx-module

.gitignore

@@ -42,4 +42,3 @@ src/request.h
 src/request.c
 ctags
 nginx
-t

src/ngx_http_memc_handler.c

@@ -195,7 +195,9 @@ ngx_http_memc_handler(ngx_http_request_t *r)
         mlcf->upstream.upstream = ngx_http_memc_upstream_add(r, &url);
 
         if (mlcf->upstream.upstream == NULL) {
-            dd("memc: upstream \"%.*s\" not found", target.len, target.data);
+            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                   "memc: upstream \"%V\" not found", &target);
+
             return NGX_HTTP_INTERNAL_SERVER_ERROR;
         }
     }

src/ngx_http_memc_module.c

@@ -247,7 +247,7 @@ ngx_http_memc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 static char *
 ngx_http_memc_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    ngx_http_memc_loc_conf_t *mlcf = conf;
+    ngx_http_memc_loc_conf_t  *mlcf = conf;
 
     ngx_str_t                 *value;
     ngx_url_t                  url;

test/t/errors.t

@@ -0,0 +1,30 @@
+# vi:filetype=perl
+
+use lib 'lib';
+use Test::Nginx::LWP;
+
+plan tests => repeat_each() * 2 * blocks();
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#no_diff;
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: empty pass
+little-endian systems only
+
+--- http_config eval: $::http_config
+--- config
+    location /memc {
+        set $memc_key foo;
+        set $backend "not-exist";
+        memc_pass $backend;
+    }
+--- request
+GET /memc
+--- error_code: 500
+--- response_body_like: 500 Internal Server Error
+

test/t/stats.t

@@ -27,7 +27,8 @@ __DATA__
 --- response_body_like: ^(?:STAT [^\r]*\r\n)*END\r\n$
 
 
-=== TEST 1: timeout
+
+=== TEST 2: timeout
 --- config
     memc_connect_timeout 10ms;
     memc_send_timeout 10ms;

util/build.sh

@@ -2,7 +2,7 @@
 
 # this file is mostly meant to be used by the author himself.
 
-ragel -I src -G2 src/ngx_http_memc_response.rl
+#ragel -I src -G2 src/ngx_http_memc_response.rl
 
 if [ $? != 0 ]; then
     echo 'Failed to generate the memcached response parser.' 1>&2
@@ -25,8 +25,8 @@ if [ ! -s "nginx-$version.tar.gz" ]; then
 fi
 
 #tar -xzvf nginx-$version.tar.gz || exit 1
-#cp $root/../no-pool-nginx/nginx-0.8.41-no_pool.patch ./
-#patch -p0 < nginx-0.8.41-no_pool.patch
+#cp $root/../no-pool-nginx/nginx-0.8.53-no_pool.patch ./
+#patch -p0 < nginx-0.8.53-no_pool.patch
 
 if [ -n "$2" ]; then
     cd nginx-$version-$2/
@@ -41,7 +41,7 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
           --add-module=$root/../ndk-nginx-module \
           --add-module=$root/../eval-nginx-module \
           --add-module=$root/../echo-nginx-module \
-          --add-module=$home/work/nginx/ngx_http_upstream_keepalive-2ce9d8a1ca93 \
+          --add-module=$home/work/nginx/ngx_http_upstream_keepalive-cad8bc39d98d \
           --with-debug
           #--add-module=$home/work/nginx/nginx_upstream_hash-0.3 \
   #--without-http_ssi_module  # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)