Ticket #1841: nginx-1.16.1-debug.patch

nginx-1.16.1/src/core/ngx_open_file_cache.c

@@ -496 +496 @@
     ngx_err_t        err;
     ngx_file_info_t  fi, atfi;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0,
+                   "ngx_openat_file_owner(): enter");
+
+
     /*
      * To allow symlinks with the same owner, use openat() (followed
      * by fstat()) and fstatat(AT_SYMLINK_NOFOLLOW), and then compare
@@ -508 +512 @@
      * symlink during openat() or not).
      */
 
+    ngx_log_debug5(NGX_LOG_DEBUG_CORE, log, 0,
+                   "ngx_openat_file_owner(): ngx_openat_file(name=\"%s\", fd=#%d, mode=%d, create=%d, access=%d)",
+                    name, at_fd, mode, create, access);
+
     fd = ngx_openat_file(at_fd, name, mode, create, access);
 
     if (fd == NGX_INVALID_FILE) {
+        ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0,
+                       "ngx_openat_file_owner(): ngx_openat_file(): failed (invalid file)");
+
         return NGX_INVALID_FILE;
     }
 
@@ -616 +627 @@
 {
     ngx_fd_t  fd;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0,
+                   "ngx_open_file_wrapper(): enter");
+
 #if !(NGX_HAVE_OPENAT)
 
     fd = ngx_open_file(name->data, mode, create, access);
@@ -730 +744 @@
         p = cp + 1;
         at_fd = fd;
         at_name.len = cp - at_name.data;
+
+        ngx_log_debug6(NGX_LOG_DEBUG_CORE, log, 0,
+                       "ngx_open_file_wrapper(): for_loop_end: p=\"%s\"(addr:%p), cp=\"%s\"(addr:%p), end=\"%s\"(addr:%p)",
+                       p, (void *) p, cp, (void *) cp, end, (void *) end);
     }
 
     if (p == end) {

nginx-1.16.1/src/http/modules/ngx_http_log_module.c

@@ -481 +481 @@
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "ngx_http_log_script_write(): enter");
+
     if (!r->root_tested) {
 
         /* test root directory existence */
@@ -490 +493 @@
             return len;
         }
 
+        ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "ngx_http_log_script_write(): ngx_http_map_uri_to_path(): path=\"%s\"(len:%d), root=len:%d", path.data, path.len, root);
+
         path.data[root] = '\0';
 
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "ngx_http_log_script_write(): after_truncate_root: path=\"%s\"(len:%d)", path.data, path.len);
+
         ngx_memzero(&of, sizeof(ngx_open_file_info_t));
 
         of.valid = clcf->open_file_cache_valid;
@@ -515 +524 @@
             }
 
             ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err,
-                          "testing \"%s\" existence failed", path.data);
+                          "testing file \"%s\" existence failed", path.data);
 
             /* simulate successful logging */
             return len;
@@ -523 +532 @@
 
         if (!of.is_dir) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ENOTDIR,
-                          "testing \"%s\" existence failed", path.data);
+                          "testing directory \"%s\" existence failed", path.data);
 
             /* simulate successful logging */
             return len;