Author: markt
Date: Mon Sep 19 10:33:58 2016
New Revision: 1761420
URL: http://svn.apache.org/viewvc?rev=1761420&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58425
Fix regression in 1.4.41 that prevented AJP 1.2 workers from initialising.
Note that the AJP 1.2 protocol is deprecated.
Patch provided by yagisita.
Modified:
tomcat/jk/trunk/native/common/jk_ajp12_worker.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp12_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp12_worker.c?rev=1761420&r1=1761419&r2=1761420&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp12_worker.c Mon Sep 19 10:33:58 2016
@@ -219,6 +219,7 @@ static int JK_METHOD validate(jk_worker_
source);
}
}
+ return JK_TRUE;
}
else {
jk_log(l, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761420&r1=1761419&r2=1761420&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 19 10:33:58 2016
@@ -75,6 +75,11 @@
(rjung)
</fix>
<fix>
+ <bug>58425</bug>: Fix regression in 1.4.41 that prevented AJP 1.2
+ workers from initialising. Note that the AJP 1.2 protocol is
deprecated.
+ Patch provided by yagisita. (markt)
+ </fix>
+ <fix>
<bug>58504</bug>: If a background thread is used to perform worker
maintenance, ensure that maintenance runs are not skipped. Patch
provided by Hiroto Shimizu. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
