ngx-json-log: fixes #40

Author: fooinha

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: focal
 
 os: linux
 
@@ -14,15 +14,17 @@ cache:
 
 env:
   global:
+    - DEBIAN_FRONTEND=noninteractive
     - NGINX_PREFIX=/opt/nginx
     - JOBS=4
     - PATH=$PATH:$NGINX_PREFIX/sbin
 
 before_install:
-  - sudo apt-get install -qq -y software-properties-common
-  - sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
-  - sudo apt-get update -qq -y --fix-missing
-  - sudo apt-get install -qq -y --fix-missing cpanminus librdkafka-dev libjansson-dev mercurial build-essential make clang valgrind libjson-perl
+  - sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+  - sudo apt-get update -y
+  - sudo apt-get install -y tzdata
+  - sudo dpkg-reconfigure --frontend noninteractive tzdata
+  - sudo apt-get install -y cpanminus libpcre3-dev librdkafka-dev libjansson-dev mercurial build-essential make clang valgrind libjson-perl git
 
 install:
   - if [ ! -d /opt ]; then mkdir /opt; fi
@@ -31,8 +33,7 @@ install:
 
 script:
   - cd nginx
-  - ls -la
-  - auto/configure --with-debug --with-stream --with-ld-opt="-Wl,-E" --prefix=$NGINX_PREFIX --add-module=$PWD/.. > build.log 2>&1 || (cat build.log && exit 1)
+  - auto/configure --with-debug --with-stream --with-ld-opt="-Wl,-E" --prefix=$NGINX_PREFIX --without-http_gzip_module --add-module=$PWD/.. > build.log 2>&1 || (cat build.log && exit 1)
   - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make install > build.log 2>&1 || (cat build.log && exit 1)
   - cd ..

src/ngx_http_json_log_variables.c

@@ -38,36 +38,50 @@ static ngx_int_t
 ngx_http_json_log_get_variable_req_headers(ngx_http_request_t *r,
         ngx_http_variable_value_t *v, uintptr_t data);
 
+static ngx_int_t empty_get_handler(ngx_http_request_t *r,
+        ngx_http_variable_value_t *v, uintptr_t data) {
+
+    /*  Does Nothing */
+    return NGX_OK;
+}
+
+static void empty_set_handler(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data) {
+    /*  Does Nothing */
+    return;
+}
+
+
 /* variables list */
 static ngx_http_variable_t  ngx_http_json_log_variables_list[] = {
         {   ngx_string("http_json_log_req_headers"),
-            NULL,
+            empty_set_handler,
             ngx_http_json_log_get_variable_req_headers,
             0, 0, 0
         },
         {   ngx_string("http_json_log_resp_headers"),
             ngx_http_json_log_set_variable_resp_headers,
-            NULL,
+            empty_get_handler,
             0, 0, 0
         },
         {   ngx_string("http_json_log_req_body"),
             ngx_http_json_log_set_variable_req_body,
-            NULL,
+            empty_get_handler,
             0, 0, 0
         },
         {   ngx_string("http_json_err_log_req"),
             ngx_http_json_log_set_variable_req_body,
-            NULL,
+            empty_get_handler,
             0, 0, 0
         },
         {   ngx_string("http_json_log_req_body_hexdump"),
             ngx_http_json_log_set_variable_req_body_hexdump,
-            NULL,
+            empty_get_handler,
             0, 0, 0
         },
         {   ngx_string("http_json_err_log_req_hexdump"),
             ngx_http_json_log_set_variable_req_body_hexdump,
-            NULL,
+            empty_get_handler,
             0, 0, 0
         }
 };

src/ngx_json_log_text.c

@@ -57,13 +57,13 @@ struct ngx_json_log_output_cxt_s {
 
 
 /* format prefixes types and values */
-static const char *ngx_json_log_true_value               = "true";
-static const char *ngx_json_log_array_prefix             = "a:";
-static const char *ngx_json_log_boolean_prefix           = "b:";
-static const char *ngx_json_log_string_prefix            = "s:";
-static const char *ngx_json_log_real_prefix              = "r:";
-static const char *ngx_json_log_int_prefix               = "i:";
-static const char *ngx_json_log_null_prefix              = "n:";
+const char *ngx_json_log_true_value               = "true";
+const char *ngx_json_log_array_prefix             = "a:";
+const char *ngx_json_log_boolean_prefix           = "b:";
+const char *ngx_json_log_string_prefix            = "s:";
+const char *ngx_json_log_real_prefix              = "r:";
+const char *ngx_json_log_int_prefix               = "i:";
+const char *ngx_json_log_null_prefix              = "n:";
 
 typedef struct ngx_json_log_output_cxt_s ngx_json_log_output_cxt_t;