You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/05/07 13:33:20 UTC
svn commit: r535853 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
modules/proxy/mod_proxy.c
Author: jim
Date: Mon May 7 04:33:18 2007
New Revision: 535853
URL: http://svn.apache.org/viewvc?view=rev&rev=535853
Log:
Backport to close PR 11540
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=diff&rev=535853&r1=535852&r2=535853
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon May 7 04:33:18 2007
@@ -1,8 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache 2.0.60
+ *) mod_proxy: ProxyTimeout (and others) ignored due to not merging
+ the *_set params. PR 11540. [Jim Jagielski]
+
*) mod_isapi: Correctly present SERVER_PORT_SECURE.
- PR: 40573. [Matt Eaton <asf divinehawk.com>]
+ PR 40573. [Matt Eaton <asf divinehawk.com>]
*) mod_isapi: Avoid double trailing slashes in HSE_REQ_MAP_URL_TO_PATH
support. Also corrects the slashes for Windows. PR 15993. [William Rowe]
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?view=diff&rev=535853&r1=535852&r2=535853
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon May 7 04:33:18 2007
@@ -110,14 +110,6 @@
RELEASE SHOWSTOPPERS:
- * mod_proxy: ProxyTimeout (and others) ignored due to not merging
- the *_set params.
- PR# 11540
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=507516
- 2.0 version:
- http://people.apache.org/~jim/patches/httpd-2.0-proxy.patch
- +1: jim, minfrin, wrowe
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
Modified: httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c?view=diff&rev=535853&r1=535852&r2=535853
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c Mon May 7 04:33:18 2007
@@ -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;
}