hgomez 2002/10/18 03:23:16
Modified: jk/native/apache-2.0 mod_jk.c
jk/native/apache-1.3 mod_jk.c
Log:
make sure that servername/serverport will works with VirtualHost with or
without UseCanonicalName.
Providd by [EMAIL PROTECTED], and validated by Mladen which
does it the same way in jk2...
Revision Changes Path
1.57 +8 -6 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mod_jk.c 10 Sep 2002 15:08:13 -0000 1.56
+++ mod_jk.c 18 Oct 2002 10:23:15 -0000 1.57
@@ -479,13 +479,15 @@
);
/* get server name */
- s->server_name= (char *)(r->hostname ? r->hostname :
- r->server->server_hostname);
-
+ /* s->server_name= (char *)(r->hostname ? r->hostname :
r->server->server_hostname); */
+ /* XXX : à la jk2 */
+ s->server_name = ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
- apr_sockaddr_port_get(&port,r->connection->local_addr);
- s->server_port = port;
+ /* apr_sockaddr_port_get(&port,r->connection->local_addr); */
+ /* s->server_port = port; */
+ /* XXX : à la jk2 */
+ s->server_port = ap_get_server_port(r);
s->server_software = (char *)ap_get_server_version();
1.30 +11 -3 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_jk.c 30 Jul 2002 02:13:04 -0000 1.29
+++ mod_jk.c 18 Oct 2002 10:23:15 -0000 1.30
@@ -466,9 +466,17 @@
s->remote_host = NULL_FOR_EMPTY(s->remote_host);
s->remote_addr = NULL_FOR_EMPTY(r->connection->remote_ip);
- s->server_name = (char *)(r->hostname ? r->hostname :
r->server->server_hostname);
+
+ /* get server name */
+ /* s->server_name = (char *)(r->hostname ? r->hostname :
r->server->server_hostname); */
+ /* XXX : à la jk2 */
+ s->server_name = ap_get_server_name(r);
- s->server_port = htons( r->connection->local_addr.sin_port );
+ /* get the real port (otherwise redirect failed) */
+ /* s->server_port = htons( r->connection->local_addr.sin_port ); */
+ /* XXX : à la jk2 */
+ s->server_port = ap_get_server_port(r);
+
s->server_software = (char *)ap_get_server_version();
s->method = (char *)r->method;
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
