jfclere 02/01/17 09:02:14
Modified: webapp/apache-1.3 mod_webapp.c
webapp/apache-2.0 mod_webapp.c
Log:
Change REMOTE_HOST to REMOTE_NAME as describes ServletRequest.getRemoteHost().
Revision Changes Path
1.31 +2 -2 jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
Index: mod_webapp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_webapp.c 10 Jan 2002 15:13:21 -0000 1.30
+++ mod_webapp.c 17 Jan 2002 17:02:13 -0000 1.31
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: mod_webapp.c,v 1.30 2002/01/10 15:13:21 jfclere Exp $
+ * @version $Id: mod_webapp.c,v 1.31 2002/01/17 17:02:13 jfclere Exp $
*/
#include <httpd.h>
@@ -443,7 +443,7 @@
data (from the connection */
ap_add_common_vars(r);
stmp=(char *)r->hostname;
- ctmp=(char *)ap_get_remote_host(con,r->per_dir_config, REMOTE_HOST);
+ ctmp=(char *)ap_get_remote_host(con,r->per_dir_config, REMOTE_NAME);
if (stmp==NULL) req->serv->host="";
else req->serv->host=apr_pstrdup(req->pool,stmp);
if (ctmp==NULL) req->clnt->host="";
1.7 +4 -2 jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c
Index: mod_webapp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_webapp.c 1 Nov 2001 22:20:51 -0000 1.6
+++ mod_webapp.c 17 Jan 2002 17:02:13 -0000 1.7
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: mod_webapp.c,v 1.6 2001/11/01 22:20:51 pier Exp $
+ * @version $Id: mod_webapp.c,v 1.7 2002/01/17 17:02:13 jfclere Exp $
*/
#include <httpd.h>
@@ -451,11 +451,13 @@
/* Set up the WebApp Library request structure client and server host
data (from the connection */
stmp=(char *)r->hostname;
- ctmp=(char *)ap_get_remote_host(con,r->per_dir_config, REMOTE_HOST, NULL);
if (stmp==NULL) req->serv->host="";
else req->serv->host=apr_pstrdup(req->pool,stmp);
+
+ ctmp=(char *)ap_get_remote_host(con,r->per_dir_config, REMOTE_NAME, NULL);
if (ctmp==NULL) req->clnt->host="";
else req->clnt->host=apr_pstrdup(req->pool,ctmp);
+
req->serv->addr=apr_pstrdup(req->pool,con->local_ip);
req->clnt->addr=apr_pstrdup(req->pool,con->remote_ip);
apr_sockaddr_port_get(&port, con->local_addr);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
