You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/08/31 01:06:01 UTC
svn commit: r571338 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/mod_proxy.xml modules/proxy/mod_proxy.c
Author: niq
Date: Thu Aug 30 16:06:00 2007
New Revision: 571338
URL: http://svn.apache.org/viewvc?rev=571338&view=rev
Log:
mod_proxy: Add Proxypass status option to ignore errors
PR 43167. Patch by Francisco Gimeno
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=571338&r1=571337&r2=571338&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Aug 30 16:06:00 2007
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.3.0
+ *) mod_proxy: enable Ignore Errors option on ProxyPass Status.
+ PR 43167 [Francisco Gimeno <kikov kikov.org>
+
*) mod_proxy_http: Don't try to read body of a HEAD request before
responding.
PR 41644 [Stuart Children <stuart terminus.co.uk>]
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=571338&r1=571337&r2=571338&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Thu Aug 30 16:06:00 2007
@@ -719,9 +719,10 @@
<tr><td>status</td>
<td>-</td>
<td>Single letter value defining the initial status of
- this worker: 'D' is disabled, 'S' is stopped, 'H' is hot-standby
- and 'E' is in an error state. Status can be set (which is the default)
- by prepending with '+' or cleared by prepending with '-'.
+ this worker: 'D' is disabled, 'S' is stopped, 'I' is ignore-errors,
+ 'H' is hot-standby and 'E' is in an error state. Status
+ can be set (which is the default) by prepending with '+' or
+ cleared by prepending with '-'.
Thus, a setting of 'S-E' sets this worker to Stopped and
clears the in-error flag.
</td></tr>
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=571338&r1=571337&r2=571338&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Aug 30 16:06:00 2007
@@ -220,6 +220,12 @@
else
worker->status &= ~PROXY_WORKER_HOT_STANDBY;
}
+ else if (*v == 'I' || *v == 'i') {
+ if (mode)
+ worker->status |= PROXY_WORKER_IGNORE_ERRORS;
+ else
+ worker->status &= ~PROXY_WORKER_IGNORE_ERRORS;
+ }
else {
return "Unknown status parameter option";
}