Ticket #71: nginx-intercept_error_skip_404.patch

src/http/modules/ngx_http_fastcgi_module.c

@@ -287 +287 @@
       offsetof(ngx_http_fastcgi_loc_conf_t, upstream.pass_request_body),
       NULL },
 
+    // twu2 begin
+    // option to skip 404 error
+    { ngx_string("fastcgi_intercept_error_skip_404"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_fastcgi_loc_conf_t, upstream.intercept_error_skip_404),
+      NULL },
+    // twu2 edn
+
     { ngx_string("fastcgi_intercept_errors"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -2092 +2102 @@
     conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
 
     conf->upstream.intercept_errors = NGX_CONF_UNSET;
+    // twu2 begin
+    // option to skip 404 error
+    conf->upstream.intercept_error_skip_404 = NGX_CONF_UNSET;
+    // twu2 end
 
     /* "fastcgi_cyclic_temp_file" is disabled */
     conf->upstream.cyclic_temp_file = 0;
@@ -2332 +2346 @@
 
     ngx_conf_merge_value(conf->upstream.intercept_errors,
                               prev->upstream.intercept_errors, 0);
+    // twu2 begin
+    // option to skip 404 error
+    ngx_conf_merge_value(conf->upstream.intercept_errors,
+                              prev->upstream.intercept_errors, 0);
+    // twu2 end
 
     ngx_conf_merge_ptr_value(conf->catch_stderr, prev->catch_stderr, NULL);
 

src/http/ngx_http_upstream.c

@@ -1742 +1742 @@
         return NGX_DECLINED;
     }
 
+    // twu2 begin
+    // don't intercept 404 error (it will be processed by upstream)
+    if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_error_skip_404)
+        return NGX_DECLINED;
+    // twu2 end
+
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (clcf->error_pages == NULL) {

src/http/ngx_http_upstream.h

@@ -148 +148 @@
 
     ngx_flag_t                       ignore_client_abort;
     ngx_flag_t                       intercept_errors;
+    // twu2 begin
+    // add an option to skip intercept 404 error
+    ngx_flag_t                       intercept_error_skip_404;
+    // twu2 end
     ngx_flag_t                       cyclic_temp_file;
 
     ngx_path_t                      *temp_path;