DO NOT REPLY [Bug 12658] a proxy host and port at the element level
https://issues.apache.org/bugzilla/show_bug.cgi?id=12658 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2010-12-16 05:29:23 EST --- The name of the Host is used for proxyHost unless overridden on the connector. -- 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 12766] Tomcat should use tld files in /WEB-INF/ over version in jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=12766 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2010-12-16 05:56:26 EST --- It wasn't clear in the JSP 1.2 spec (for Tomcat 4) but subsequent JSP specs included the following: The container searches for all files with a .tld extension under /WEB-INF or a subdirectory, and inside JAR files that are in /WEB-INF/lib.When examining a JAR file, only resources under /META-INF or a subdirectory are considered. The order in which these files are searched for is implementation-specific and should not be relied on by web applications. -- 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
svn commit: r1049970 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Dec 16 13:31:05 2010 New Revision: 1049970 URL: http://svn.apache.org/viewvc?rev=1049970&view=rev Log: Corrected a typo Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1049970&r1=1049969&r2=1049970&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 16 13:31:05 2010 @@ -1054,7 +1054,7 @@ 48421: Fix file descriptor and potential memory leak when a web application uses a local logging.properties file. Allow a web -applciation's log files to be deleted once the web application has been +application's log files to be deleted once the web application has been stopped. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a new failure of tomcat-6-trunk on ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/172 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1049970 Blamelist: kkolinko BUILD FAILED: failed failed slave lost sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1049997 - /tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
Author: markt Date: Thu Dec 16 15:04:56 2010 New Revision: 1049997 URL: http://svn.apache.org/viewvc?rev=1049997&view=rev Log: Fix a FindBugs nag in the unit tests Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1049997&r1=1049996&r2=1049997&view=diff == --- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original) +++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Thu Dec 16 15:04:56 2010 @@ -206,7 +206,7 @@ public class Benchmarks extends TestCase } private volatile Date currentDate = new Date(); -private String currentDateString = null; +private volatile String currentDateString = null; private SimpleDateFormat dayFormatter = new SimpleDateFormat("dd"); private SimpleDateFormat monthFormatter = new SimpleDateFormat("MM"); private SimpleDateFormat yearFormatter = new SimpleDateFormat(""); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by servers
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "PoweredBy" page has been changed by servers. http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=282&rev2=283 -- === Sakai === [[http://www.sakaiproject.org|The Sakai Project]] - building a collaboration and learning environment for higher education. + + === Servers === + [[http://www.Servers.co.In|Indian Web Hosting ]] - Servers offer Dedicated Web Hosting in India supporting Apache Tomcat. + === service-repository.com === [[http://www.service-repository.com/|Service-Repository]] - Registry of public SOAP Web Services and dynamic client UI - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Trivial Update of "FAQ/Connectors" by Pid Ster
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/Connectors" page has been changed by PidSter. The comment on this change is: mod_proxy supports sticky sessions. http://wiki.apache.org/tomcat/FAQ/Connectors?action=diff&rev1=12&rev2=13 -- * Stay away from mod_webapp, aka warp. It is deprecated and unsupported due to lack of developer interest and there are better options such as jk and mod_proxy. It WILL NOT run on windows. '''Do not use mod_webapp or warp.''' * mod_jserv is unsupported and will not be supported in Tomcat 5. mod_jserv was the original connector which supported the ajp protocol. '''Do not use mod_jserv.''' * jk2 is a refactoring of mod_jk and uses the Apache Portable Runtime (apr). But due to lack of developer interest, it is unsupported. The alternative is mod_jk or mod_proxy_ajp. '''Do not use jk2.''' - * '''mod_jk is great and should be used for production'''. It is still under active development and also works for the apache 2.X series for cases where you do not want to use mod_proxy_ajp. + * '''mod_jk is mature, stable and extremely flexible.'''. It is under active development by members of the Tomcat community. - * mod_proxy. A cheap way to proxy without the hassles of configuring JK. This solution lacks sticky session load balancing. If you don't need some of the features of jk - this is a very simple alternative. + * mod_proxy. A cheap way to proxy without the hassles of configuring JK. If you don't need some of the features of jk - this is a very simple alternative. * mod_proxy_ajp. With apache 2.2, mod_proxy was rewritten to support load balancing as well as a new transport called mod_proxy_ajp. This module is distributed with the Apache http server, not the Tomcat server. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1050023 - /tomcat/native/trunk/native/src/sslinfo.c
Author: mturk Date: Thu Dec 16 16:04:31 2010 New Revision: 1050023 URL: http://svn.apache.org/viewvc?rev=1050023&view=rev Log: Fix compile-time warning. Modified: tomcat/native/trunk/native/src/sslinfo.c Modified: tomcat/native/trunk/native/src/sslinfo.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1050023&r1=1050022&r2=1050023&view=diff == --- tomcat/native/trunk/native/src/sslinfo.c (original) +++ tomcat/native/trunk/native/src/sslinfo.c Thu Dec 16 16:04:31 2010 @@ -318,7 +318,7 @@ TCN_IMPLEMENT_CALL(jstring, SSLSocket, g break; case SSL_INFO_CIPHER_DESCRIPTION: { -const SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); +SSL_CIPHER *cipher = SSL_get_current_cipher(s->ssl); if (cipher) { char buf[256]; char *desc = SSL_CIPHER_description(cipher, buf, 256); @@ -543,7 +543,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, getI break; default: rv = APR_EINVAL; -break; +break; } X509_free(xs); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
isapi_redirector.dll -- Tomcat to IIS problems
Hi, I am trying to get an application called JIRA to work externally on our corporate domain. We believe we have everything set up properly and have followed numoerous online instructions. The default website in IIS (version 6) is up and the ISAPI filter is "loaded" with the green light. However, when we go to the website we're getting a "Bad Gateway" error and the ISAPI logs say this: [Thu Dec 16 11:20:10.559 2010] [1508:1800] [error] ajp_get_reply::jk_ajp_common.c (2058): (worker1) Tomcat is down or refused connection. No response has been sent to the client (yet) [Thu Dec 16 11:20:10.559 2010] [1508:1800] [info] ajp_service::jk_ajp_common.c (2543): (worker1) sending request to tomcat failed (recoverable), because of protocol error (attempt=1) [Thu Dec 16 11:20:10.559 2010] [1508:1800] [debug] ajp_service::jk_ajp_common.c (2400): retry 1, sleeping for 100 ms before retrying [Thu Dec 16 11:20:10.668 2010] [1508:1800] [debug] ajp_send_request::jk_ajp_common.c (1572): (worker1) all endpoints are disconnected. [Thu Dec 16 11:20:10.668 2010] [1508:1800] [debug] jk_open_socket::jk_connect.c (484): socket TCP_NODELAY set to On Could really really use some help here. Please let me know what additional info you need to assist. -- View this message in context: http://old.nabble.com/isapi_redirector.dllTomcat-to-IIS-problems-tp30474659p30474659.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50488] New: classpath for jsvc in web page
https://issues.apache.org/bugzilla/show_bug.cgi?id=50488 Summary: classpath for jsvc in web page Product: Tomcat 7 Version: 7.0.5 Platform: Macintosh Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: edoa...@aspix.it in the page http://tomcat.apache.org/tomcat-7.0-doc/setup.html in section "Unix daemon" the argument "-cp ./bin/bootstrap.jar" must be replaced with "-cp ./bin/bootstrap.jar:./bin/tomcat-juli.jar" Using only "-cp ./bin/bootstrap.jar" tomcat can't start due to a class not found exception "java.lang.NoClassDefFoundError: org/apache/juli/logging/LogFactory" -- 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 50488] classpath for jsvc in web page
https://issues.apache.org/bugzilla/show_bug.cgi?id=50488 Edoardo Panfili changed: What|Removed |Added OS/Version||All --- Comment #1 from Edoardo Panfili 2010-12-16 13:05:46 EST --- under Mac OS X 10.6.5 64 bit also the parameter "-jvm server" is necessary -- 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 12428] request.getUserPrincipal(): Misinterpretation of specification?
https://issues.apache.org/bugzilla/show_bug.cgi?id=12428 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Comment #23 from Mark Thomas 2010-12-16 14:00:15 EST --- Having looked at this further this is no need for a patch. Tomcat has the necessary functionality to do this. You just need to ensure that a) the application is using sessions and b) that the authenticators are configured to cache the authenticated Principal in the session. A recent enhancement to Tomcat 7 (the alwaysUseSession attribute) will make this even easier. On earlier versions, ensure a session exists before the authentication takes place. Depending on circumstances that might require a valve. Marking this as WONTFIX since the patch isn't going to be applied. The other advantage of this approach is that the handling of fail unprompted authentications does not need to be considered. There were issues with complying with RFC2617 with that approach and it couldn't possible work with DIGEST auth. -- 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 12428] request.getUserPrincipal(): Misinterpretation of specification?
https://issues.apache.org/bugzilla/show_bug.cgi?id=12428 --- Comment #24 from Werner Donn 2010-12-16 14:32:26 EST --- Sessions don't solve the problem and doesn't make it comply to the spec. The container is not the only party that can decide if authentication is necessary. The application can do this too. Even if no credentials were provided spontaneously by the client, the application could set the status code to 401. The client would then reissue the request with credentials and the application couldn't anything else but return 401 again, because the principal is not passed through by Tomcat as the resource is not declared as protected in web.xml. What were the issues with RFC 2617? The fact that it wouldn't work for DIGEST authentication is not relevant. We're talking about a valid scenario for Basic authentication. -- 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
svn commit: r1050117 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
Author: markt Date: Thu Dec 16 19:39:58 2010 New Revision: 1050117 URL: http://svn.apache.org/viewvc?rev=1050117&view=rev Log: Fix Findbugs issues / Eclipse warnings. Some genuine issues Some changes to make code easier to read (for humans and analysis tools) Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1050117&r1=1050116&r2=1050117&view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Dec 16 19:39:58 2010 @@ -180,7 +180,10 @@ class Generator { if (this.jspIdPrefix == null) { StringBuilder sb = new StringBuilder(32); String name = ctxt.getServletJavaFileName(); -sb.append("jsp_").append(Math.abs(name.hashCode())).append('_'); +sb.append("jsp_"); +// Cast to long to avoid issue with Integer.MIN_VALUE +sb.append(Math.abs((long) name.hashCode())); +sb.append('_'); this.jspIdPrefix = sb.toString(); } return this.jspIdPrefix + (this.jspId++); @@ -303,9 +306,9 @@ class Generator { private String createTagHandlerPoolName(String prefix, String shortName, Attributes attrs, Node.Nodes namedAttrs, boolean hasEmptyBody) { -String poolName = null; +StringBuilder poolName = new StringBuilder("_jspx_tagPool_" + +prefix + "_" + shortName); -poolName = "_jspx_tagPool_" + prefix + "_" + shortName; if (attrs != null) { String[] attrNames = new String[attrs.getLength() + namedAttrs.size()]; @@ -318,16 +321,17 @@ class Generator { } Arrays.sort(attrNames, Collections.reverseOrder()); if (attrNames.length > 0) { -poolName = poolName + "&"; +poolName.append('&'); } for (int i = 0; i < attrNames.length; i++) { -poolName = poolName + "_" + attrNames[i]; +poolName.append("_"); +poolName.append(attrNames[i]); } } if (hasEmptyBody) { -poolName = poolName + "_nobody"; +poolName.append("_nobody"); } -return JspUtil.makeJavaIdentifier(poolName); +return JspUtil.makeJavaIdentifier(poolName.toString()); } } @@ -1806,34 +1810,37 @@ class Generator { out.print(n.getQName()); Attributes attrs = n.getNonTaglibXmlnsAttributes(); -int attrsLen = (attrs == null) ? 0 : attrs.getLength(); -for (int i = 0; i < attrsLen; i++) { -out.print(" "); -out.print(attrs.getQName(i)); -out.print("="); -out.print(DOUBLE_QUOTE); -out.print(attrs.getValue(i).replace("\"", """)); -out.print(DOUBLE_QUOTE); -} - -attrs = n.getAttributes(); -attrsLen = (attrs == null) ? 0 : attrs.getLength(); -Node.JspAttribute[] jspAttrs = n.getJspAttributes(); -for (int i = 0; i < attrsLen; i++) { -out.print(" "); -out.print(attrs.getQName(i)); -out.print("="); -if (jspAttrs[i].isELInterpreterInput()) { -out.print("\\\"\" + "); -out.print(attributeValue(jspAttrs[i], false, String.class)); -out.print(" + \"\\\""); -} else { +if (attrs != null) { +for (int i = 0; i < attrs.getLength(); i++) { +out.print(" "); +out.print(attrs.getQName(i)); +out.print("="); out.print(DOUBLE_QUOTE); out.print(attrs.getValue(i).replace("\"", """)); out.print(DOUBLE_QUOTE); } } +attrs = n.getAttributes(); +if (attrs != null) { +Node.JspAttribute[] jspAttrs = n.getJspAttributes(); +for (int i = 0; i < attrs.getLength(); i++) { +out.print(" "); +out.print(attrs.getQName(i)); +out.print("="); +if (jspAttrs[i].isELInterpreterInput()) { +out.print("\\\"\" + "); +out.print(attributeValue(jspAttrs[i], false, +
svn commit: r1050150 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties StandardContext.java
Author: slaurent Date: Thu Dec 16 20:40:36 2010 New Revision: 1050150 URL: http://svn.apache.org/viewvc?rev=1050150&view=rev Log: bug 48822: Include contest name in reload and stop log statements https://issues.apache.org/bugzilla/show_bug.cgi?id=48822 Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1050150&r1=1050149&r2=1050150&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Dec 16 20:40:36 2010 @@ -141,7 +141,8 @@ standardContext.startFailed=Context [{0} standardContext.startingLoader=Exception starting Loader standardContext.startingManager=Exception starting Manager standardContext.startingWrapper=Exception starting Wrapper for servlet {0} -standardContext.stoppingContext=Exception stopping Context +standardContext.startingContext=Exception starting Context {0} +standardContext.stoppingContext=Exception stopping Context {0} standardContext.stoppingLoader=Exception stopping Loader standardContext.stoppingManager=Exception stopping Manager standardContext.stoppingWrapper=Exception stopping Wrapper for servlet {0} Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1050150&r1=1050149&r2=1050150&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu Dec 16 20:40:36 2010 @@ -100,7 +100,7 @@ standardContext.parameter.duplicate = Du standardContext.parameter.required = Es necesario poner nombre de par\u00E1metro y valor de par\u00E1metro standardContext.reloadingCompleted = Se ha completado la Regarga de este Contexto standardContext.reloadingFailed = Fall\u00F3 la recarga de este Contexto debido a errores previos -standardContext.reloadingStarted = Ha comenzado la recarga de este Contexto +standardContext.reloadingStarted = Ha comenzado la recarga de Contexto {0} standardContext.resourcesStart = Error arrancando Recursos est\u00E1ticos standardContext.securityConstraint.pattern = {0} inv\u00E1lida en restricci\u00F3n de seguridad standardContext.servletMap.name = El mapeo de Servlet especifica un nombre de servlet desconocido {0} @@ -110,7 +110,7 @@ standardContext.startFailed = Fall\u00F3 standardContext.startingLoader = Excepci\u00F3n arrancando Cargador standardContext.startingManager = Excepci\u00F3n arrancando Gestor standardContext.startingWrapper = Excepci\u00F3n arrancando Arropador (Wrapper) para servlet {0} -standardContext.stoppingContext = Excepci\u00F3n parando Context +standardContext.stoppingContext = Excepci\u00F3n parando Context {0} standardContext.stoppingLoader = Excepci\u00F3n parando Cargador standardContext.stoppingManager = Excepci\u00F3n parando Gestor standardContext.stoppingWrapper = Excepci\u00F3n parando Arropador (Wrapper) para servlet {0} Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1050150&r1=1050149&r2=1050150&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Thu Dec 16 20:40:36 2010 @@ -78,7 +78,7 @@ standardContext.parameter.duplicate=Para standardContext.parameter.required=Le nom de param\u00e8tre ainsi que la valeur du param\u00e8tre sont requis standardContext.reloadingCompleted=Le rechargement de ce contexte est termin\u00e9 standardContext.reloadingFailed=Le rechargement de ce contexte a \u00e9chou\u00e9 suite \u00e0 une erreur pr\u00e9c\u00e9dente -standardContext.reloadingStarted=Le rechargement de ce contexte a d\u00e9marr\u00e9 +standardContext.reloadingStarted=Le rechargement du contexte {0} a d\u00e9marr\u00e9 standardContext.requestListener.requestInit=Une exception lors de l''envoi de requ\u00eate a initi\u00e9 un \u00e9v\u00e8nement cycle de vie (lifecycle event) pour l''instance de classe \u00e0 l''\u00e9coute (listener) {0} standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requ\u00eate a d\u00e9tr
Adding annotations to JspC
All, I'm looking at writing a patch for bug 50234 ("JspC use servlet 3.0 features": https://issues.apache.org/bugzilla/show_bug.cgi?id=50234) and I'm thinking that the annotations should actually have nothing to do with the precompiler, but the compiler itself. Can anyone think of a reason not to simply update jasper.compiler.Generator to add the @WebServlet annotations? I believe everything else needs to be handled by JspC. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1050160 - in /tomcat: tc6.0.x/trunk/STATUS.txt trunk/webapps/docs/changelog.xml
Author: slaurent Date: Thu Dec 16 21:07:55 2010 New Revision: 1050160 URL: http://svn.apache.org/viewvc?rev=1050160&view=rev Log: bug 48822: Include contest name in reload and stop log statements https://issues.apache.org/bugzilla/show_bug.cgi?id=48822 changelog + proposed for tomcat 6 Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1050160&r1=1050159&r2=1050160&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 16 21:07:55 2010 @@ -317,5 +317,11 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460 Avoid leak caused by using a cached exception instance http://svn.apache.org/viewvc?rev=1044987&view=rev - +1: kkolinko + +1: kkolinko, slaurent -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48822 + Include context name in reload and stop log statements. + http://people.apache.org/~slaurent/patches/2010-12-16_BZ48822_context_name_on_reload-tc6.patch + +1: slaurent + -1: \ No newline at end of file Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050160&r1=1050159&r2=1050160&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 16 21:07:55 2010 @@ -61,6 +61,11 @@ 48692: Provide option to parse application/x-www-form-urlencoded PUT requests. (schultz) + +48822: Include context name in case of error while stopping +or starting a context during its reload. Patch provided by Marc +Guillemot. (slaurent) + 48837: Extend thread local memory leak detection to include classes loaded by subordinate class loaders to the web - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 12428] request.getUserPrincipal(): Misinterpretation of specification?
https://issues.apache.org/bugzilla/show_bug.cgi?id=12428 --- Comment #25 from Mark Thomas 2010-12-16 16:09:04 EST --- This is a grey area of the specification. My reading of the various specs remains that Tomcat is spec compliant. I have added this to my list of things to ask the Servlet EG to clarify in 3.next I believe that a web application's fundamental behaviour should not change just by changing the authentication mechanism. That DIGEST can't work with pre-emptive authentication is a significant concern. The scope of the feature is also important. This is do-able as previously described with container managed authentication. Once the application starts to get involved, things get more complex. However there is a way to do this in Servlet 3.0. The application can call request.authenticate() but it needs to make sure it checks the return code and stops any 401 going back to the client. The application will also need to handle any IllegalStateExcpetions if the response has already been committed. The RFC2617 issue was mainly that a failed authentication SHOULD result in a 401 response and this feature requires that there is no 401 else the application could end up prevent a user from accessing a page for which no authentication is required. The SHOULD does give some leeway (it isn't a MUST) but I'm not convinced there is a good enough reason to ignore the spec here. -- 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
svn commit: r1050161 - in /tomcat/trunk: java/org/apache/coyote/AbstractProtocolHandler.java java/org/apache/tomcat/util/threads/CounterLatch.java test/org/apache/tomcat/util/threads/ test/org/apache/
Author: fhanik Date: Thu Dec 16 21:09:49 2010 New Revision: 1050161 URL: http://svn.apache.org/viewvc?rev=1050161&view=rev Log: Starting to work on maxConnections attribute for BIO/NIO connectors to allow administrators to throttle how accepting connections is handled. Implement a CounterLatch to keep track of the connection count while also allowing the acceptor thread block while the max has been reached Added: tomcat/trunk/java/org/apache/tomcat/util/threads/CounterLatch.java (with props) tomcat/trunk/test/org/apache/tomcat/util/threads/ tomcat/trunk/test/org/apache/tomcat/util/threads/TestCounterLatch.java (with props) Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1050161&r1=1050160&r2=1050161&view=diff == --- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Thu Dec 16 21:09:49 2010 @@ -122,6 +122,11 @@ public abstract class AbstractProtocolHa public void setMaxThreads(int maxThreads) { endpoint.setMaxThreads(maxThreads); } + +public int getMaxConnections() { return endpoint.getMaxConnections(); } +public void setMaxConnections(int maxConnections) { +endpoint.setMaxConnections(maxConnections); +} public int getMinSpareThreads() { return endpoint.getMinSpareThreads(); } Added: tomcat/trunk/java/org/apache/tomcat/util/threads/CounterLatch.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/CounterLatch.java?rev=1050161&view=auto == --- tomcat/trunk/java/org/apache/tomcat/util/threads/CounterLatch.java (added) +++ tomcat/trunk/java/org/apache/tomcat/util/threads/CounterLatch.java Thu Dec 16 21:09:49 2010 @@ -0,0 +1,172 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tomcat.util.threads; + +import java.util.Collection; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.AbstractQueuedSynchronizer; +/** + * Simple counter latch that allows code to keep an up and down counter, and waits while the latch holds a certain wait value. + * and threads using the latch to wait if the count has reached a certain value. + * The counter latch can be used to keep track of an atomic counter, since the operations {...@link #countDown()} + * and {...@link #countUp()} are atomic. + * When the latch reaches the wait value, threads will block. The counter latch can hence act like a + * count down latch or a count up latch, while letting you keep track of the counter as well. + * This counter latch works opposite as the java.util.concurrent.CountDownLatch, since the CounterLatch only blocks on a single value and releases the threads on all other values. + * @author fhanik + * @see http://download.oracle.com/javase/6/docs/api/java/util/concurrent/CountDownLatch.html";>CountDownLatch + * + */ +public class CounterLatch { + +private class Sync extends AbstractQueuedSynchronizer { +public Sync() { +} + +protected int tryAcquireShared(int arg) { +return ((!released) && count.get() == signal) ? -1 : 1; +} + +protected boolean tryReleaseShared(int arg) { +return true; +} +} + +private final Sync sync; +private final AtomicLong count; +private long signal; +private volatile boolean released = false; + +/** + * Instantiates a CounterLatch object with an initial value and a wait value. + * @param initial - initial value of the counter + * @param waitValue - when the counter holds this value, + * threads calling {...@link #await()} or {...@link #await(long, TimeUnit)} + * will wait until the counter changes value or until they are interrupted. + */ +public CounterLatch(l
DO NOT REPLY [Bug 48822] Include contest name in reload and stop log statements
https://issues.apache.org/bugzilla/show_bug.cgi?id=48822 --- Comment #1 from Sylvain Laurent 2010-12-16 16:18:55 EST --- fixed on trunk, will be available for tomcat 7.0.6. Proposed for tc 6. Note that depending on the type of error during reload, the context name was already logged (by other log statements). This issue only deals with cases where a LifeCycleException is raised. -- 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
Missing lib/tomcat-dbcp.jar when calling "package" target in Tomcat 7
All, I'm having trouble getting "package" to build lib/tomcat-dbcp.jar for me: $ ant clean $ ant package $ find -name "*.jar" ./downloads/commons-daemon-1.0.4/commons-daemon-1.0.4-javadoc.jar ./downloads/commons-daemon-1.0.4/commons-daemon-1.0.4-sources.jar ./downloads/commons-daemon-1.0.4/commons-daemon-1.0.4.jar ./downloads/ecj-3.6/ecj-3.6.jar ./downloads/tomcat7-deps/dbcp/tomcat-dbcp-src.jar ./downloads/tomcat7-deps/dbcp/tomcat-dbcp.jar ./output/build/bin/bootstrap.jar ./output/build/bin/tomcat-juli.jar ./output/build/lib/annotations-api.jar ./output/build/lib/catalina-ant.jar ./output/build/lib/catalina-ha.jar ./output/build/lib/catalina-tribes.jar ./output/build/lib/catalina.jar ./output/build/lib/el-api.jar ./output/build/lib/jasper-el.jar ./output/build/lib/jasper.jar ./output/build/lib/jsp-api.jar ./output/build/lib/servlet-api.jar ./output/build/lib/tomcat-api.jar ./output/build/lib/tomcat-coyote.jar ./output/build/lib/tomcat-i18n-es.jar ./output/build/lib/tomcat-i18n-fr.jar ./output/build/lib/tomcat-i18n-ja.jar ./output/build/lib/tomcat-util.jar ./test/webapp-3.0-fragments/WEB-INF/lib/resources.jar ./test/webapp-3.0-fragments/WEB-INF/lib/resources2.jar ./webapps/examples/WEB-INF/lib/jstl.jar ./webapps/examples/WEB-INF/lib/standard.jar The dbcp package is fetched, "build-tomcat-dbcp" is being invoked and it builds downloads/tomcat7-deps/dbcp/tomcat-dbcp.jar, but it doesn't appear to make it into the binary package. Am I missing something? Thanks, -chris signature.asc Description: OpenPGP digital signature
DO NOT REPLY [Bug 50467] Occasional NIO connector lockups on high load
https://issues.apache.org/bugzilla/show_bug.cgi?id=50467 --- Comment #3 from Steven Hugg 2010-12-16 17:06:55 EST --- I haven't reproduced it, but I would imagine that inserting a Thread.sleep() after the call to key.attach(null) in cancelledKey() might do it. For now I have just put a null check in the above loop like so: if (attachment != null) { attachment.access(); iterator.remove(); processKey(sk, attachment); } else { log.warn("NioEndpoint: Attachment was null"); iterator.remove(); } Not sure if that is correct, but better than the alternative ;) -- 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: Missing lib/tomcat-dbcp.jar when calling "package" target in Tomcat 7
On 16/12/2010 21:32, Christopher Schultz wrote: > Am I missing something? Yes. No. Maybe. Not sure. "ant package" packages up the JARs built from the Tomcat source tree. tomcat-dbcp is not part of the Tomcat source tree. The Eclipse compiler isn't there either. That sounds almost plausible given I just made it up. That said, as best I can recall / tell from looking at build.xml that is why it is like that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50491] New: Text for link to Changelog is wrong.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50491 Summary: Text for link to Changelog is wrong. Product: Tomcat 7 Version: 7.0.5 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: i.ga...@brainsware.org Diff for xdocs is attached. -- 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 50491] Text for link to Changelog is wrong.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50491 --- Comment #1 from Mark Thomas 2010-12-16 18:17:39 EST --- There is no attachment. -- 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
svn commit: r1050229 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: markt Date: Thu Dec 16 23:35:17 2010 New Revision: 1050229 URL: http://svn.apache.org/viewvc?rev=1050229&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=13731 Make variables in _jspService() method final where possible. Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1050229&r1=1050228&r2=1050229&view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Thu Dec 16 23:35:17 2010 @@ -614,23 +614,20 @@ class Generator { // Class variable declarations genPreambleClassVariableDeclarations(); -// Constructor -// generateConstructor(className); - // Methods here genPreambleMethods(); // Now the service method out.printin("public void "); out.print(serviceMethodName); -out.println("(HttpServletRequest request, HttpServletResponse response)"); +out.println("(final HttpServletRequest request, final HttpServletResponse response)"); out.println("throws java.io.IOException, ServletException {"); out.pushIndent(); out.println(); // Local variable declarations -out.printil("PageContext pageContext = null;"); +out.printil("final PageContext pageContext;"); if (pageInfo.isSession()) out.printil("HttpSession session = null;"); @@ -644,10 +641,10 @@ class Generator { out.printil("}"); } -out.printil("ServletContext application = null;"); -out.printil("ServletConfig config = null;"); +out.printil("final ServletContext application;"); +out.printil("final ServletConfig config;"); out.printil("JspWriter out = null;"); -out.printil("Object page = this;"); +out.printil("final Object page = this;"); out.printil("JspWriter _jspx_out = null;"); out.printil("PageContext _jspx_page_context = null;"); @@ -667,8 +664,7 @@ class Generator { out.printil("response.addHeader(\"X-Powered-By\", \"JSP/2.1\");"); } -out -.printil("pageContext = _jspxFactory.getPageContext(this, request, response,"); +out.printil("pageContext = _jspxFactory.getPageContext(this, request, response,"); out.printin("\t\t\t"); out.print(quote(pageInfo.getErrorPage())); out.print(", " + pageInfo.isSession()); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050229&r1=1050228&r2=1050229&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 16 23:35:17 2010 @@ -179,6 +179,10 @@ + +13731: Make variables in _jspService() method +final where possible. (markt) + 50408: Fix NoSuchMethodException when using scoped variables with EL method invocation. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 13731] Final request, response, session and other variables.
https://issues.apache.org/bugzilla/show_bug.cgi?id=13731 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-12-16 18:36:20 EST --- The patch provided does not appear to be against Tomcat 4.1.12 or any Tomcat version from 4.1.0 to 7.0.x. I have reviewed the 7.0.x code and made variables final where I think it is safe to do so. session isn't final but you can always get that from request which is. The fix will be in 7.0.6 onwards. -- 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
svn commit: r1050249 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml
Author: markt Date: Fri Dec 17 00:17:18 2010 New Revision: 1050249 URL: http://svn.apache.org/viewvc?rev=1050249&view=rev Log: Fix massive memory leak in NIO connector. Http11NioProcessor objects were not being recycled. Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1050249&r1=1050248&r2=1050249&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Dec 17 00:17:18 2010 @@ -244,6 +244,10 @@ public class Http11NioProtocol extends A log.debug("Done iterating through our connections to release a socket channel:"+socket +" released:"+released); } +/** + * Use this only if the processor is not available, otherwise use + * {...@link #release(NioChannel, Http11NioProcessor). + */ @Override public void release(NioChannel socket) { Http11NioProcessor result = connections.remove(socket); @@ -253,6 +257,14 @@ public class Http11NioProtocol extends A } } + +public void release(NioChannel socket, Http11NioProcessor processor) { +connections.remove(socket); +processor.recycle(); +recycledProcessors.offer(processor); +} + + @Override public SocketState event(NioChannel socket, SocketStatus status) { Http11NioProcessor processor = connections.get(socket); @@ -294,7 +306,7 @@ public class Http11NioProtocol extends A state = processor.asyncPostProcess(); } if (state == SocketState.OPEN || state == SocketState.CLOSED) { -release(socket); +release(socket, processor); if (state == SocketState.OPEN) { socket.getPoller().add(socket); } @@ -362,11 +374,11 @@ public class Http11NioProtocol extends A } else if (state == SocketState.OPEN){ // In keep-alive but between requests. OK to recycle // processor. Continue to poll for the next request. -release(socket); +release(socket, processor); socket.getPoller().add(socket); } else { // Connection closed. OK to recycle the processor. -release(socket); +release(socket, processor); } return state; Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050249&r1=1050248&r2=1050249&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Dec 17 00:17:18 2010 @@ -175,6 +175,10 @@ Connector.stop(). This fix also includes further Lifecycle refactoring for Connectors and associated components. (markt) + +Remove a huge memory leak in the NIO connector introduced by the fix +for 49884. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org