Author: rjung
Date: Sun Feb 26 12:15:53 2012
New Revision: 1293818
URL: http://svn.apache.org/viewvc?rev=1293818&view=rev
Log:
Improve support for HTTPD 2.4 by using client_* instead
of remote_* variables.
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
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=1293818&r1=1293817&r2=1293818&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sun Feb 26 12:15:53 2012
@@ -784,8 +784,13 @@ static int init_ws_service(apache_privat
s->remote_port = "0";
}
else {
+#if (MODULE_MAGIC_NUMBER_MAJOR >= 20111130)
+ s->remote_addr = r->connection->client_ip;
+ s->remote_port = apr_itoa(r->pool, r->connection->client_addr->port);
+#else
s->remote_addr = r->connection->remote_ip;
s->remote_port = apr_itoa(r->pool, r->connection->remote_addr->port);
+#endif
}
s->remote_addr = get_env_string(r, s->remote_addr,
conf->remote_addr_indicator, 1);
@@ -1101,7 +1106,11 @@ static int init_ws_service(apache_privat
STRNULL_FOR_NULL(s->auth_type),
STRNULL_FOR_NULL(s->remote_user),
STRNULL_FOR_NULL(r->connection->local_ip),
+#if (MODULE_MAGIC_NUMBER_MAJOR >= 20111130)
+ STRNULL_FOR_NULL(r->connection->client_ip),
+#else
STRNULL_FOR_NULL(r->connection->remote_ip),
+#endif
STRNULL_FOR_NULL(s->req_uri));
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1293818&r1=1293817&r2=1293818&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Feb 26 12:15:53 2012
@@ -45,6 +45,10 @@
<subsection name="Native">
<changelog>
<fix>
+ HTTPD: Improve support for HTTPD 2.4 by using client_* instead
+ of remote_* variables. (rjung)
+ </fix>
+ <fix>
<bug>52564</bug>: Fix building with format checking gcc security
hardening cflags. Contributed by Tony Mancill. (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
