feature update

AIO threads for older nginx version
Remove null terminator for request body, base on lens instead

Author: Taymindis

build_test_resources/cfuntest.c

@@ -27,6 +27,7 @@ void my_app_simple_get_greeting(ngx_http_c_func_ctx_t *ctx) {
     ngx_http_c_func_log_info(ctx, "Calling back and log from my_app_simple_get");
 
     char *rep = "greeting from ngx_http_c_func testing";
+    // sleep(4); uncomment for testing aio threads
     ngx_http_c_func_write_resp(
         ctx,
         200,
@@ -134,8 +135,8 @@ void my_app_simple_post(ngx_http_c_func_ctx_t *ctx) {
             202,
             "202 Accepted and Processing",
             "text/plain",
-            ctx->req_body,
-            strlen(ctx->req_body)
+            ctx->req_body,            
+            ctx->req_body_len
         );
     }
 }

config

@@ -24,7 +24,7 @@ ngx_feature_incs="#include <ngx_http_c_func_module.h>"
 ngx_feature_path=
 ngx_feature_libs=
 # ngx_feature_exit_if_not_found=yes
-ngx_feature_test="int ngx_http_c_func_module_current_version_=ngx_http_c_func_module_version_10;"
+ngx_feature_test="int ngx_http_c_func_module_current_version_=ngx_http_c_func_module_version_11;"
 . auto/feature
 
 if [ $ngx_found != yes ]; then

src/ngx_http_c_func_module.c

@@ -134,7 +134,7 @@ static ngx_int_t ngx_http_c_func_get_resp_var(ngx_http_request_t *r, ngx_http_va
 static void ngx_http_c_func_set_resp_var_with_r(ngx_http_request_t *r, ngx_http_c_func_ctx_t *ctx, const char* resp_content);
 static void ngx_http_c_func_output_filter(ngx_http_request_t *r);
 
-#if (NGX_THREADS) && (nginx_version > 1013003)
+#if (NGX_THREADS)
 static void ngx_http_c_func_after_process(ngx_event_t *ev);
 static void ngx_http_c_func_process_t_handler(void *data, ngx_log_t *log);
 #endif
@@ -524,7 +524,7 @@ ngx_http_c_func_post_configuration(ngx_conf_t *cf) {
 #if (nginx_version > 1013003)
         h = ngx_array_push(&cmcf->phases[NGX_HTTP_PRECONTENT_PHASE].handlers);
 #else  /**Access Phase is the only last phase for multi thread**/
-        h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
+        h = ngx_array_push(&cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers);
 #endif
         if (h == NULL) {
             return NGX_ERROR;
@@ -535,7 +535,7 @@ ngx_http_c_func_post_configuration(ngx_conf_t *cf) {
 
     /*** Default Init for shm with 1M if pool is empty***/
     if (mcf != NULL && !mcf->is_cache_defined ) {
-        ngx_conf_log_error(NGX_LOG_INFO, cf,   0, "%s", "Init Default Share memory with 1k");
+        ngx_conf_log_error(NGX_LOG_INFO, cf,   0, "%s", "Init Default Share memory with 1M");
         ngx_str_t default_size = ngx_string("1M");
 
         ngx_shm_zone_t *shm_zone = ngx_shared_memory_add(cf, &mcf->shm_ctx->name, ngx_parse_size(&default_size), &ngx_http_c_func_module);
@@ -554,7 +554,7 @@ ngx_http_c_func_post_configuration(ngx_conf_t *cf) {
 static ngx_int_t
 ngx_http_c_func_pre_configuration(ngx_conf_t *cf) {
 
-#ifndef ngx_http_c_func_module_version_10
+#ifndef ngx_http_c_func_module_version_11
     ngx_conf_log_error(NGX_LOG_EMERG, cf,  0, "%s", "the latest ngx_http_c_func_module.h not found in the c header path, \
         please copy latest ngx_http_c_func_module.h to your /usr/include or /usr/local/include or relavent header search path \
         with read and write permission.");
@@ -578,11 +578,7 @@ ngx_http_c_func_module_init(ngx_cycle_t *cycle) {
     cscfp = cmcf->servers.elts;
 
 #if (NGX_THREADS)
-#if(nginx_version > 1013003)
     ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, " enabled aio threads for c-function module ");
-#else
-    ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, " upgrade to nginx 1.13.4 and above to enable aio threads for c-function module ");
-#endif
 #endif
 
     for (s = 0; s < cmcf->servers.nelts; s++) {
@@ -895,7 +891,7 @@ ngx_http_c_func_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) {
     return NGX_CONF_OK;
 }
 
-#if (NGX_THREADS) && (nginx_version > 1013003)
+#if (NGX_THREADS)
 static void
 ngx_http_c_func_process_t_handler(void *data, ngx_log_t *log)
 {
@@ -1040,7 +1036,7 @@ ngx_http_c_func_precontent_handler(ngx_http_request_t *r) {
             for (cl = r->request_body->bufs; cl; cl = cl->next) {
                 p = ngx_copy(p, cl->buf->pos, cl->buf->last - cl->buf->pos);
             }
-            buf[len] = '\0';
+            // buf[len] = '\0';
 
         } else {
             b = r->request_body->bufs->buf;
@@ -1049,7 +1045,7 @@ ngx_http_c_func_precontent_handler(ngx_http_request_t *r) {
             }
             buf = ngx_palloc(r->pool, (len + 1) );
             ngx_memcpy(buf, b->pos, len);
-            buf[len] = '\0';
+            // buf[len] = '\0';
         }
         /************End REading ****************/
 
@@ -1082,7 +1078,7 @@ ngx_http_c_func_precontent_handler(ngx_http_request_t *r) {
         new_ctx->req_body_len = 0;
     }
 
-#if (NGX_THREADS) && (nginx_version > 1013003)
+#if (NGX_THREADS)
     ngx_thread_pool_t         *tp;
     ngx_http_core_loc_conf_t     *clcf;
 
@@ -1114,11 +1110,8 @@ ngx_http_c_func_precontent_handler(ngx_http_request_t *r) {
         return NGX_DECLINED;
     }
     ngx_http_c_func_output_filter(r);
-#if (nginx_version > 1013003)
+    
     return NGX_DONE;
-#else
-    return NGX_OK;
-#endif
 } /* ngx_http_c_func_precontent_handler */
 
 

src/ngx_http_c_func_module.h

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#define ngx_http_c_func_module_version_10 10
+#define ngx_http_c_func_module_version_11 11
 
 
 #define ngx_http_c_func_content_type_plaintext "text/plain"
@@ -54,8 +54,8 @@
 typedef struct {
 	char *req_args; // Uri Args
 	u_char *req_body; // Request Body
+    size_t req_body_len; // length of body
 	void *shared_mem;
-	size_t req_body_len; // length of body, including terminating \0
 
 	/* internal */
 	void* __r__;

t/libcfuntest.so

@@ -14,7 +14,7 @@ __DATA__
 
 === TEST 1: Set C_FUNC_TEST_1
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunGreeting {
     ngx_http_c_func_call "my_app_simple_get_greeting";
 }
@@ -26,9 +26,10 @@ Content-Type: text/plain
 --- response_body_like eval
 qr/greeting from ngx_http_c_func testing$/
 
+
 === TEST 2: Set C_FUNC_TEST_ARGS
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunARGS {
     ngx_http_c_func_call "my_app_simple_get_args";
 }
@@ -43,7 +44,7 @@ qr/greeting=hello_nginx\?id=129310923$/
 
 === TEST 3: Set C_FUNC_TEST_POST_NONE
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunPOSTBody {
     ngx_http_c_func_call "my_app_simple_post";
 }
@@ -59,7 +60,7 @@ qr/\s/
 
 === TEST 4: Set C_FUNC_TEST_GET_TOKEN
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunCVerifyToken {
     ngx_http_c_func_call "my_app_simple_get_token_args";
 }
@@ -74,7 +75,7 @@ qr/QVNKS0pDQVNLTEpDS0xBU0pXbGtlandrbGplIGpka2FqbGthc2tsZGtqbHNrICBrZGpha2xzZGphc
 
 === TEST 5: Set C_FUNC_TEST_GET_ERROR_RESP
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFUNCERRORRESP {
     ngx_http_c_func_call "my_app_simple_get_no_resp";
 }
@@ -87,7 +88,7 @@ Content-Type: text/html
 
 === TEST 6: Set C_FUNC_TEST_GET_CALLOC_FROM_POOL
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFUNCCallocFromPool {
     ngx_http_c_func_call "my_app_simple_get_calloc_from_pool";
 }
@@ -102,7 +103,7 @@ qr/This is the message calloc from pool$/
 
 === TEST 7: Set C_FUNC_TEST_POST_BODY
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunPOSTBody {
     ngx_http_c_func_call "my_app_simple_post";
 }
@@ -118,7 +119,7 @@ qr/greeting=enjoy-http-c-function-testing$/
 
 === TEST 8: Set C_FUNC_TEST_CACHE
 --- config
-ngx_http_c_func_link_lib "/home/dispatch/testMap/c-lib/nginx-c-function/t/libcfuntest.so";
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
 location = /testCFunGetCache {
     ngx_http_c_func_call "my_app_simple_get_cache";
 }
@@ -129,3 +130,68 @@ POST /testCFunGetCache
 Content-Type: text/plain
 --- response_body_like eval
 qr/This is cache value$/
+
+
+=== TEST 9: Set C_FUNC_TEST_VARIABLE
+--- config
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
+location = /testCFunGreeting {
+    ngx_http_c_func_call "my_app_simple_get_greeting" respTo=myRespVariable;
+    return 200 $myRespVariable;
+}
+--- request
+GET /testCFunGreeting
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like eval
+qr/greeting from ngx_http_c_func testing$/
+
+
+=== TEST 10: Set C_FUNC_TEST_ARGS_AND_VARIABLE
+--- config
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
+location = /testCFunARGS {
+    ngx_http_c_func_call "my_app_simple_get_args" respTo=simpleRespVariable;
+    return 200 $simpleRespVariable;
+}
+--- request
+GET /testCFunARGS?greeting=hello_nginx?id=129310923
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like eval
+qr/greeting=hello_nginx\?id=129310923$/
+
+
+=== TEST 11: Set C_FUNC_AIO_THREADS_TEST_ARGS_AND_VARIABLE
+--- config
+aio threads;
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
+location = /testCFunARGS {
+    ngx_http_c_func_call "my_app_simple_get_args" respTo=simpleRespVariable;
+    return 200 $simpleRespVariable;
+}
+--- request
+GET /testCFunARGS?greeting=hello_nginx?id=129310923
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like eval
+qr/greeting=hello_nginx\?id=129310923$/
+
+
+=== TEST 12: Set C_FUNC_AIO_THREADS_TEST
+--- config
+aio threads;
+ngx_http_c_func_link_lib "/home/taymindis/github/nginx-c-function/t/libcfuntest.so";
+location = /testCFunGreeting {
+    ngx_http_c_func_call "my_app_simple_get_greeting";
+}
+--- request
+GET /testCFunGreeting
+--- error_code: 200
+--- response_headers
+Content-Type: text/plain
+--- response_body_like eval
+qr/greeting from ngx_http_c_func testing$/