Author: rjung
Date: Fri Nov 7 09:43:41 2008
New Revision: 712207
URL: http://svn.apache.org/viewvc?rev=712207&view=rev
Log:
Fix for BZ 46169:
Make use_server_errors work with httpd 1.3.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.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=712207&r1=712206&r2=712207&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 Fri Nov 7 09:43:41
2008
@@ -646,6 +646,7 @@
e = (rule_extension_t *)ap_get_module_config(r->request_config,
&jk_module);
if (e) {
s->extension.reply_timeout = e->reply_timeout;
+ s->extension.use_server_error_pages = e->use_server_error_pages;
if (e->activation) {
s->extension.activation = ap_palloc(r->pool, e->activation_size *
sizeof(int));
memcpy(s->extension.activation, e->activation, e->activation_size
* sizeof(int));
@@ -2249,6 +2250,15 @@
jk_close_pool(&private_data.p);
if (rc > 0) {
+ if (s.extension.use_server_error_pages &&
+ s.http_response_status >=
s.extension.use_server_error_pages) {
+ if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG, "Forwarding status=%d"
+ " for worker=%s",
+ s.http_response_status, worker_name);
+ JK_TRACE_EXIT(conf->log);
+ return s.http_response_status;
+ }
/* If tomcat returned no body and the status is not OK,
let apache handle the error code */
if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
