jfclere 02/01/10 07:13:21
Modified: webapp/apache-1.3 mod_webapp.c
Log:
Fix getScheme() for ApacheSSL.
PR: 5372
Submitted by: David Graff, [EMAIL PROTECTED]
Revision Changes Path
1.30 +5 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_webapp.c 1 Nov 2001 22:20:51 -0000 1.29
+++ mod_webapp.c 10 Jan 2002 15:13:21 -0000 1.30
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: mod_webapp.c,v 1.29 2001/11/01 22:20:51 pier Exp $
+ * @version $Id: mod_webapp.c,v 1.30 2002/01/10 15:13:21 jfclere Exp $
*/
#include <httpd.h>
@@ -441,6 +441,7 @@
/* Set up the WebApp Library request structure client and server host
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);
if (stmp==NULL) req->serv->host="";
@@ -457,7 +458,6 @@
req->ruri=apr_pstrdup(req->pool,r->uri);
req->args=apr_pstrdup(req->pool,r->args);
req->prot=apr_pstrdup(req->pool,r->protocol);
- req->schm=apr_pstrdup(req->pool,ap_http_method(r));
req->user=apr_pstrdup(req->pool,con->user);
req->auth=apr_pstrdup(req->pool,con->ap_auth_type);
req->clen=0;
@@ -467,6 +467,8 @@
/* SSL logic */
ssl_temp = (char *)ap_table_get(r->subprocess_env,"HTTPS");
if ( ssl_temp && !strcasecmp(ssl_temp, "on")) {
+ req->schm=apr_pstrdup(req->pool,"https");
+
req->ssld=(wa_ssldata *) apr_palloc(req->pool,sizeof(wa_ssldata));
req->ssld->ciph = (char *)ap_table_get(
@@ -484,6 +486,7 @@
req->ssld->cert = (char *)ap_table_get(
r->subprocess_env,"SSL_CLIENT_CERT");
} else {
+ req->schm=apr_pstrdup(req->pool,"http");
req->ssld=NULL;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
