Ticket #1450: log_no_escape.patch

src/http/modules/ngx_http_log_module.c

@@ -13 +13 @@
 #include <zlib.h>
 #endif
 
+#define ESCAPE_NONE    0
+#define ESCAPE_DEFAULT 1
+#define ESCAPE_JSON    2
 
 typedef struct ngx_http_log_op_s  ngx_http_log_op_t;
 
@@ -126 +129 @@
     ngx_http_log_op_t *op);
 
 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf,
-    ngx_http_log_op_t *op, ngx_str_t *value, ngx_uint_t json);
+    ngx_http_log_op_t *op, ngx_str_t *value, ngx_uint_t escape_format);
 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r,
     uintptr_t data);
 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf,
@@ -136 +139 @@
     uintptr_t data);
 static u_char *ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
     ngx_http_log_op_t *op);
+static size_t ngx_http_log_no_escape_variable_getlen(ngx_http_request_t *r,
+    uintptr_t data);
+static u_char *ngx_http_log_no_escape_variable(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op);
 
 
 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf);
@@ -905 +912 @@
 
 static ngx_int_t
 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op,
-    ngx_str_t *value, ngx_uint_t json)
+    ngx_str_t *value, ngx_uint_t escape_format)
 {
     ngx_int_t  index;
 
@@ -916 +923 @@
 
     op->len = 0;
 
-    if (json) {
-        op->getlen = ngx_http_log_json_variable_getlen;
-        op->run = ngx_http_log_json_variable;
-
-    } else {
-        op->getlen = ngx_http_log_variable_getlen;
-        op->run = ngx_http_log_variable;
+    switch (escape_format) {
+        case ESCAPE_JSON:
+            op->getlen = ngx_http_log_json_variable_getlen;
+            op->run = ngx_http_log_json_variable;
+            break;
+        case ESCAPE_NONE:
+            op->getlen = ngx_http_log_no_escape_variable_getlen;
+            op->run = ngx_http_log_no_escape_variable;
+            break;
+        default:
+            op->getlen = ngx_http_log_variable_getlen;
+            op->run = ngx_http_log_variable;
     }
 
     op->data = index;
@@ -1073 +1085 @@
 }
 
 
+static size_t
+ngx_http_log_no_escape_variable_getlen(ngx_http_request_t *r, uintptr_t data)
+{
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, data);
+
+    if (value == NULL || value->not_found) {
+        return 0;
+    }
+
+    value->escape = 0;
+
+    return value->len;
+}
+
+
+static u_char *
+ngx_http_log_no_escape_variable(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op)
+{
+    ngx_http_variable_value_t  *value;
+
+    value = ngx_http_get_indexed_variable(r, op->data);
+
+    if (value == NULL || value->not_found) {
+        return buf;
+    }
+
+    return ngx_cpymem(buf, value->data, value->len);
+}
+
+
 static void *
 ngx_http_log_create_main_conf(ngx_conf_t *cf)
 {
@@ -1536 +1581 @@
     size_t               i, len;
     ngx_str_t           *value, var;
     ngx_int_t           *flush;
-    ngx_uint_t           bracket, json;
+    ngx_uint_t           bracket, escape_format;
     ngx_http_log_op_t   *op;
     ngx_http_log_var_t  *v;
 
-    json = 0;
+    escape_format = ESCAPE_DEFAULT;
     value = args->elts;
 
     if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) {
         data = value[s].data + 7;
 
         if (ngx_strcmp(data, "json") == 0) {
-            json = 1;
+            escape_format = ESCAPE_JSON;
+        } else if (ngx_strcmp(data, "none") == 0) {
+            escape_format = ESCAPE_NONE;
 
         } else if (ngx_strcmp(data, "default") != 0) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1636 +1683 @@
                     }
                 }
 
-                if (ngx_http_log_variable_compile(cf, op, &var, json)
+                if (ngx_http_log_variable_compile(cf, op, &var, escape_format)
                     != NGX_OK)
                 {
                     return NGX_CONF_ERROR;