cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
hgomez 2004/02/24 00:59:10 Modified:webapp/include wa_config.h wa_version.h wa_request.h wa.h wa_main.h webapp/lib wa_request.c pr_warp_network.c pr_info.c Makefile.in pr_warp.h wa_config.c pr_warp.c pr_warp_packet.c wa_main.c pr_warp_socketpool.c pr_warp_config.c Makefile.win webapp/apache-1.3 mod_webapp.c webapp/support wa_version.m4 wa_perl.m4 wa_util.m4 wa_apr.m4 wa_apxs.m4 wa_ant.m4 formatfile.c wa_exec.m4 buildconf.sh webapp CHANGES webapp/apache-2.0 mod_webapp.c Log: Update to Apache License 2.0 Revision ChangesPath 1.7 +16 -57jakarta-tomcat-connectors/webapp/include/wa_config.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_config.h.diff?r1=1.6r2=1.7 1.4 +15 -56jakarta-tomcat-connectors/webapp/include/wa_version.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_version.h.diff?r1=1.3r2=1.4 1.13 +16 -57jakarta-tomcat-connectors/webapp/include/wa_request.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_request.h.diff?r1=1.12r2=1.13 1.17 +16 -57jakarta-tomcat-connectors/webapp/include/wa.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa.h.diff?r1=1.16r2=1.17 1.8 +16 -57jakarta-tomcat-connectors/webapp/include/wa_main.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/include/wa_main.h.diff?r1=1.7r2=1.8 1.20 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_request.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_request.c.diff?r1=1.19r2=1.20 1.7 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c.diff?r1=1.6r2=1.7 1.7 +16 -57jakarta-tomcat-connectors/webapp/lib/pr_info.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_info.c.diff?r1=1.6r2=1.7 1.27 +16 -57jakarta-tomcat-connectors/webapp/lib/Makefile.in http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in.diff?r1=1.26r2=1.27 1.10 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp.h http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.h.diff?r1=1.9r2=1.10 1.8 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_config.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_config.c.diff?r1=1.7r2=1.8 1.24 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c.diff?r1=1.23r2=1.24 1.5 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c.diff?r1=1.4r2=1.5 1.12 +16 -57jakarta-tomcat-connectors/webapp/lib/wa_main.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/wa_main.c.diff?r1=1.11r2=1.12 1.2 +15 -55jakarta-tomcat-connectors/webapp/lib/pr_warp_socketpool.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_socketpool.c.diff?r1=1.1r2=1.2 1.10 +16 -56jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c.diff?r1=1.9r2=1.10 1.5 +16 -57jakarta-tomcat-connectors/webapp/lib/Makefile.win http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/lib/Makefile.win.diff?r1=1.4r2=1.5 1.37 +16 -57jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c.diff?r1=1.36r2=1.37 1.6 +13 -54jakarta-tomcat-connectors/webapp/support/wa_version.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_version.m4.diff?r1=1.5r2=1.6 1.5 +13 -54jakarta-tomcat-connectors/webapp/support/wa_perl.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_perl.m4.diff?r1=1.4r2=1.5 1.9 +13 -54jakarta-tomcat-connectors/webapp/support/wa_util.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_util.m4.diff?r1=1.8r2=1.9 1.8 +13 -54jakarta-tomcat-connectors/webapp/support/wa_apr.m4 http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4.diff?r1=1.7r2=1.8 1.9 +13 -54jakarta-tomcat-connectors/webapp/support/wa_apxs.m4
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
hgomez 2002/12/09 05:22:45 Modified:webapp/apache-2.0 mod_webapp.c Log: Make webapp works with filters in Apache 2.0, ie mod_deflate and AddOutputFilterByType DEFLATE text/html. NB: My first webapp commit ;-) Revision ChangesPath 1.12 +7 -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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mod_webapp.c 13 Jun 2002 11:06:47 - 1.11 +++ mod_webapp.c 9 Dec 2002 13:22:45 - 1.12 @@ -309,7 +309,12 @@ if (type==NULL) return; -req-content_type=apr_pstrdup(req-pool,type); +/*req-content_type=apr_pstrdup(req-pool,type); */ +/* It should be done like this in Apache 2.0 */ +/* This way, Apache 2.0 will be able to set the output filter */ +/* and it make webapp useable with deflate using AddOutputFilterByType DEFLATE text/html */ +ap_set_content_type(req, apr_pstrdup(req-pool,type)); + apr_table_add(req-headers_out,Content-Type,apr_pstrdup(req-pool,type)); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
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 ChangesPath
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 - 1.31
+++ mod_webapp.c 3 May 2002 08:42:40 - 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 - 1.7
+++ mod_webapp.c 3 May 2002 08:42:40 - 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]
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
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 ChangesPath 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 - 1.30 +++ mod_webapp.c 17 Jan 2002 17:02:13 - 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 - 1.6 +++ mod_webapp.c 17 Jan 2002 17:02:13 - 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]
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
jfclere 01/10/03 06:42:57 Modified:webapp/apache-2.0 mod_webapp.c Log: Fix the port (the direct was not working). Revision ChangesPath 1.4 +3 -3 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_webapp.c 2001/09/12 16:29:05 1.3 +++ mod_webapp.c 2001/10/03 13:42:57 1.4 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] - * @version $Id: mod_webapp.c,v 1.3 2001/09/12 16:29:05 pier Exp $ + * @version $Id: mod_webapp.c,v 1.4 2001/10/03 13:42:57 jfclere Exp $ */ #include httpd.h @@ -459,9 +459,9 @@ 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); -req-serv-port=ntohs(port); +req-serv-port= (int) port; apr_sockaddr_port_get(port, con-remote_addr); -req-clnt-port=ntohs(port); +req-clnt-port= (int) port; /* Set up all other members of the request structure */ req-meth=apr_pstrdup(req-pool,(char *)r-method);
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
pier01/09/12 09:29:05
Modified:webapp/apache-2.0 mod_webapp.c
Log:
Removed old MMN #ifdefs
Revision ChangesPath
1.3 +1 -7 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_webapp.c 2001/09/06 17:00:54 1.2
+++ mod_webapp.c 2001/09/12 16:29:05 1.3
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.2 2001/09/06 17:00:54 jfclere Exp $
+ * @version $Id: mod_webapp.c,v 1.3 2001/09/12 16:29:05 pier Exp $
*/
#include httpd.h
@@ -413,9 +413,7 @@
/* The uri path is matched: set the handler and return */
r-handler=apr_pstrdup(r-pool,webapp-handler);
-#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
apr_table_setn(r-notes,webapp-handler, webapp-handler);
-#endif
/* Set the webapp request structure into Apache's request structure */
ap_set_module_config(r-request_config, webapp_module, appl);
@@ -510,7 +508,6 @@
return(OK);
}
-#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
/* bypass the directory_walk and file_walk for non-file requests */
static int wam_map_to_storage(request_rec *r)
{
@@ -520,16 +517,13 @@
}
return DECLINED;
}
-#endif
static void register_hooks(apr_pool_t *p)
{
ap_hook_handler(wam_invoke, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(wam_match, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(wam_startup, NULL, NULL, APR_HOOK_MIDDLE);
-#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
-#endif
}
/* Apache module declaration */
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
Pier Fumagalli wrote: GOMEZ Henri [EMAIL PROTECTED] wrote: I didn't agree with that Pier, we must try to keep compatibility with previous release of Apache 2.0, since there IS STILL NO official release. Many users are still using Apache 2.0.24-alpha (including myself), or even 2.0.18-beta (including IBM iSeries team porting Apache 2.0). Since there is no official release of httpd-2.0, I am confident that nobody will actually care unless they're testing something... And by testing good practice says get the HEAD of CVS and try it out yourself if it doesn't work. Development happens on head and if someone forks off for a little while to do some porting to some weird operating systems, at the end those changes will have to be integrated with HEAD, so, there's no point in sticking with backward compatibility AT THIS POINT. I could stick with the last official tarball since that's an easy piece of thing to download. So, if the latest version is 2.0.18 alpha (don't even know since I use HEAD), The is 2.0.25 (Thank STATUS!). 20010808 is a date... I could agree to have some ifdefs in the code to cope with the differences between latest tarball and head. All this, of course, UNTIL an official final version comes out, that's when I'll start caring about backward compatibility. That's my idea, but I would love to hear the other contributors to the WebApp module to tell me what they think, Ryan, J.F., Colin, Thom... I added the #ifdef to Ryan's patch. And I would keep them until Apache-2.0 releases a beta. Apache-2.0 is still changing a lot. (HEAD may broke things like external modules or be broken for some hours). I am normaly testing using HEAD. (that is why I am known on [EMAIL PROTECTED] ;-)) We cannot tell a TC user to update his Apache-2.0 to the lastest version each time there is a new version, he probably wants to test TC not httpd. But we should warn him when he is not using the lastest httpd-2.0 version. So I am -0 for an error message and +1 for a warning. Let avoid questions in user-list asking about which version of Apache 2.0 to be used, or why we couldn't compile the module against a running (even if obsolete) Apache 2.0 Like, you've answered a lot of questions on tomcat-user about the WebApp module :) :) :) That's a task I'm handling, and I believe I've been pretty good at. There's no unanswered question on the WebApp module on the users list. (In comparison to...) That's a part of the problem in mod_webapp with APR. Choosing APR has been my decision from the beginning. If you guys didn't want to do it, why not voting -1 when I dropped the code in CVS? Now it's there, I believe it's good. You might not like it, as I don't like what you're doing, but, hey, we're forced to coexist on the same mailing list. So, as I don't piss you off on what you're doing, please, you do the same. :) :) :) :) :) Thanks... Pier
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
GOMEZ Henri [EMAIL PROTECTED] wrote: Many users are still using Apache 2.0.24-alpha (including myself), or even 2.0.18-beta (including IBM iSeries team porting Apache 2.0). Ok, ok, I could understand your all developpers point of vue, but let me say it appears just too elitist. Not at all... You just can't ask people (developpers or users) to grab each day the latest APR/Apache from CVS, rebuild them, and then try compile your module against them. Yes, I can and I should since it's ALPHA code... Don't forget that many of us must evaluate a KNOWN Apache 2.0 in real environnement. The most known are Apache sites which use the released version 2.0.24 :) If they want to evaluate HTTPD 2.0, they should use HEAD or the latest developers snapshot. Given the current activity on the code, what happens is that if you find a bug, that has been fixed in CVS already. It's pointless to stick with old code We could do that a each release (2.0.24/2.0.25) but not in real-time ;) That's what I said I can agree to (but you skillfully conceled my reply on that). There was an interesting discussion on new-httpd this week about mod_gzip, and more generally moving API, code change and broken stuff Look at the outcome of that discussion :) Like many contributors, whoes OSS is not the paid time, I just didn't have time to be sync with real-time CVS. And in that case I avoid 'gestation' problems and could concentrated only on majors (even if alpha/beta) release. Sorry, but I'm developing ASF code since 1996, and it's only one year that I finally found a sponsor willing to pay my activities in this field (started with Sun on August 27th 2000). And with some experience I can frankly admit that when dealing with alpha stuff, HEAD is the way to go. All this, of course, UNTIL an official final version comes out, that's when I'll start caring about backward compatibility. We didn't have to be compatible with 2.0.11 but may be we could try to keep compatible with one or two latest snap, in our example 2.0.24/2.0.25. Latest developer snapshot... That's what I said and that's what I stick with. Like, you've answered a lot of questions on tomcat-user about the WebApp module :) :) :) My involment is in mod_jk, not mod_webapp, I coudln't answer question on something I'm not involved and so not specialist. So, let me handle our users. I believe I kinda know how to deal with them. But If you recall, I've built a RPM for mod_webapp some time again just before you change everything to use APR. Yeah... And that was a big mistake... Removing legacy with APR from the sources slowed me down of approximately six months. It's a mistake I made and I won't commit again. That's a task I'm handling, and I believe I've been pretty good at. There's no unanswered question on the WebApp module on the users list. (In comparison to...) Comparison to what ? do you want to compare with the number of question about mod_jk ? Normal, more users play with mod_jk than with mod_webapp :) Compared to the number of _UNANSWERED_ questions... That's a part of the problem in mod_webapp with APR. Choosing APR has been my decision from the beginning. If you guys didn't want to do it, why not voting -1 when I dropped the code in CVS? Since you speak about that, I don't even recall the discussion on starting mod_webapp instead of using and extending mod_jk. I'm sorry to say that it was something decided outside the tomcat-dev mailing-list Neither I do recall you partecipating to the discussion on AJPv20 and v21, which are the strong foundation of the currently used WARP protocol. The story of Tomcat doesn't begin with Henri Gomez, as I recall, it started with three scared young weirdos, plus Brian, in a room at Sun in 1998. Don't quite recall you seeing your face over there :) Anyway, if you don't want to see me around here, don't worry. The ASF license allows me to fork and carry on with the WebApp effort somewhere else... Now it's there, I believe it's good. You might not like it, as I don't like what you're doing, but, hey, we're forced to coexist on the same mailing list. Yes, it's there and we'll see if users switch from mod_jserv mod_jk to mod_webapp, but in the meanwhile, I won't let mod_jk users in the middle of river (au milieu du gué), and still correct bugs and add requested features ;) mod_jserv, oh, funny you take out that name now... Look WHO wrote that code between 1997 and 1998 :) :) :) And yeah, I've seen so much crap going around me in the past 6 years (damn, it's SIX FREAKIN' YEARS... Pier's feeling OLD) that a little bit of competition doesn't scare me (at all)... So, as I don't piss you off on what you're doing, please, you do the same. :) :) :) :) :) Je ne comprends pas très bien l'anglais, désolé ;--) Car je ne vous tracasse pas avec mod_jk, s'il vous plaît, vous faites la même chose avec moi et le WebApp module. Pier (always screwing up
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
jfclere 01/09/06 10:00:54
Modified:jk/native/apache-2.0 mod_jk.c
webapp/apache-2.0 mod_webapp.c
Log:
Arrange apache-2.0 support (like in mod_jk.c).
Submitted by: Ryan Bloom, [EMAIL PROTECTED]
Revision ChangesPath
1.23 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_jk.c 2001/09/06 13:39:29 1.22
+++ mod_jk.c 2001/09/06 17:00:54 1.23
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.22 $ *
+ * Version: $Revision: 1.23 $ *
***/
/*
@@ -1329,7 +1329,7 @@
static int jk_map_to_storage(request_rec *r)
{
if (apr_table_get(r-notes, JK_WORKER_ID)) {
-r-filename = apr_filename_of_pathname(r-uri);
+r-filename = (char *)apr_filename_of_pathname(r-uri);
return OK;
}
return DECLINED;
1.2 +18 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_webapp.c 2001/08/21 16:20:58 1.1
+++ mod_webapp.c 2001/09/06 17:00:54 1.2
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli mailto:[EMAIL PROTECTED]
- * @version $Id: mod_webapp.c,v 1.1 2001/08/21 16:20:58 pier Exp $
+ * @version $Id: mod_webapp.c,v 1.2 2001/09/06 17:00:54 jfclere Exp $
*/
#include httpd.h
@@ -413,6 +413,9 @@
/* The uri path is matched: set the handler and return */
r-handler=apr_pstrdup(r-pool,webapp-handler);
+#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
+apr_table_setn(r-notes,webapp-handler, webapp-handler);
+#endif
/* Set the webapp request structure into Apache's request structure */
ap_set_module_config(r-request_config, webapp_module, appl);
@@ -507,12 +510,26 @@
return(OK);
}
+#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
+/* bypass the directory_walk and file_walk for non-file requests */
+static int wam_map_to_storage(request_rec *r)
+{
+if (apr_table_get(r-notes, webapp-handler)) {
+r-filename = (char *)apr_filename_of_pathname(r-uri);
+return OK;
+}
+return DECLINED;
+}
+#endif
static void register_hooks(apr_pool_t *p)
{
ap_hook_handler(wam_invoke, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(wam_match, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(wam_startup, NULL, NULL, APR_HOOK_MIDDLE);
+#if (MODULE_MAGIC_NUMBER_MAJOR 20010808)
+ap_hook_map_to_storage(wam_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
+#endif
}
/* Apache module declaration */
RE: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
This will need to change when my next patches in the webapp library go in, as Apache will be able to serve static files when possible... Also, since Apache 2.0 is not final yet, I would remove all MODULE_MAGIC_NUMBER checks, and _require_ for the module to be built with the latest HEAD out of CVS... I don't care at this point about 2.0 backward compatibility I didn't agree with that Pier, we must try to keep compatibility with previous release of Apache 2.0, since there IS STILL NO official release. Many users are still using Apache 2.0.24-alpha (including myself), or even 2.0.18-beta (including IBM iSeries team porting Apache 2.0). Let avoid questions in user-list asking about which version of Apache 2.0 to be used, or why we couldn't compile the module against a running (even if obsolete) Apache 2.0 That's a part of the problem in mod_webapp with APR. I'd do something like at the top of the file, and move the version to check against accordingly, until 2.0 doesn't get final. #if (MODULE_MAGIC_NUBER_MAJOR 20010808) #error ERROR: You need the latest Apache 2.0 code to compile #endif Please mod_jk commiters, in JT and JTC, keep care of previous releases and still use MODULE_MAGIC_NUBER_MAJOR when needed. As soon as Apache 2.0 will be released, we'll clean code by dropping all that controls, but until that we must keep compatibility with at least latest beta (2.0.18-beta) Hi Ho.
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
GOMEZ Henri [EMAIL PROTECTED] wrote: I didn't agree with that Pier, we must try to keep compatibility with previous release of Apache 2.0, since there IS STILL NO official release. Many users are still using Apache 2.0.24-alpha (including myself), or even 2.0.18-beta (including IBM iSeries team porting Apache 2.0). Since there is no official release of httpd-2.0, I am confident that nobody will actually care unless they're testing something... And by testing good practice says get the HEAD of CVS and try it out yourself if it doesn't work. Development happens on head and if someone forks off for a little while to do some porting to some weird operating systems, at the end those changes will have to be integrated with HEAD, so, there's no point in sticking with backward compatibility AT THIS POINT. I could stick with the last official tarball since that's an easy piece of thing to download. So, if the latest version is 2.0.18 alpha (don't even know since I use HEAD), I could agree to have some ifdefs in the code to cope with the differences between latest tarball and head. All this, of course, UNTIL an official final version comes out, that's when I'll start caring about backward compatibility. That's my idea, but I would love to hear the other contributors to the WebApp module to tell me what they think, Ryan, J.F., Colin, Thom... Let avoid questions in user-list asking about which version of Apache 2.0 to be used, or why we couldn't compile the module against a running (even if obsolete) Apache 2.0 Like, you've answered a lot of questions on tomcat-user about the WebApp module :) :) :) That's a task I'm handling, and I believe I've been pretty good at. There's no unanswered question on the WebApp module on the users list. (In comparison to...) That's a part of the problem in mod_webapp with APR. Choosing APR has been my decision from the beginning. If you guys didn't want to do it, why not voting -1 when I dropped the code in CVS? Now it's there, I believe it's good. You might not like it, as I don't like what you're doing, but, hey, we're forced to coexist on the same mailing list. So, as I don't piss you off on what you're doing, please, you do the same. :) :) :) :) :) Thanks... Pier
Re: cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
Justin Erenkrantz [EMAIL PROTECTED] wrote: On Fri, Sep 07, 2001 at 01:52:50AM +0100, Pier Fumagalli wrote: Since there is no official release of httpd-2.0, I am confident that nobody will actually care unless they're testing something... And by testing good practice says get the HEAD of CVS and try it out yourself if it doesn't work. Development happens on head and if someone forks off for a little while to do some porting to some weird operating systems, at the end those changes will have to be integrated with HEAD, so, there's no point in sticking with backward compatibility AT THIS POINT. +1 to what Pier said. (Ryan may chip in here too...) Yeah, I would like to hear what he thinks... If you are using anything other than HEAD for httpd-2.0, I don't care much about any bug reports you may have. The odds are that it'd either be fixed or broken in a different manner. =) You would have not better explained my thoughts in a better way... -- justin Who I respect so much after he committed that patch to get rid of MM un APR land, and saved me at least 2 headaches :) :) :) :) Pier
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 mod_webapp.c
pier01/08/21 09:20:59 Added: webapp/apache-2.0 mod_webapp.c Log: Port of the WebApp module to Apache 2.0. Thanks to Ryan, Ian, Dirk and Randy at Covalent. Revision ChangesPath 1.1 jakarta-tomcat-connectors/webapp/apache-2.0/mod_webapp.c Index: mod_webapp.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, WebApp, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ /** * @author Pier Fumagalli mailto:[EMAIL PROTECTED] * @version $Id: mod_webapp.c,v
