Author: mturk
Date: Wed Dec 6 06:05:24 2006
New Revision: 483082
URL: http://svn.apache.org/viewvc?view=rev&rev=483082
Log:
Use fail_on_status instead retry_on_status as Rainer suggested. It is probably
more descriptive name.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h
tomcat/connectors/trunk/jk/xdocs/config/workers.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diff&rev=483082&r1=483081&r2=483082
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Dec 6
06:05:24 2006
@@ -2081,7 +2081,7 @@
p->max_packet_size =
jk_get_max_packet_size(props, p->name);
- p->http_status_fail = jk_get_worker_retry_on_status(props, p->name);
+ p->http_status_fail = jk_get_worker_fail_on_status(props, p->name);
pThis->retries =
jk_get_worker_retries(props, p->name,
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=483082&r1=483081&r2=483082
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Wed Dec 6 06:05:24 2006
@@ -91,7 +91,7 @@
#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER ("secretkey")
#define RETRIES_OF_WORKER ("retries")
-#define STATUS_FAIL_OF_WORKER ("retry_on_status")
+#define STATUS_FAIL_OF_WORKER ("fail_on_status")
#define DEFAULT_WORKER JK_AJP13_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME ("worker.list")
@@ -1004,7 +1004,7 @@
return sz;
}
-int jk_get_worker_retry_on_status(jk_map_t *m, const char *wname)
+int jk_get_worker_fail_on_status(jk_map_t *m, const char *wname)
{
char buf[1024];
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=483082&r1=483081&r2=483082
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Wed Dec 6 06:05:24 2006
@@ -193,7 +193,7 @@
const char *jk_get_worker_prop_prefix(jk_map_t *m, const char *wname, const
char *def);
-int jk_get_worker_retry_on_status(jk_map_t *m, const char *wname);
+int jk_get_worker_fail_on_status(jk_map_t *m, const char *wname);
#define TC32_BRIDGE_TYPE 32
#define TC33_BRIDGE_TYPE 33
Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?view=diff&rev=483082&r1=483081&r2=483082
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Wed Dec 6 06:05:24 2006
@@ -711,7 +711,7 @@
</p>
</directive>
-<directive name="retry_on_status" default="0" required="false">
+<directive name="fail_on_status" default="0" required="false">
Set this value to the HTTP status code that will cause a worker to fail
if returned from Servlet contatiner. Use this directive to deal with
cases when the servlet container can temporary return non-200 responses
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
