Author: jfclere
Date: Fri Feb 2 02:07:49 2007
New Revision: 502560
URL: http://svn.apache.org/viewvc?view=rev&rev=502560
Log:
Get it compile on httpd-dev (20060905.0).
ap_get_server_version() has been replaced by ap_get_server_banner().
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
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=502560&r1=502559&r2=502560
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Feb 2 02:07:49
2007
@@ -565,7 +565,11 @@
*/
s->server_port = ap_get_server_port(r);
+#if (MODULE_MAGIC_NUMBER_MAJOR > 20060110)
+ s->server_software = (char *)ap_get_server_banner();
+#else
s->server_software = (char *)ap_get_server_version();
+#endif
s->method = (char *)r->method;
s->content_length = get_content_length(r);
s->is_chunked = r->read_chunked;
@@ -2605,7 +2609,11 @@
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();
+#else
worker_env.server_name = (char *)ap_get_server_version();
+#endif
if (wc_open(init_map, &worker_env, conf->log)) {
ap_add_version_component(pconf, JK_EXPOSED_VERSION);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
