Use buffered as it works for every nginx version, fix some typos

Author: joelwurtz

dev-build.sh

@@ -5,12 +5,41 @@
 #   https://github.com/openresty/nginx-devel-utils/blob/master/ngx-build
 # the resulting nginx is located at ./work/nginx/sbin/nginx
 root=`pwd`
-version=${1:-1.9.15}
+version=${1:-1.15.8}
 module_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 export NGX_BUILD_CC="gcc"
 export NGX_BUILD_JOBS=8
 
+ngx-build $version \
+    --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -Wdate-time -D_FORTIFY_SOURCE=2" \
+    --with-ld-opt="-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -fPIC" \
+    --with-debug \
+    --with-pcre-jit \
+    --with-ipv6 \
+    --with-http_stub_status_module \
+    --with-http_realip_module \
+    --with-http_auth_request_module \
+    --with-http_v2_module \
+    --with-http_dav_module \
+    --with-http_slice_module \
+    --with-threads \
+    --with-http_addition_module \
+    --with-http_flv_module \
+    --with-http_geoip_module=dynamic \
+    --with-http_gunzip_module \
+    --with-http_gzip_static_module \
+    --with-http_image_filter_module=dynamic \
+    --with-http_mp4_module \
+    --with-http_random_index_module \
+    --with-http_secure_link_module \
+    --with-http_sub_module \
+    --with-http_xslt_module=dynamic \
+    --with-mail=dynamic \
+    --with-stream=dynamic \
+    --add-module=$module_directory \
+    $opts \
+    --with-debug ||
 ngx-build $version \
     --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -Wdate-time -D_FORTIFY_SOURCE=2" \
     --with-ld-opt="-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -fPIC" \

src/ngx_http_redirectionio_module.c

@@ -20,9 +20,7 @@ static ngx_int_t ngx_http_redirectionio_redirect_handler(ngx_http_request_t *r);
 static ngx_int_t ngx_http_redirectionio_log_handler(ngx_http_request_t *r);
 
 static void ngx_http_redirectionio_write_match_rule_handler(ngx_event_t *wev);
-
 static void ngx_http_redirectionio_read_match_rule_handler(ngx_event_t *rev, cJSON *json);
-static void ngx_http_redirectionio_read_filter_headers_handler(ngx_event_t *rev, cJSON *json);
 
 /**
  * Commands definitions

src/ngx_http_redirectionio_module_filter.c

@@ -124,8 +124,6 @@ ngx_int_t ngx_http_redirectionio_body_filter(ngx_http_request_t *r, ngx_chain_t
     ngx_http_redirectionio_ctx_t    *ctx;
     ngx_http_redirectionio_conf_t   *conf;
     ngx_int_t                       status;
-    ngx_chain_t                     *cl;
-    ngx_str_t                       buffer_str;
 
     conf = ngx_http_get_module_loc_conf(r, ngx_http_redirectionio_module);
 
@@ -151,7 +149,7 @@ ngx_int_t ngx_http_redirectionio_body_filter(ngx_http_request_t *r, ngx_chain_t
     // Check if we are waiting for filtering headers or connection
     if (ctx->wait_for_header_filtering || ctx->wait_for_connection) {
         // Set request is buffered to avoid its destruction by nginx
-        r->blocked = 1;
+        r->buffered = 1;
 
         return NGX_AGAIN;
     }
@@ -172,7 +170,7 @@ ngx_int_t ngx_http_redirectionio_body_filter(ngx_http_request_t *r, ngx_chain_t
         if (status == NGX_AGAIN) {
             ctx->wait_for_connection = 1;
 
-            r->blocked = 1;
+            r->buffered = 1;
 
             return status;
         }
@@ -196,7 +194,7 @@ ngx_int_t ngx_http_redirectionio_body_filter(ngx_http_request_t *r, ngx_chain_t
         ctx->first_buffer = 0;
     }
 
-    r->blocked = 1;
+    r->buffered = 1;
 
     // Stream body
     return NGX_AGAIN;
@@ -345,7 +343,7 @@ static void ngx_http_redirectionio_read_filter_body_handler(ngx_event_t *rev, u_
     ngx_http_redirectionio_conf_t   *conf;
     ngx_http_request_t              *r;
     ngx_connection_t                *c;
-    ngx_chain_t                     *new_chain, *chain_sent;
+    ngx_chain_t                     *new_chain;
 
     c = rev->data;
     r = c->data;
@@ -376,7 +374,7 @@ static void ngx_http_redirectionio_read_filter_body_handler(ngx_event_t *rev, u_
 
         ngx_http_next_body_filter(r, new_chain);
 
-        r->blocked = 0;
+        r->buffered = 0;
 
         ngx_http_finalize_request(r, NGX_OK);
 
@@ -410,10 +408,7 @@ static void ngx_http_redirectionio_read_filter_body_handler(ngx_event_t *rev, u_
 }
 
 static void ngx_http_redirectionio_finalize_request(ngx_http_request_t *r, ngx_http_redirectionio_ctx_t *ctx) {
-    ngx_int_t                       status;
-    ngx_http_redirectionio_conf_t   *conf;
-
-    conf = ngx_http_get_module_loc_conf(r, ngx_http_redirectionio_module);
+    ngx_int_t   status;
 
     if (!ctx->headers_sent) {
         status = ngx_http_next_header_filter(r);
@@ -434,7 +429,7 @@ static void ngx_http_redirectionio_finalize_request(ngx_http_request_t *r, ngx_h
         }
     }
 
-    r->blocked = 0;
+    r->buffered = 0;
 
     ngx_http_finalize_request(r, NGX_OK);
 }

src/ngx_http_redirectionio_module_pool.c

@@ -230,7 +230,6 @@ void ngx_http_redirectionio_read_binary_handler(ngx_event_t *rev) {
     ngx_http_request_t              *r;
     ngx_http_redirectionio_ctx_t    *ctx;
     u_char                          *buffer;
-    u_char                          read;
     ssize_t                         readed, last_readed;
     int64_t                         buffer_size;
 

src/ngx_http_redirectionio_protocol.c

@@ -122,15 +122,12 @@ void ngx_http_redirectionio_protocol_free_log(ngx_http_redirectionio_log_t *log)
 }
 
 void ngx_http_redirectionio_protocol_send_filter_header(ngx_connection_t *c, ngx_http_request_t *r, ngx_str_t *project_key, ngx_str_t *rule_id) {
-    ssize_t             wlen;
     const char          *dst;
-    ngx_str_t           v;
-    ngx_str_t           encoded_headers = ngx_null_string;
+    char                *hname, *hvalue;
     ngx_list_part_t     *part;
     ngx_table_elt_t     *h;
     ngx_uint_t          i;
     cJSON               *query, *headers, *header;
-    ngx_pool_cleanup_t  *cln;
 
     query = cJSON_CreateObject();
     headers = cJSON_CreateArray();
@@ -154,15 +151,21 @@ void ngx_http_redirectionio_protocol_send_filter_header(ngx_connection_t *c, ngx
         }
 
         // Not used skip it
-        if (h[i].hash == 0) {
+        if (h[i].hash == 0 || h[i].value.len <= 0 || h[i].key.len <= 0) {
             continue;
         }
 
+        hname = strndup((const char *)h[i].key.data, h[i].key.len);
+        hvalue = strndup((const char *)h[i].value.data, h[i].value.len);
+
         header = cJSON_CreateObject();
-        cJSON_AddItemToObject(header, "name", cJSON_CreateString((const char *)h[i].key.data));
-        cJSON_AddItemToObject(header, "value", cJSON_CreateString((const char *)h[i].value.data));
+        cJSON_AddItemToObject(header, "name", cJSON_CreateString((const char *)hname));
+        cJSON_AddItemToObject(header, "value", cJSON_CreateString((const char *)hvalue));
 
         cJSON_AddItemToArray(headers, header);
+
+        free(hname);
+        free(hvalue);
     }
 
     dst = cJSON_PrintUnformatted(query);