Author: rjung
Date: Thu Jul 25 19:04:54 2013
New Revision: 1507092

URL: http://svn.apache.org/r1507092
Log:
Clean up some Apache version info.

Modified:
    tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
    tomcat/jk/trunk/xdocs/reference/apache.xml
    tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/faq.xml?rev=1507092&r1=1507091&r2=1507092&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/faq.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/faq.xml Thu Jul 25 19:04:54 2013
@@ -237,27 +237,33 @@ Note: The above steps assume that you do
 </p>
 </subsection>
 
-<subsection name="Apache 2.0 complains about incorrect module version">
+<subsection name="Apache complains about incorrect module version">
 <p>
-Since Apache 2.0 API still change often, the Apache 2.0 teams decide to put in 
headers of compiled modules the 
-Apache 2.0 version used to compile the module. This check is called Magic 
Module Number bump.
+Since the Apache API can change between versions, any Apache module contains 
the
+Apache API version used to compile the module. This is called the Magic Module 
Number.
 </p>
 <p>
-At start time Apache 2.0 check that version in modules headers and stop if it 
detect that a module was compiled 
-for another Apache 2.0 version. As such you should allways use modules 
compiled for the same Apache 2.0 version. 
-This check may be removed if the future.
+At start time Apache checks that the version in the module header is compatible
+with the Apache server. If not it will deny to start and log an error.
+</p>
+<p>
+Note that minor versions are forward compatible. If the module was compiled 
using
+Apache 2.x.y the resulting binary should work with any other version 2.x.z 
where z
+is bigger or equals to y. If you also need compatibility for versions 2.x.z
+with z smaller than y, use the configure flag --enable-api-compatibility. Note
+that the module compiled with any 2.x will never be compatible with 2.y for
+x different from y.
 </p>
 </subsection>
 
-<subsection name="Does it work for Apache 2.2?">
+<subsection name="Does it work for the latest Apache 2.x?">
 <p>
-mod_jk works well with Apache 2.2. You need a binary module compiled for 
version 2.2 of the Apache web server.
-A binary compiled for version 2.0 will not work.
+mod_jk works well with Apache 2.x from 2.0 to 2.4.
 </p>
 <p>
 Important parts of the functionality of mod_jk have been reimplemented as 
Apache httpd modules mod_proxy_ajp
 and mod_proxy_balancer. These are part of the standard distributoin of Apache 
2.2. The new modules do not contain
-all features of mod_jk, but you get them automatically with every Apache 2.2.
+all features of mod_jk, but you get them automatically with every Apache 2.2 
and later.
 </p>
 </subsection>
 

Modified: tomcat/jk/trunk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1507092&r1=1507091&r2=1507092&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/apache.xml Thu Jul 25 19:04:54 2013
@@ -1084,7 +1084,7 @@ ways of defining the forwards, in genera
 If you neither specify any workers via JkMount and the related directives,
 not via the environment variable described below,
 the first worker in the list of all worker will be chosen. You can use 
SetHandler
-for example in Location blocks or with Apache 2.2 also in RewriteRule.
+for example in Location blocks or with Apache 2.2 and later also in 
RewriteRule.
 </p>
 <p>
 In order to control the worker using <b>SetEnvIf</b> or <b>RewriteRule</b>

Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1507092&r1=1507091&r2=1507092&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Thu Jul 25 19:04:54 2013
@@ -31,8 +31,7 @@
 <section name="Introduction">
 <p>
 This document explains how to connect Tomcat to the popular open source web 
server, Apache httpd.
-There is actually three versions of Apache HTTP Server, 1.3, 2.0 and 2.2 and 
all can be used with mod_jk,
-the Tomcat redirector module.
+You can use mod_jk, the Tomcat redirector module, with any version of Apache 
starting with 1.3.
 </p>
 
 <p>
@@ -902,10 +901,11 @@ You could set <b>CFLAGS</b> and <b>LDFLA
 </screen>
 
 <p>
-If you want to build mod_jk for different version of Apache httpd, like 1.3, 
2.x,
+If you want to build mod_jk for different version of Apache httpd, like 1.3 or 
2.x,
 you need to go through the full build process for each of them.
-Please note, that httpd 2.0 and 2.2 or 2.3 modules are <b>not</b> compatible. 
The mod_jk directory
-used is "apache-2.0" in both cases, but you need to compile separately.
+Please note, that httpd 2.0, 2.2 or 2.4 modules are <b>not</b> binary 
compatible.
+You have to compile the module using the Apache version you plan to run it in.
+The mod_jk build directory used is "apache-2.0" for all 2.x builds.
 <ul>
 <li>
 use configure and indicate the correct Apache httpd apxs location (--with-apxs)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to