cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
pier2002/06/23 09:50:40 Modified:webapp/apache-1.3 mod_webapp.c Log: Fixed apr_psprintf - ap_psprintf for Apache 1.3. The pool used in request_rec is not an APR memory pool... PR: none Obtained from:Tomcat Mailing List [EMAIL PROTECTED] Submitted by: Nico Seessle [EMAIL PROTECTED] Reviewed by: Pier Fumagalli [EMAIL PROTECTED] Revision ChangesPath 1.36 +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.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mod_webapp.c 13 Jun 2002 11:06:47 - 1.35 +++ mod_webapp.c 23 Jun 2002 16:50:40 - 1.36 @@ -296,7 +296,7 @@ request_rec *req=(request_rec *)r-data; if ((message!=NULL) (message[0]!='\0')) -req-status_line=apr_psprintf(req-pool,%03d %s, status, message); +req-status_line=ap_psprintf(req-pool,%03d %s, status, message); req-status=status; } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
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 ChangesPath 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 - 1.29 +++ mod_webapp.c 10 Jan 2002 15:13:21 - 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]
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
jfclere 01/10/22 15:11:14 Modified:webapp/apache-1.3 mod_webapp.c Log: Some more typos. Revision ChangesPath 1.26 +3 -3 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mod_webapp.c 2001/10/22 21:44:21 1.25 +++ mod_webapp.c 2001/10/22 22:11:14 1.26 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.25 2001/10/22 21:44:21 jfclere Exp $ + * @version $Id: mod_webapp.c,v 1.26 2001/10/22 22:11:14 jfclere Exp $ */ #include httpd.h @@ -462,8 +462,8 @@ req-clen=0; req-ctyp=\0; req-rlen=0; -req-ssld=(wa_ssldata *) apr_palloc(r-pool,sizeof(wa_ssldata)); -req-ssld-ssl = (char *)ap_table_get( +req-ssld=(wa_ssldata *) apr_palloc(req-pool,sizeof(wa_ssldata)); +req-ssld-cert = (char *)ap_table_get( r-subprocess_env,SSL_CLIENT_CERT); /* Copy headers into webapp request structure */
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
pier01/08/09 13:05:36 Modified:webapp/apache-1.3 mod_webapp.c Log: Provide some more informations if mod_webapp was compiled with the DEBUG flag set. Revision ChangesPath 1.23 +9 -1 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_webapp.c 2001/08/04 18:25:57 1.22 +++ mod_webapp.c 2001/08/09 20:05:36 1.23 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.22 2001/08/04 18:25:57 pier Exp $ + * @version $Id: mod_webapp.c,v 1.23 2001/08/09 20:05:36 pier Exp $ */ #include httpd.h @@ -262,9 +262,17 @@ void wa_log(const char *f, const int l, const char *fmt, ...) { va_list ap; char buf[1024]; +#ifdef DEBUG +char tmp[1024]; +#endif va_start(ap,fmt); +#ifdef DEBUG +apr_vsnprintf(tmp,1024,fmt,ap); +apr_snprintf(buf,1024,[%s:%d] %s,f,l,tmp); +#else apr_vsnprintf(buf,1024,fmt,ap); +#endif va_end(ap); ap_log_error(f,l,APLOG_NOERRNO|APLOG_ERR,server,%s,buf);
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
pier01/07/19 16:55:01 Modified:webapp/apache-1.3 mod_webapp.c Log: Added Content-Type direct handling thru wa_request. Revision ChangesPath 1.20 +4 -1 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_webapp.c 2001/07/15 08:43:43 1.19 +++ mod_webapp.c 2001/07/19 23:55:01 1.20 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.19 2001/07/15 08:43:43 pier Exp $ + * @version $Id: mod_webapp.c,v 1.20 2001/07/19 23:55:01 pier Exp $ */ #include httpd.h @@ -451,6 +451,7 @@ req-user=apr_pstrdup(req-pool,con-user); req-auth=apr_pstrdup(req-pool,con-ap_auth_type); req-clen=0; +req-ctyp=\0; req-rlen=0; /* Copy headers into webapp request structure */ @@ -467,6 +468,8 @@ apr_pstrdup(req-pool,ele[x].val)); if (strcasecmp(ele[x].key,Content-Length)==0) req-clen=atol(ele[x].val); +if (strcasecmp(ele[x].key,Content-Type)==0) +req-ctyp=apr_pstrdup(req-pool,ele[x].val); } }
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
pier01/07/15 01:43:43 Modified:webapp/apache-1.3 mod_webapp.c Log: Properly declared true/false. Revision ChangesPath 1.19 +4 -4 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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mod_webapp.c 2001/07/13 01:12:44 1.18 +++ mod_webapp.c 2001/07/15 08:43:43 1.19 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.18 2001/07/13 01:12:44 pier Exp $ + * @version $Id: mod_webapp.c,v 1.19 2001/07/15 08:43:43 pier Exp $ */ #include httpd.h @@ -76,7 +76,7 @@ /* Module declaration */ module MODULE_VAR_EXPORT webapp_module; /* Wether the WebApp Library has been initialized or not */ -static wa_boolean wam_initialized=FALSE; +static wa_boolean wam_initialized=wa_false; /* The list of configured connections */ static wa_chain *wam_connections=NULL; /* The main server using for logging error not related to requests */ @@ -97,7 +97,7 @@ static void wam_shutdown(void *nil) { if (!wam_initialized) return; wa_shutdown(); -wam_initialized=FALSE; +wam_initialized=wa_false; } /* Initialize the module and the WebApp Library */ @@ -107,7 +107,7 @@ if(wam_initialized) return(NULL); if ((ret=wa_init())!=NULL) return(ret); ap_register_cleanup(p,NULL,wam_shutdown,NULL); -wam_initialized=TRUE; +wam_initialized=wa_true; return(NULL); }
cvs commit: jakarta-tomcat-connectors/webapp/apache-1.3 mod_webapp.c
pier01/07/12 18:12:49 Modified:webapp/apache-1.3 mod_webapp.c Log: Added a generic per-server callback for the WebApp Library to enable proper logging. Fixed port-number translation (Thanks to Thom Park at Borland for noticing) Revision ChangesPath 1.18 +19 -4 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_webapp.c 2001/07/09 22:00:24 1.17 +++ mod_webapp.c 2001/07/13 01:12:44 1.18 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.17 2001/07/09 22:00:24 pier Exp $ + * @version $Id: mod_webapp.c,v 1.18 2001/07/13 01:12:44 pier Exp $ */ #include httpd.h @@ -79,6 +79,8 @@ static wa_boolean wam_initialized=FALSE; /* The list of configured connections */ static wa_chain *wam_connections=NULL; +/* The main server using for logging error not related to requests */ +static server_rec *server=NULL; /* * */ /* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */ @@ -87,6 +89,7 @@ /* Startup the module and the WebApp Library */ static void wam_startup(server_rec *s, pool *p) { if (!wam_initialized) return; +server=s; wa_startup(); } @@ -253,9 +256,21 @@ }; /* * */ -/* CALLBACKS FROM WEB SERVER */ +/* CALLBACKS TO WEB SERVER */ /* * */ +/* Log a generic error */ +void wa_log(const char *f, const int l, const char *fmt, ...) { +va_list ap; +char buf[1024]; + +va_start(ap,fmt); +apr_vsnprintf(buf,1024,fmt,ap); +va_end(ap); + +ap_log_error(f,l,APLOG_NOERRNO|APLOG_ERR,server,%s,buf); +} + /* Log a message associated with a request */ void wam_handler_log(wa_request *r, const char *f, const int l, char *msg) { request_rec *req=(request_rec *)r-data; @@ -424,8 +439,8 @@ 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); -req-serv-port=con-local_addr.sin_port; -req-clnt-port=con-remote_addr.sin_port; +req-serv-port=ntohs(con-local_addr.sin_port); +req-clnt-port=ntohs(con-remote_addr.sin_port); /* Set up all other members of the request structure */ req-meth=apr_pstrdup(req-pool,(char *)r-method);