rename DDEBUG to MODSECURITY_DDEBUG

phantom-az · phantom-az · commit f6a544257448 · 2016-08-17T11:50:24.000Z
change way MODSECURITY_SANITY_CHECKS defined

these changes allow managing both these defines through CFLGAS
redefinition and do not pollute other modules w/ unexpected defines
diff --git a/src/ddebug.h b/src/ddebug.h
@@ -13,8 +13,8 @@
 #include <ngx_core.h>
 
 /*
- * #undef DDEBUG
- * #define DDEBUG 1
+ * #undef MODSECURITY_DDEBUG
+ * #define MODSECURITY_DDEBUG 1
  */
 
 /*
@@ -26,9 +26,11 @@
  * If performance is not a concern, it is safe to keep it set.
  *
  */
+#ifndef MODSECURITY_SANITY_CHECKS
 #define MODSECURITY_SANITY_CHECKS 1
+#endif
 
-#if defined(DDEBUG) && (DDEBUG)
+#if defined(MODSECURITY_DDEBUG) && (MODSECURITY_DDEBUG)
 
 #   if (NGX_HAVE_VARIADIC_MACROS)
 
@@ -65,7 +67,7 @@ static void dd(const char *fmt, ...) {
 
 #endif
 
-#if defined(DDEBUG) && (DDEBUG)
+#if defined(MODSECURITY_DDEBUG) && (MODSECURITY_DDEBUG)
 
 #define dd_check_read_event_handler(r)   \
     dd("r->read_event_handler = %s", \
diff --git a/src/ngx_http_modsecurity_body_filter.c b/src/ngx_http_modsecurity_body_filter.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 
@@ -38,7 +38,7 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     int buffer_fully_loadead = 0;
     ngx_chain_t *chain = in;
     ngx_http_modsecurity_ctx_t *ctx = NULL;
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ngx_http_modsecurity_loc_conf_t *loc_cf = NULL;
     ngx_list_part_t *part = &r->headers_out.headers.part;
     ngx_table_elt_t *data = part->elts;
@@ -57,7 +57,7 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         return ngx_http_next_body_filter(r, in);
     }
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     loc_cf = ngx_http_get_module_loc_conf(r, ngx_http_modsecurity);
     if (loc_cf != NULL && loc_cf->sanity_checks_enabled != NGX_CONF_UNSET)
     {
diff --git a/src/ngx_http_modsecurity_common.h b/src/ngx_http_modsecurity_common.h
@@ -98,7 +98,7 @@ ngx_int_t ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *i
 /* ngx_http_modsecurity_header_filter.c */
 ngx_int_t ngx_http_modsecurity_header_filter_init(void);
 ngx_int_t ngx_http_modsecurity_header_filter(ngx_http_request_t *r);
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
 int ngx_http_modescurity_store_ctx_header(ngx_http_request_t *r, ngx_str_t *name, ngx_str_t *value);
 #endif
 
diff --git a/src/ngx_http_modsecurity_header_filter.c b/src/ngx_http_modsecurity_header_filter.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 
@@ -99,7 +99,7 @@ ngx_http_modsecurity_header_out_t ngx_http_modsecurity_headers_out[] = {
 };
 
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
 int
 ngx_http_modescurity_store_ctx_header(ngx_http_request_t *r, ngx_str_t *name, ngx_str_t *value)
 {
@@ -166,7 +166,7 @@ ngx_http_modsecurity_resolv_header_server(ngx_http_request_t *r, ngx_str_t name,
         value.len =  h->value.len;
     }
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
 
@@ -195,7 +195,7 @@ ngx_http_modsecurity_resolv_header_date(ngx_http_request_t *r, ngx_str_t name, o
         date.len = h->value.len;
     }
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ngx_http_modescurity_store_ctx_header(r, &name, &date);
 #endif
 
@@ -222,7 +222,7 @@ ngx_http_modsecurity_resolv_header_content_length(ngx_http_request_t *r, ngx_str
         value.data = (unsigned char *)buf;
         value.len = strlen(buf);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
         return msc_add_n_response_header(ctx->modsec_transaction,
@@ -246,7 +246,7 @@ ngx_http_modsecurity_resolv_header_content_type(ngx_http_request_t *r, ngx_str_t
     if (r->headers_out.content_type.len > 0)
     {
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &name, &r->headers_out.content_type);
 #endif
 
@@ -279,7 +279,7 @@ ngx_http_modsecurity_resolv_header_last_modified(ngx_http_request_t *r, ngx_str_
     value.data = buf;
     value.len = (int)(p-buf);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
 
@@ -315,7 +315,7 @@ ngx_http_modsecurity_resolv_header_connection(ngx_http_request_t *r, ngx_str_t n
             value.data = buf;
             value.len = strlen((char *)buf);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
             ngx_http_modescurity_store_ctx_header(r, &name2, &value);
 #endif
 
@@ -332,7 +332,7 @@ ngx_http_modsecurity_resolv_header_connection(ngx_http_request_t *r, ngx_str_t n
     value.data = (u_char *) connection;
     value.len = strlen(connection);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
 
@@ -353,7 +353,7 @@ ngx_http_modsecurity_resolv_header_transfer_encoding(ngx_http_request_t *r, ngx_
 
         ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
 
@@ -380,7 +380,7 @@ ngx_http_modsecurity_resolv_header_vary(ngx_http_request_t *r, ngx_str_t name, o
 
         ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &name, &value);
 #endif
 
@@ -486,7 +486,7 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)
             i = 0;
         }
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &data[i].key, &data[i].value);
 #endif
 
diff --git a/src/ngx_http_modsecurity_log.c b/src/ngx_http_modsecurity_log.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 
diff --git a/src/ngx_http_modsecurity_module.c b/src/ngx_http_modsecurity_module.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 
@@ -107,7 +107,7 @@ ngx_http_modsecurity_process_intervention (Transaction *transaction, ngx_http_re
         r->headers_out.location = location;
         r->headers_out.location->hash = 1;
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
         ngx_http_modescurity_store_ctx_header(r, &location->key, &location->value);
 #endif
 
@@ -137,7 +137,7 @@ ngx_http_modsecurity_cleanup(void *data)
 
     msc_transaction_cleanup(ctx->modsec_transaction);
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     /*
      * Purge stored context headers.  Memory allocated for individual stored header
      * name/value pair will be freed automatically when r->pool is destroyed.
@@ -181,7 +181,7 @@ ngx_http_modsecurity_create_ctx(ngx_http_request_t *r)
     cln->handler = ngx_http_modsecurity_cleanup;
     cln->data = ctx;
 
-#ifdef MODSECURITY_SANITY_CHECKS
+#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
     ctx->sanity_headers_out = ngx_array_create(r->pool, 12, sizeof(ngx_http_modsecurity_header_t));
     if (ctx->sanity_headers_out == NULL) {
         return NGX_CONF_ERROR;
diff --git a/src/ngx_http_modsecurity_pre_access.c b/src/ngx_http_modsecurity_pre_access.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 
diff --git a/src/ngx_http_modsecurity_rewrite.c b/src/ngx_http_modsecurity_rewrite.c
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef DDEBUG
-#define DDEBUG 0
+#ifndef MODSECURITY_DDEBUG
+#define MODSECURITY_DDEBUG 0
 #endif
 #include "ddebug.h"
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`*`
`14`	`14`	`*/`
`15`	`15`
`16`		`-#ifndef DDEBUG`
`17`		`-#define DDEBUG 0`
	`16`	`+#ifndef MODSECURITY_DDEBUG`
	`17`	`+#define MODSECURITY_DDEBUG 0`
`18`	`18`	`#endif`
`19`	`19`	`#include "ddebug.h"`
`20`	`20`