Merge branch 'master' of github.com:openresty/rds-csv-nginx-module

openresty · Nov 1, 2015 · a6fccf6 · a6fccf6
2 parents 3979e40 + c718a3b
commit a6fccf6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/ddebug.h b/src/ddebug.h
@@ -29,7 +29,8 @@
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
 #    endif
@@ -46,7 +47,8 @@ static void dd(const char * fmt, ...) {
 
 #include <stdarg.h>
 
-static void dd(const char * fmt, ...) {
+static ngx_inline void
+dd(const char * fmt, ...) {
 }
 
 #   endif
@@ -81,4 +83,3 @@ static void dd(const char * fmt, ...) {
 #endif
 
 #endif /* DDEBUG_H */
-
diff --git a/src/ngx_http_rds_csv_output.c b/src/ngx_http_rds_csv_output.c
@@ -429,11 +429,13 @@ ngx_http_rds_csv_output_field(ngx_http_request_t *r,
                        ngx_http_rds_csv_escape_csv_str(sep, last, data, len,
                                                        NULL);
 
+#if DDEBUG
                 dd("escaped value \"%.*s\" (len %d, escape %d, escape2 %d)",
                    (int) (len + val_escape),
                    p, (int) (len + val_escape),
                    (int) val_escape,
                    (int) ((last - p) - len));
+#endif
             }
 
             if (need_quotes && ctx->field_data_rest == 0) {
@@ -544,11 +546,13 @@ ngx_http_rds_csv_output_more_field_data(ngx_http_request_t *r,
             last = (u_char *) ngx_http_rds_csv_escape_csv_str(sep, last, data,
                                                               len, NULL);
 
+#if DDEBUG
             dd("escaped value \"%.*s\" (len %d, escape %d, escape2 %d)",
                (int) (len + escape),
                p, (int) (len + escape),
                (int) escape,
                (int) ((last - p) - len));
+#endif
         }
 
         if (ctx->field_data_rest == 0) {

diff --git a/t/unused.t b/t/unused.t
@@ -71,6 +71,9 @@ ok
 
 
 === TEST 3: used (multi http {} blocks)
+This test case won't run with nginx 1.9.3+ since duplicate http {} blocks
+have been prohibited since then.
+--- SKIP
 --- http_config eval: $::http_config
 --- config
     location = /t {