Author: rjung
Date: Sun Mar 11 07:17:00 2007
New Revision: 516904
URL: http://svn.apache.org/viewvc?view=rev&rev=516904
Log:
- Use the full description string ap_get_server_description() instead of
the truncated info from ap_get_server_banner(), because this info gets used
internally
(status worker display and ajp14 backend communication) and is not send back to
the
normal user.
- Make MMN check easier to understand and a little more precise (using
AP_MODULE_MAGIC_AT_LEAST()).
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=516904&r1=516903&r2=516904
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Mar 11 07:17:00
2007
@@ -581,8 +581,8 @@
*/
s->server_port = ap_get_server_port(r);
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20060110)
- s->server_software = (char *)ap_get_server_banner();
+#if (AP_MODULE_MAGIC_AT_LEAST(20060905,0))
+ s->server_software = (char *)ap_get_server_description();
#else
s->server_software = (char *)ap_get_server_version();
#endif
@@ -2678,8 +2678,8 @@
will feed it */
worker_env.uri_to_worker = conf->uw_map;
worker_env.virtual = "*"; /* for now */
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20060110)
- worker_env.server_name = (char *)ap_get_server_banner();
+#if (AP_MODULE_MAGIC_AT_LEAST(20060905,0))
+ worker_env.server_name = (char *)ap_get_server_description();
#else
worker_env.server_name = (char *)ap_get_server_version();
#endif
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=516904&r1=516903&r2=516904
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Mar 11
07:17:00 2007
@@ -27,6 +27,19 @@
<subsection name="Native">
<changelog>
<fix>
+ Make MMN check easier to understand and a little more precise
+ (for new ap_get_server_banner()/ap_get_server_description()).
+ We use the new API only for Apache httpd 2.3. This way our binaries
are not
+ tightly coupled to a minor 2.0 version, and we don't use
ap_get_server_banner()
+ any way. (rjung)
+ </fix>
+ <fix>
+ Use the full description string ap_get_server_description() instead of
+ the truncated info from ap_get_server_banner(), because this info gets
used internally
+ (status worker display and ajp14 backend communication) and is not
send back to the
+ normal user. (rjung)
+ </fix>
+ <fix>
<bug>41757</bug>: Document the "--enable-prefork" flag of configure.
(rjung)
</fix>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
