hgomez 02/05/03 01:42:40 Modified: webapp/apache-1.3 mod_webapp.c webapp/apache-2.0 mod_webapp.c Log: mod_webapp will now report it's current version Provided by Puky Tse <[EMAIL PROTECTED]> Revision Changes Path 1.32 +8 -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.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mod_webapp.c 17 Jan 2002 17:02:13 -0000 1.31 +++ mod_webapp.c 3 May 2002 08:42:40 -0000 1.32 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> - * @version $Id: mod_webapp.c,v 1.31 2002/01/17 17:02:13 jfclere Exp $ + * @version $Id: mod_webapp.c,v 1.32 2002/05/03 08:42:40 hgomez Exp $ */ #include <httpd.h> @@ -68,6 +68,7 @@ #include <http_protocol.h> #include <util_script.h> #include <wa.h> +#include <wa_version.h> /* ************************************************************************* */ /* GENERIC DECLARATIONS */ @@ -82,6 +83,11 @@ /* The main server using for logging error not related to requests */ static server_rec *server=NULL; +static void wam_init_handler(server_rec *s, ap_pool *p) +{ + ap_add_version_component(WA_EXPOSED_VERSION); +} + /* ************************************************************************* */ /* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */ /* ************************************************************************* */ @@ -532,7 +538,7 @@ /* Apache module declaration */ module MODULE_VAR_EXPORT webapp_module = { STANDARD_MODULE_STUFF, - NULL, /* module initializer */ + wam_init_handler, /* module initializer */ NULL, /* per-directory config creator */ NULL, /* dir config merger */ NULL, /* server config creator */ 1.8 +10 -1 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_webapp.c 17 Jan 2002 17:02:13 -0000 1.7 +++ mod_webapp.c 3 May 2002 08:42:40 -0000 1.8 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> - * @version $Id: mod_webapp.c,v 1.7 2002/01/17 17:02:13 jfclere Exp $ + * @version $Id: mod_webapp.c,v 1.8 2002/05/03 08:42:40 hgomez Exp $ */ #include <httpd.h> @@ -69,6 +69,7 @@ #include <http_protocol.h> #include <util_script.h> #include <wa.h> +#include <wa_version.h> #include <apr_tables.h> /* ************************************************************************* */ @@ -88,6 +89,13 @@ /* MODULE AND LIBRARY INITIALIZATION AND DESTRUCTION */ /* ************************************************************************* */ +static int wam_init_handler(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, + server_rec *s) +{ + ap_add_version_component(p, WA_EXPOSED_VERSION); + return OK; +} + /* Destroy the module and the WebApp Library */ static apr_status_t wam_shutdown(void *data) {/*void *nil) { */ if (!wam_initialized) return APR_SUCCESS; @@ -526,6 +534,7 @@ ap_hook_translate_name(wam_match, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init(wam_startup, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_post_config(wam_init_handler, NULL, NULL, APR_HOOK_MIDDLE); } /* Apache module declaration */
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>