Author: rjung Date: Mon Jan 7 11:41:44 2008 New Revision: 609757 URL: http://svn.apache.org/viewvc?rev=609757&view=rev Log: Remove "retries" element from service struct, because we don't use it.
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c tomcat/connectors/trunk/jk/native/common/jk_service.h tomcat/connectors/trunk/jk/native/common/jk_util.c tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Jan 7 11:41:44 2008 @@ -2166,8 +2166,6 @@ wc_maintain(conf->log); jk_init_ws_service(&s); - /* Update retries for this worker */ - s.retries = worker->retries; s.ws_private = &private_data; s.pool = &private_data.p; ap_table_setn(r->notes, JK_NOTE_WORKER_TYPE, Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Jan 7 11:41:44 2008 @@ -2251,8 +2251,6 @@ wc_maintain(xconf->log); jk_init_ws_service(&s); - /* Update retries for this worker */ - s.retries = worker->retries; s.ws_private = &private_data; s.pool = &private_data.p; apr_table_setn(r->notes, JK_NOTE_WORKER_TYPE, Modified: tomcat/connectors/trunk/jk/native/common/jk_service.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_service.h?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_service.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_service.h Mon Jan 7 11:41:44 2008 @@ -208,10 +208,6 @@ jk_msg_buf_t *reco_buf; int reco_status; - /* Number of retries. Defaults to JK_RETRIES - */ - int retries; - /* * If set call flush after each write */ 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?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_util.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Jan 7 11:41:44 2008 @@ -1865,7 +1865,6 @@ s->secret = NULL; s->reco_buf = NULL; s->reco_status = RECO_NONE; - s->retries = JK_RETRIES; s->flush_packets = JK_FALSE; s->flush_header = JK_FALSE; s->response_started = JK_FALSE; Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original) +++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Mon Jan 7 11:41:44 2008 @@ -1506,8 +1506,6 @@ if (worker) { jk_endpoint_t *e = NULL; - /* Update retries for this worker */ - s.retries = worker->retries; if (worker->get_endpoint(worker, &e, logger)) { int is_error = JK_HTTP_SERVER_ERROR; int result; Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=609757&r1=609756&r2=609757&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original) +++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Mon Jan 7 11:41:44 2008 @@ -380,7 +380,6 @@ s.ws_private = &private_data; s.pool = &private_data.p; - s.retries = worker->retries; wc_maintain(logger); if (init_ws_service(&private_data, &s)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]