Author: rjung
Date: Mon Dec 14 15:23:01 2009
New Revision: 890368
URL: http://svn.apache.org/viewvc?rev=890368&view=rev
Log:
Make mod_jk compatible with httpd 2.3:
Use ap_get_server_description() instead of
ap_get_server_version() if available and allowed.
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=890368&r1=890367&r2=890368&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 14 15:23:01 2009
@@ -767,7 +767,7 @@
s->server_port = get_env_int(r, ap_get_server_port(r),
conf->local_port_indicator);
-#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)
+#if ((AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)) ||
(MODULE_MAGIC_NUMBER_MAJOR >= 20060905)
s->server_software = (char *)ap_get_server_description();
#else
s->server_software = (char *)ap_get_server_version();
@@ -3171,7 +3171,7 @@
will feed it */
worker_env.uri_to_worker = conf->uw_map;
worker_env.virtual = "*"; /* for now */
-#if (AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)
+#if ((AP_MODULE_MAGIC_AT_LEAST(20051115,4)) && !defined(API_COMPATIBILITY)) ||
(MODULE_MAGIC_NUMBER_MAJOR >= 20060905)
worker_env.server_name = (char *)ap_get_server_description();
#else
worker_env.server_name = (char *)ap_get_server_version();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
