Author: rjung
Date: Mon Jan 5 12:30:12 2015
New Revision: 1649515
URL: http://svn.apache.org/r1649515
Log:
BZ 44571: Ensure that we return with status 503
if we can not get and endpoint for a worker.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1649515&r1=1649514&r2=1649515&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Jan 5 12:30:12 2015
@@ -2682,6 +2682,13 @@ static int jk_handler(request_rec * r)
}
}
}
+ else {
+ jk_log(conf->log, JK_LOG_ERROR, "Could not get endpoint"
+ " for worker=%s",
+ STRNULL_FOR_NULL(worker_name));
+ rc = 0; /* just to make sure that we know we've
failed */
+ is_error = HTTP_SERVICE_UNAVAILABLE;
+ }
#ifndef NO_GETTIMEOFDAY
gettimeofday(&tv_end, NULL);
if (tv_end.tv_usec < tv_begin.tv_usec) {
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1649515&r1=1649514&r2=1649515&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Jan 5 12:30:12 2015
@@ -2888,6 +2888,7 @@ static int jk_handler(request_rec * r)
" for worker=%s",
worker_name);
rc = 0; /* just to make sure that we know we've
failed */
+ is_error = HTTP_SERVICE_UNAVAILABLE;
}
}
else {
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1649515&r1=1649514&r2=1649515&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Jan 5 12:30:12 2015
@@ -2337,9 +2337,12 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
e->done(&e, logger);
}
else {
+ int is_error = JK_HTTP_SERVER_BUSY;
jk_log(logger, JK_LOG_ERROR,
"Failed to obtain an endpoint to service request - "
"your connection_pool_size is probably less than the threads
in your web server!");
+ lpEcb->dwHttpStatusCode = is_error;
+ write_error_message(lpEcb, is_error, private_data.err_hdrs);
}
}
else {
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1649515&r1=1649514&r2=1649515&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Jan 5 12:30:12 2015
@@ -176,6 +176,10 @@
and for mod_jk (Apache) currectly count down connections closed
by child processes that are stopped. (rjung)
</fix>
+ <fix>
+ <bug>44571</bug>: Ensure that we return with status 503 if we
+ can not get and endpoint for a worker. (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
