Author: rjung
Date: Wed Dec 12 15:16:10 2007
New Revision: 603775
URL: http://svn.apache.org/viewvc?rev=603775&view=rev
Log:
Use ap_get_server_description() for httpd 2.2.4+
for display of httpd version in the status worker.
Until now we used the MODULE_MAGIC from httpd trunk.
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?rev=603775&r1=603774&r2=603775&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Dec 12 15:16:10
2007
@@ -667,7 +667,7 @@
*/
s->server_port = ap_get_server_port(r);
-#if (AP_MODULE_MAGIC_AT_LEAST(20060905,0))
+#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4))
s->server_software = (char *)ap_get_server_description();
#else
s->server_software = (char *)ap_get_server_version();
@@ -2814,7 +2814,7 @@
will feed it */
worker_env.uri_to_worker = conf->uw_map;
worker_env.virtual = "*"; /* for now */
-#if (AP_MODULE_MAGIC_AT_LEAST(20060905,0))
+#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4))
worker_env.server_name = (char *)ap_get_server_description();
#else
worker_env.server_name = (char *)ap_get_server_version();
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=603775&r1=603774&r2=603775&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Dec 12
15:16:10 2007
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ JKStatus: Repair detailed Apache httpd version display.
+ This was broken for httpd version 2.2.4+. (rjung)
+ </fix>
<update>
Configure: Remove trace logging from compiled code
via new --disable-trace configure switch. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
