Attachment 154646 Details for Bug 240022 – Backport of upstream fix for proxyoverride problem

[patch] Backport of upstream fix for proxyoverride problem

httpd-2.0.52-proxyoverride.patch (text/plain), 2.82 KB, created by Martin Poole on 2007-05-14 14:06:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Poole

Created: 2007-05-14 14:06:10 UTC

Size: 2.82 KB

patch

obsolete

>--- httpd-2.0.52/modules/proxy/mod_proxy.c.proxyoverride	2007-05-14 13:56:59.000000000 +0100
>+++ httpd-2.0.52/modules/proxy/mod_proxy.c	2007-05-14 14:08:29.000000000 +0100
>@@ -772,13 +772,31 @@
>     return NULL;
> }
> static const char *
>-    set_proxy_error_override(cmd_parms *parms, void *dummy, int flag)
>+    set_proxy_error_override(cmd_parms *parms, void *dummy, const char *arg)
> {
>     proxy_server_conf *psf =
>     ap_get_module_config(parms->server->module_config, &proxy_module);
>+    int min_override;
>+    char *endptr;
> 
>-    psf->error_override = flag;
>+    if (strncasecmp(arg, "OFF", 3) == 0) {
>+        min_override = 0;
>+    }
>+
>+    else if(strncasecmp(arg, "ON", 2) == 0) { 
>+        min_override = 300;
>+    }
>+
>+    else { 
>+        min_override = strtol(arg, &endptr, 10);
>+        if (*endptr != '\0' || !ap_is_HTTP_VALID_RESPONSE(min_override)) { 
>+            return "ProxyErrorOverride: argument must be ON, OFF, or an HTTP status code";
>+        }
>+    }
>+       
>+    psf->error_override = min_override;
>     psf->error_override_set = 1;
>+
>     return NULL;
> }
> static const char *
>@@ -1021,8 +1039,8 @@
>      "A list of ports which CONNECT may connect to"),
>     AP_INIT_TAKE1("ProxyVia", set_via_opt, NULL, RSRC_CONF,
>      "Configure Via: proxy header header to one of: on | off | block | full"),
>-    AP_INIT_FLAG("ProxyErrorOverride", set_proxy_error_override, NULL, RSRC_CONF,
>-     "use our error handling pages instead of the servers' we are proxying"),
>+    AP_INIT_TAKE1("ProxyErrorOverride", set_proxy_error_override, NULL, RSRC_CONF,
>+     "Use our error handling pages instead of the servers' we are proxying: off | on | minimum-error-code-to-override"),
>     AP_INIT_FLAG("ProxyPreserveHost", set_preserve_host, NULL, RSRC_CONF,
>      "on if we should preserve host header while proxying"),
>     AP_INIT_TAKE1("ProxyTimeout", set_proxy_timeout, NULL, RSRC_CONF,
>--- httpd-2.0.52/modules/proxy/proxy_http.c.proxyoverride	2007-05-14 13:56:59.000000000 +0100
>+++ httpd-2.0.52/modules/proxy/proxy_http.c	2007-05-14 14:06:07.000000000 +0100
>@@ -892,7 +892,7 @@
>              * if we are overriding the errors, we can't put the content
>              * of the page into the brigade
>              */
>-            if (conf->error_override == 0 || ap_is_HTTP_SUCCESS(r->status)) {
>+            if ((r->status < conf->error_override) || ap_is_HTTP_SUCCESS(r->status)) {
> 
>                 /* read the body, pass it to the output filters */
>                 int finish = FALSE;
>@@ -955,7 +955,7 @@
> 
>     if (conf->error_override) {
>         /* the code above this checks for 'OK' which is what the hook expects */
>-        if (ap_is_HTTP_SUCCESS(r->status))
>+        if (i(r->status < conf->error_override) || ap_is_HTTP_SUCCESS(r->status))
>             return OK;
>         else {
>             /* clear r->status for override error, otherwise ErrorDocument

Actions: View | Diff

Attachments on bug 240022: 154646