DO NOT REPLY [Bug 49159] Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159 --- Comment #9 from sylvain.laur...@gmail.com 2010-09-25 18:51:53 EDT --- > What do you think ? If we don't use a fair queue, we do not have a > deterministic behavior and some thread might still trigger a memory leak... Unless we have minSpareThreads=0. This way even threads that are no longer used will eventually be stopped (the timeout is 60s by default, maxIdleTime in StandardThreadExecutor and hardcoded in AbstractEndpoint.createExecutor() ) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49159] Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159 --- Comment #8 from sylvain.laur...@gmail.com 2010-09-25 18:42:53 EDT --- Created an attachment (id=26074) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26074) proposed patch to renew threads one by one with a delay I explored your idea and managed to force threads to "kill themselves" after a context is stopped. Here are the main points of my new patch : - I save the last time a context is stopped in a static variable of StandardContext (this could be improved to record it somewhere at the Service or Engine level, in a instance variable) - The "suicide" is done in ThreadPoolExecutor.afterExecute(), in case the thread was created before the last context was stopped. - the rate at which threads are renewed is throttled to avoid renewing all threads at the same time (otherwise it would have been the same as my initial proposal to renew the whole pool). - I had to make TaskQueue extend ArrayBlockingQueue instead of LinkedBlockingQueue because the latter does not propose to have a "fair" policy. Fairness is required so that every thread of the pool is given the opportunity to be killed. - Unlike LinkedBlockingQueue, ArrayBlockingQueue requires a reasonable size (not Integer.MAX_VALUE). I set it to 100 by default (configurable with the maxQueueSize property at the Connector or Executor level) I'm quite happy with this patch except the fairness requirement : - The javadocs of ArrayBlockingQueue say that it may decrease performance, but I don't how much - Since each thread of the pool is used in turn, we might lose some caching effects - and it also prevents the size of the pool to be decreased in case of low activity : without fairness, some Thread could timeout waiting for an element from the queue while other threads could serve new requests. Eventually the pool could decide to decrease it size. What do you think ? If we don't use a fair queue, we do not have a deterministic behavior and some thread might still trigger a memory leak... -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Who added google-site-verification to index.html?
On 25/09/2010 13:33, Rainer Jung wrote: > The meta tag google-site-verification is included in our main > index.html. It is not in the authoritative svn copy. > > Is there a reason for that? > > If yes, please do also add it to the authoritative site copy in svn > (/tomcat/site/trunk), otherwise remove. That was me. It is a one-time thing so it can go now Google has verified the site. I'll delete it next time on people.a.o. If someone else gets there first that's fine. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r999983 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
On 09/25/2010 06:11 PM, Rainer Jung wrote: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml This commit changed umlauts in changelog.xml from ISO to UTF in a couple of places. I'm not sure that's OK. Ni idea. However my box has utf-8 locale, so might be my editor to blame. However the header of (all) xml is: So how can it be ISO at the first place? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r999983 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
On 22.09.2010 16:36, mt...@apache.org wrote: Author: mturk Date: Wed Sep 22 14:36:59 2010 New Revision: 83 URL: http://svn.apache.org/viewvc?rev=83&view=rev Log: Backport the unlockAccept Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml This commit changed umlauts in changelog.xml from ISO to UTF in a couple of places. I'm not sure that's OK. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1001244 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Author: rjung Date: Sat Sep 25 15:55:24 2010 New Revision: 1001244 URL: http://svn.apache.org/viewvc?rev=1001244&view=rev Log: Remove some more legacy (pre-beta) revision check within mod_jk.c. Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1001244&r1=1001243&r2=1001244&view=diff == --- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original) +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Sat Sep 25 15:55:24 2010 @@ -46,12 +46,6 @@ #include "util_charset.h" /* ap_hdrs_from_ascii */ #endif -/* moved to apr since http-2.0.19-dev */ -#if (MODULE_MAGIC_NUMBER_MAJOR < 20010523) -#define apr_date_parse_http ap_parseHTTPdate -#include "util_date.h" -#endif - /* deprecated with apr 0.9.3 */ #include "apr_version.h" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r996836 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c apache-2.0/mod_jk.dsp iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/isapi.dsp
On 25.09.2010 14:47, Rainer Jung wrote: On 14.09.2010 13:00, wr...@apache.org wrote: Author: wrowe Date: Tue Sep 14 11:00:40 2010 New Revision: 996836 URL: http://svn.apache.org/viewvc?rev=996836&view=rev Log: Identify JK_ISAPI for jk_version.h PACKAGE definition Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/isapi.dsp Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=996836&r1=996835&r2=996836&view=diff == --- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original) +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Sep 14 11:00:40 2010 @@ -3549,7 +3549,6 @@ static int jk_translate(request_rec * r) return DECLINED; } -#if (MODULE_MAGIC_NUMBER_MAJOR> 20010808) /* bypass the directory_walk and file_walk for non-file requests */ static int jk_map_to_storage(request_rec * r) { @@ -3665,7 +3664,6 @@ static int jk_map_to_storage(request_rec } return DECLINED; } -#endif static void jk_register_hooks(apr_pool_t * p) { @@ -3673,9 +3671,7 @@ static void jk_register_hooks(apr_pool_t ap_hook_post_config(jk_post_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init(jk_child_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_translate_name(jk_translate, NULL, NULL, APR_HOOK_MIDDLE); -#if (MODULE_MAGIC_NUMBER_MAJOR> 20010808) ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE); -#endif } module AP_MODULE_DECLARE_DATA jk_module = { Were the removal of those two MMN checks intended? The log doesn't indicate it, but since they refer to real ancient 2.0 dev versions, I'd have no problem with removing it. Sorry, I didn't see your svn log additions before now. If so: there's another #if (MODULE_MAGIC_NUMBER_MAJOR < 20010523) which goes back even further. I'll remove that one. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1001222 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: rjung Date: Sat Sep 25 14:43:25 2010 New Revision: 1001222 URL: http://svn.apache.org/viewvc?rev=1001222&view=rev Log: Partial undo of r998120: we now have a general errno protection in trace logging, so we can stick to the simple coding idiom (trace logging is last before return). Modified: tomcat/jk/trunk/native/common/jk_connect.c Modified: tomcat/jk/trunk/native/common/jk_connect.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1001222&r1=1001221&r2=1001222&view=diff == --- tomcat/jk/trunk/native/common/jk_connect.c (original) +++ tomcat/jk/trunk/native/common/jk_connect.c Sat Sep 25 14:43:25 2010 @@ -734,8 +734,8 @@ int jk_shutdown_socket(jk_sock_t sd, jk_ jk_log(l, JK_LOG_DEBUG, "Failed sending SHUT_WR for socket %d [%s]", sd, sb); -JK_TRACE_EXIT(l); errno = save_errno; +JK_TRACE_EXIT(l); return rc; } @@ -807,8 +807,8 @@ int jk_shutdown_socket(jk_sock_t sd, jk_ jk_log(l, JK_LOG_DEBUG, "Shutdown socket %d [%s] and read %d lingering bytes in %d sec.", sd, sb, rd, (int)difftime(time(NULL), start)); -JK_TRACE_EXIT(l); errno = save_errno; +JK_TRACE_EXIT(l); return rc; } @@ -993,8 +993,8 @@ int jk_is_input_event(jk_sock_t sd, int sd, jk_dump_sinfo(sd, buf), timeout); } /* Timeout. Set the errno to timeout */ -JK_TRACE_EXIT(l); errno = ETIMEDOUT; +JK_TRACE_EXIT(l); return JK_FALSE; } else if (rc < 0) { @@ -1004,8 +1004,8 @@ int jk_is_input_event(jk_sock_t sd, int "error during poll on socket %d [%s] (errno=%d)", sd, jk_dump_sinfo(sd, buf), errno); } -JK_TRACE_EXIT(l); errno = save_errno; +JK_TRACE_EXIT(l); return JK_FALSE; } if ((fds.revents & (POLLERR | POLLHUP))) { @@ -1015,12 +1015,12 @@ int jk_is_input_event(jk_sock_t sd, int "error event during poll on socket %d [%s] (event=%d)", sd, jk_dump_sinfo(sd, buf), save_errno); } -JK_TRACE_EXIT(l); errno = save_errno; +JK_TRACE_EXIT(l); return JK_FALSE; } -JK_TRACE_EXIT(l); errno = 0; +JK_TRACE_EXIT(l); return JK_TRUE; } #else @@ -1050,13 +1050,13 @@ int jk_is_input_event(jk_sock_t sd, int "timeout during select on socket %d [%s] (timeout=%d)", sd, jk_dump_sinfo(sd, buf), timeout); } -JK_TRACE_EXIT(l); /* Timeout. Set the errno to timeout */ #if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__)) errno = WSAETIMEDOUT - WSABASEERR; #else errno = ETIMEDOUT; #endif +JK_TRACE_EXIT(l); return JK_FALSE; } else if (rc < 0) { @@ -1066,12 +1066,12 @@ int jk_is_input_event(jk_sock_t sd, int "error during select on socket %d [%s] (errno=%d)", sd, jk_dump_sinfo(sd, buf), errno); } -JK_TRACE_EXIT(l); errno = save_errno; +JK_TRACE_EXIT(l); return JK_FALSE; } -JK_TRACE_EXIT(l); errno = 0; +JK_TRACE_EXIT(l); return JK_TRUE; } #endif - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1001219 - in /tomcat/jk/trunk: native/common/jk_logger.h xdocs/miscellaneous/changelog.xml
Author: rjung Date: Sat Sep 25 14:34:25 2010 New Revision: 1001219 URL: http://svn.apache.org/viewvc?rev=1001219&view=rev Log: Don't destroy errno during trace logging. Modified: tomcat/jk/trunk/native/common/jk_logger.h tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/common/jk_logger.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_logger.h?rev=1001219&r1=1001218&r2=1001219&view=diff == --- tomcat/jk/trunk/native/common/jk_logger.h (original) +++ tomcat/jk/trunk/native/common/jk_logger.h Sat Sep 25 14:34:25 2010 @@ -109,13 +109,17 @@ struct jk_file_logger_t #define JK_TRACE_ENTER(l) \ do {\ if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) { \ +int tmp_errno = errno; \ jk_log((l), JK_LOG_TRACE, "enter"); \ +errno = tmp_errno; \ } } while (0) #define JK_TRACE_EXIT(l)\ do {\ if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) { \ +int tmp_errno = errno; \ jk_log((l), JK_LOG_TRACE, "exit"); \ +errno = tmp_errno; \ } } while (0) #endif /* JK_PRODUCTION */ Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1001219&r1=1001218&r2=1001219&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sat Sep 25 14:34:25 2010 @@ -56,6 +56,9 @@ section allowing other threads to use the connection pool during maintenance. (mturk) + +Common: Don't destroy errno during trace logging. (rjung) + Apache: Added version number resource for mod_jk.so on Windows. (timw) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1001216 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Sat Sep 25 14:28:36 2010 New Revision: 1001216 URL: http://svn.apache.org/viewvc?rev=1001216&view=rev Log: Please no tabs. Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1001216&r1=1001215&r2=1001216&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sat Sep 25 14:28:36 2010 @@ -68,8 +68,8 @@ Old behaviour can be enabled by defining USE_CGI_HEADERS. (timw) - 49511: IIS: Do not override IIS log information when subsequent - requests on a keep-alive connection are not mapped into the ISAPI Redirector. (timw) +49511: IIS: Do not override IIS log information when subsequent +requests on a keep-alive connection are not mapped into the ISAPI Redirector. (timw) Docs: Document SSLOptions needed for SSL information forwarding. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat diagnostics
On 23/09/2010 13:52, Pid wrote: > Hi, > > > I've been playing with a CLI, JMX and a few other things. At work I am > manually extracting and monitoring various bits of JMX data in order to > diagnose problems with Tomcat configs and applications. > > There's lot of information available in the JVM & Tomcat which could be > polled periodically, (theoretically comparatively cheaply), in order to > determine if there is a problem developing or occurring. > > Some of this information could be collated and presented in a structured > format to enable more easy analysis. Tomcat could then self-diagnose > some common problems. > > > Rainer & I had a lengthy conversation at the Apache Retreat last weekend > and extrapolated, coming up with more ideas: > > - Periodic snaphots of key indicators, e.g. Connector backlog, error > counts, resource pool usage. > - A 'black box recorder' mode which can be enabled to log key data > - Periodic inspection of threads to warn about blocking, deadlocks > - A simple web UI (like the /manager) which presents & collates this > info and does some simple analysis > > It should also be possible to make some educated guesses about the > sources of common problems by doing statistical analysis of thread stacks. > > There are products on the market and app in the JDK which instrument > apps and perform profiling, but we concluded we can simulate some of > this with little performance cost. > > > There's a huge gap between understanding basic info, and understanding > what the JDK tools output. It should be possible for Tomcat provide an > intermediate level and help users improve their own analysis. > > No silver bullets, just a step up from the basics. > > > Thoughts? > > > p > > (@Rainer did I forget anything?) I did forget something. A user asked if it was possible for Tomcat to detect duplicate classes in the classpath and report which jar they were in. p 0x62590808.asc Description: application/pgp-keys signature.asc Description: OpenPGP digital signature
Re: svn commit: r998129 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
On 09/25/2010 02:50 PM, Rainer Jung wrote: On 17.09.2010 15:44, mt...@apache.org wrote: Author: mturk Date: Fri Sep 17 13:44:50 2010 New Revision: 998129 URL: http://svn.apache.org/viewvc?rev=998129&view=rev Log: Axe excess logging. We already logged that within jk_open_socket Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=998129&r1=998128&r2=998129&view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Sep 17 13:44:50 2010 @@ -962,13 +962,6 @@ int ajp_connect_to_endpoint(ajp_endpoint JK_TRACE_EXIT(l); return JK_FALSE; } - ae->last_errno = 0; Sure you want to remove the above reset of last_errno? Yes. We set it to zero at the function entry. If the socket was valid it'll be zero, and if not the function would return before that set. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r998120 - /tomcat/jk/trunk/native/common/jk_connect.c
On 09/25/2010 03:00 PM, Rainer Jung wrote: On 17.09.2010 15:26, mt...@apache.org wrote: Author: mturk Date: Fri Sep 17 13:26:58 2010 New Revision: 998120 URL: http://svn.apache.org/viewvc?rev=998120&view=rev Log: Make sure errno survives JK_TRACE_EXIT call Good catch! WDYT about Index: common/jk_logger.h === --- common/jk_logger.h (revision 1001201) +++ common/jk_logger.h (working copy) @@ -115,7 +115,9 @@ #define JK_TRACE_EXIT(l) \ do { \ if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) { \ + int tmp_errno = errno; jk_log((l), JK_LOG_TRACE, "exit"); \ + errno = tmp_errno; } } while (0) #endif /* JK_PRODUCTION */ to handle that in general. It only runs additional code when trace is on and is a bit more general. If you like it, I can apply and redo some of the above changes. Sure, this would make it event better. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r998120 - /tomcat/jk/trunk/native/common/jk_connect.c
On 17.09.2010 15:26, mt...@apache.org wrote: Author: mturk Date: Fri Sep 17 13:26:58 2010 New Revision: 998120 URL: http://svn.apache.org/viewvc?rev=998120&view=rev Log: Make sure errno survives JK_TRACE_EXIT call Good catch! WDYT about Index: common/jk_logger.h === --- common/jk_logger.h (revision 1001201) +++ common/jk_logger.h (working copy) @@ -115,7 +115,9 @@ #define JK_TRACE_EXIT(l)\ do {\ if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) { \ +int tmp_errno = errno; jk_log((l), JK_LOG_TRACE, "exit"); \ +errno = tmp_errno; } } while (0) #endif /* JK_PRODUCTION */ to handle that in general. It only runs additional code when trace is on and is a bit more general. If you like it, I can apply and redo some of the above changes. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r998129 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
On 17.09.2010 15:44, mt...@apache.org wrote: Author: mturk Date: Fri Sep 17 13:44:50 2010 New Revision: 998129 URL: http://svn.apache.org/viewvc?rev=998129&view=rev Log: Axe excess logging. We already logged that within jk_open_socket Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=998129&r1=998128&r2=998129&view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Sep 17 13:44:50 2010 @@ -962,13 +962,6 @@ int ajp_connect_to_endpoint(ajp_endpoint JK_TRACE_EXIT(l); return JK_FALSE; } -ae->last_errno = 0; Sure you want to remove the above reset of last_errno? -if (JK_IS_DEBUG_LEVEL(l)) { -jk_log(l, JK_LOG_DEBUG, - "Connected socket %d to (%s)", - ae->sd, - jk_dump_hinfo(&ae->worker->worker_inet_addr, buf)); -} /* set last_access only if needed */ if (ae->worker->cache_timeout> 0) ae->last_access = time(NULL); Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r996836 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c apache-2.0/mod_jk.dsp iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/isapi.dsp
On 14.09.2010 13:00, wr...@apache.org wrote: Author: wrowe Date: Tue Sep 14 11:00:40 2010 New Revision: 996836 URL: http://svn.apache.org/viewvc?rev=996836&view=rev Log: Identify JK_ISAPI for jk_version.h PACKAGE definition Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/isapi.dsp Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=996836&r1=996835&r2=996836&view=diff == --- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original) +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Sep 14 11:00:40 2010 @@ -3549,7 +3549,6 @@ static int jk_translate(request_rec * r) return DECLINED; } -#if (MODULE_MAGIC_NUMBER_MAJOR> 20010808) /* bypass the directory_walk and file_walk for non-file requests */ static int jk_map_to_storage(request_rec * r) { @@ -3665,7 +3664,6 @@ static int jk_map_to_storage(request_rec } return DECLINED; } -#endif static void jk_register_hooks(apr_pool_t * p) { @@ -3673,9 +3671,7 @@ static void jk_register_hooks(apr_pool_t ap_hook_post_config(jk_post_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init(jk_child_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_translate_name(jk_translate, NULL, NULL, APR_HOOK_MIDDLE); -#if (MODULE_MAGIC_NUMBER_MAJOR> 20010808) ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE); -#endif } module AP_MODULE_DECLARE_DATA jk_module = { Were the removal of those two MMN checks intended? The log doesn't indicate it, but since they refer to real ancient 2.0 dev versions, I'd have no problem with removing it. If so: there's another #if (MODULE_MAGIC_NUMBER_MAJOR < 20010523) which goes back even further. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r996830 - in /tomcat/jk/trunk/native/common: jk.rc jk_version.h
On 14.09.2010 12:46, wr...@apache.org wrote: Author: wrowe Date: Tue Sep 14 10:46:00 2010 New Revision: 996830 URL: http://svn.apache.org/viewvc?rev=996830&view=rev Log: This change requires JK_ISAPI, JK_NSAPI to be defined, drops JK_DLL_BASENAME Modified: tomcat/jk/trunk/native/common/jk.rc tomcat/jk/trunk/native/common/jk_version.h Modified: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=996830&r1=996829&r2=996830&view=diff == --- tomcat/jk/trunk/native/common/jk.rc (original) +++ tomcat/jk/trunk/native/common/jk.rc Tue Sep 14 10:46:00 2010 @@ -1,76 +1,76 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with ... Do we want svn:eol-style native here? Our dsp files have it, I assume this single file slipped the setting because of the "rc" suffix not contained in the default svn settings we use. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Who added google-site-verification to index.html?
The meta tag google-site-verification is included in our main index.html. It is not in the authoritative svn copy. Is there a reason for that? If yes, please do also add it to the authoritative site copy in svn (/tomcat/site/trunk), otherwise remove. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: The status of tomcat taglibs project?
On 25 September 2010 07:37, Rex Wang wrote: > Hi Devs, > > I just checked out the taglibs source code from > http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk and try to > replace the sun implementation in my build. > But the first problem jumped in is that I can not even build it. Because > maven can not find its parent pom: > > org.apache.taglibs > taglibs-parent > 1-SNAPSHOT > > >>>Project ID: null:taglibs-standard:pom:1.2-SNAPSHOT >>>Reason: Cannot find parent: org.apache.taglibs:taglibs-parent for project: > null:taglibs-standard:pom:1.2-SNAPSHOT for project > null:taglibs-standard:pom:1.2-SNAP >>>SHOT > > Could anyone tell me any clue about this? You probably need to check out http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk/ and run install on that. > or it has never been built since > transferred from jakarta project? > > And, does tomcat community have any plan to release the taglibs? I'll leave it to others to answer that question. > Any comment is appreciated. > > Regards, > > -- > Lei Wang (Rex) > rwonly AT apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1001203 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Author: rjung Date: Sat Sep 25 12:25:01 2010 New Revision: 1001203 URL: http://svn.apache.org/viewvc?rev=1001203&view=rev Log: Welcome back. Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1001203&r1=1001202&r2=1001203&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Sat Sep 25 12:25:01 2010 @@ -358,6 +358,8 @@ open-source projects: you can read more +William A. Rowe Jr. (wrowe at apache.org) + @@ -442,7 +444,6 @@ Emeritus is defined in the Apache gl Keith Eric Carmichael (ecarmich at apache.org), Guenter Knauf (fuankg at apache.org), Jean-Jacques Clar (clar at apache.org), -William A. Rowe Jr. (wrowe at apache.org) Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1001203&r1=1001202&r2=1001203&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Sat Sep 25 12:25:01 2010 @@ -107,6 +107,8 @@ open-source projects: you can read more Tim Whittington (timw at apache.org) +William A. Rowe Jr. (wrowe at apache.org) + @@ -167,7 +169,6 @@ Emeritus is defined in the Apache gl Keith Eric Carmichael (ecarmich at apache.org), Guenter Knauf (fuankg at apache.org), Jean-Jacques Clar (clar at apache.org), -William A. Rowe Jr. (wrowe at apache.org) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org