Attachment 156347 Details for Bug 242920 – patch from upstream

[patch] patch from upstream

httpd-2.0.52-proxytimeout.patch (text/plain), 1.77 KB, created by Martin Poole on 2007-06-06 13:20:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Poole

Created: 2007-06-06 13:20:28 UTC

Size: 1.77 KB

patch

obsolete

>--- httpd-2.0.52/modules/proxy/mod_proxy.c	2006/07/12 07:40:55	421178
>+++ httpd-2.0.52/modules/proxy/mod_proxy.c	2007/05/07 11:33:18	535853
>@@ -517,14 +517,23 @@
> 
>     ps->domain = (overrides->domain == NULL) ? base->domain : overrides->domain;
>     ps->viaopt = (overrides->viaopt_set == 0) ? base->viaopt : overrides->viaopt;
>+    ps->viaopt_set = overrides->viaopt_set || base->viaopt_set;
>     ps->req = (overrides->req_set == 0) ? base->req : overrides->req;
>+    ps->req_set = overrides->req_set || base->req_set;
>     ps->recv_buffer_size = (overrides->recv_buffer_size_set == 0) ? base->recv_buffer_size : overrides->recv_buffer_size;
>+    ps->recv_buffer_size_set = overrides->recv_buffer_size_set || base->recv_buffer_size_set;
>     ps->io_buffer_size = (overrides->io_buffer_size_set == 0) ? base->io_buffer_size : overrides->io_buffer_size;
>+    ps->io_buffer_size_set = overrides->io_buffer_size_set || base->io_buffer_size_set;
>     ps->maxfwd = (overrides->maxfwd_set == 0) ? base->maxfwd : overrides->maxfwd;
>+    ps->maxfwd_set = overrides->maxfwd_set || base->maxfwd_set;
>     ps->error_override = (overrides->error_override_set == 0) ? base->error_override : overrides->error_override;
>+    ps->error_override_set = overrides->error_override_set || base->error_override_set;
>     ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host : overrides->preserve_host;
>+    ps->preserve_host_set = overrides->preserve_host_set || base->preserve_host_set;
>     ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
>+    ps->timeout_set = overrides->timeout_set || base->timeout_set;
>     ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
>+    ps->badopt_set = overrides->badopt_set || base->badopt_set;
> 
>     return ps;
> }

Actions: View | Diff

Attachments on bug 242920: 156347