hgomez 2004/01/22 01:19:55
Modified: jk/native2/server/apache2 jk_service_apache2.c
Log:
Get server name from Apache, the same way that JK 1.2.x.
Port correction should now be studied
Revision Changes Path
1.37 +3 -4
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_service_apache2.c 30 Sep 2003 13:42:02 -0000 1.36
+++ jk_service_apache2.c 22 Jan 2004 09:19:55 -0000 1.37
@@ -372,9 +372,8 @@
s->remote_host = NULL_FOR_EMPTY(s->remote_host);
s->remote_addr = NULL_FOR_EMPTY(r->connection->remote_ip);
- /* get server name */
- s->server_name= (char *)(r->hostname ? r->hostname :
- r->server->server_hostname);
+ /* get server name like in jk 1.2.x */
+ s->server_name= (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
apr_sockaddr_port_get(&port,r->connection->local_addr);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
