Author: markt
Date: Tue Apr 20 17:37:10 2010
New Revision: 936010
URL: http://svn.apache.org/viewvc?rev=936010&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48917
Correct name of mod_jk module in ApacheConfig
Patch provided by Todd Hicks
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936010&r1=936009&r2=936010&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 20 17:37:10 2010
@@ -222,13 +222,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48917
- Correct name of mod_jk module in ApacheConfig
- https://issues.apache.org/bugzilla/attachment.cgi?id=25132
- Patch provided by Todd Hicks
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49030
Failure of one connector should not leave some connectors started and some
ignored
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java?rev=936010&r1=936009&r2=936010&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java Tue Apr 20
17:37:10 2010
@@ -135,7 +135,7 @@ public class ApacheConfig extends BaseJ
static{
String os = System.getProperty("os.name").toLowerCase();
if(os.indexOf("windows")>=0){
- MOD_JK = "modules/mod_jk.dll";
+ MOD_JK = "modules/mod_jk.so";
}else if(os.indexOf("netware")>=0){
MOD_JK = "modules/mod_jk.nlm";
}else{
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=936010&r1=936009&r2=936010&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 20 17:37:10 2010
@@ -85,6 +85,10 @@
<bug>48862</bug>: Add support for the backlog parameter to the AJP
connector. (pero/markt)
</add>
+ <fix>
+ <bug>48917</bug>: Correct name of mod_jk module in ApacheConfig. Patch
+ provided by Todd Hicks. (markt)
+ </fix>
<add>
Use chunked encoding for http 1.1 requests with no content-length
(regardless of keep-alive) so client can differentiate between complete
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
