DO NOT REPLY [Bug 50876] New: email validation is not in right format
https://issues.apache.org/bugzilla/show_bug.cgi?id=50876 Summary: email validation is not in right format Product: Tomcat 6 Version: unspecified Platform: PC URL: http://login .caballocation.home Status: NEW Severity: trivial Priority: P5 Component: Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: jyothiq...@gmail.com Steps to reproduce Step : Go to registration form Step : Checking for email validation Step : without email format it accepting the values like eg. Jyothi.com Actual format: it should accepts only as email format like @ with domain name eg. jyo...@gmail.com -- 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: Where do we stand with maven publishing?
On 04/03/2011 23:46, Filip Hanik - Dev Lists wrote: > Not in here > http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/catalina/ > what am I missing? Couple of things. The artifact IDs were changed for Tomcat 7 so you need to look here: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/tomcat-catalina/ I've looked back in svn and I know I changed the artifact ID but I can't remember exactly why. It may have been related to some reorganisation of the JARs that meant that they didn't have quite the same contents and dependencies. Despite the ASF repo being called ibiblio-rsync: http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tomcat/ I think we replicate directly from the ASF to Maven central: http://repo2.maven.org/maven2/org/apache/tomcat/ given that Maven central has everything and ibiblio seems to be missing the more recent releases. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078282 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_10: ./ build.properties.default modules/
Author: markt Date: Sat Mar 5 12:57:09 2011 New Revision: 1078282 URL: http://svn.apache.org/viewvc?rev=1078282&view=rev Log: Tag 7.0.10 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/ (props changed) - copied from r1078281, tomcat/trunk/ Removed: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/modules/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/ -- --- svn:ignore (added) +++ svn:ignore Sat Mar 5 12:57:09 2011 @@ -0,0 +1,5 @@ +.* +output +build.properties +work +logs Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915 Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_10/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_10/build.properties.default?rev=1078282&r1=1078281&r2=1078282&view=diff == --- tomcat/tc7.0.x/tags/TOMCAT_7_0_10/build.properties.default (original) +++ tomcat/tc7.0.x/tags/TOMCAT_7_0_10/build.properties.default Sat Mar 5 12:57:09 2011 @@ -29,7 +29,7 @@ version.major=7 version.minor=0 version.build=10 version.patch=0 -version.suffix=-dev +version.suffix= # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.10
The proposed Apache Tomcat 7.0.10 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.10/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_10/ The proposed 7.0.10 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.10 Alpha [ ] Beta - go ahead and release as 7.0.10 Beta [ ] Stable - go ahead and release as 7.0.10 Stable Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50877] New: Jasper fails to parse the marged web.xml if it contains non-ASCII character and the platform encoding is not UTF-8
https://issues.apache.org/bugzilla/show_bug.cgi?id=50877 Summary: Jasper fails to parse the marged web.xml if it contains non-ASCII character and the platform encoding is not UTF-8 Product: Tomcat 7 Version: 7.0.8 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: kenichi-apa...@sysart.jp The following exception is thrown on Japanese Windows org.apache.jasper.JasperException: org.apache.jasper.JasperException: ファイルorg.apache.tomcat.util.scan.MergedWebXmlのXML解析エラー at org.apache.jasper.compiler.JspConfig.processWebDotXml(JspConfig.java:218) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.JspConfig.init(JspConfig.java:231) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.JspConfig.findJspProperty(JspConfig.java:290) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:113) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.Compiler.compile(Compiler.java:365) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.Compiler.compile(Compiler.java:345) ~[jasper.jar:7.0.8] at org.apache.jasper.compiler.Compiler.compile(Compiler.java:332) ~[jasper.jar:7.0.8] at org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:594) ~[jasper.jar:7.0.8] at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:342) ~[jasper.jar:7.0.8] at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:391) ~[jasper.jar:7.0.8] at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:334) ~[jasper.jar:7.0.8] at javax.servlet.http.HttpServlet.service(HttpServlet.java:722) ~[servlet-api.jar:na] at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:306) [catalina.jar:7.0.8] at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) [catalina.jar:7.0.8] at jp.co.jri.joe.lip.servlet.RequestCharacterEncodingFilter.doFilter(RequestCharacterEncodingFilter.java:64) ~[RequestCharacterEncodingFilter.class:na] at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:244) [catalina.jar:7.0.8] at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) [catalina.jar:7.0.8] at com.google.inject.persist.PersistFilter.doFilter(PersistFilter.java:89) ~[guice-persist-3.0-rc2.jar:na] at jp.co.jri.joe.lip.servlet.GuicePersistFilter.doFilter(GuicePersistFilter.java:33) ~[GuicePersistFilter.class:na] at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:244) [catalina.jar:7.0.8] at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) [catalina.jar:7.0.8] at jp.co.jri.joe.lip.servlet.ExceptionLogFilter.doFilter(ExceptionLogFilter.java:43) ~[ExceptionLogFilter.class:na] at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:244) [catalina.jar:7.0.8] at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) [catalina.jar:7.0.8] at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:240) [catalina.jar:7.0.8] at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:161) [catalina.jar:7.0.8] at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:589) [catalina.jar:7.0.8] at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:164) [catalina.jar:7.0.8] at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:100) [catalina.jar:7.0.8] at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:541) [catalina.jar:7.0.8] at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118) [catalina.jar:7.0.8] at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:383) [catalina.jar:7.0.8] at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:243) [tomcat-coyote.jar:7.0.8] at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:188) [tomcat-coyote.jar:7.0.8] at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:166) [tomcat-coyote.jar:7.0.8] at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:288) [tomcat-coyote.jar:7.0.8] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) [na:1.6.0_24] at java.util.concurrent.ThreadPoolExecutor
DO NOT REPLY [Bug 50877] Jasper fails to parse the marged web.xml if it contains non-ASCII character and the platform encoding is not UTF-8
https://issues.apache.org/bugzilla/show_bug.cgi?id=50877 --- Comment #1 from Kenichi Masuko 2011-03-05 11:27:57 EST --- Created an attachment (id=26731) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26731) patch to tomcat-7.0.8 source Parse the merged web.xml content using UTF-8 encoding. (It is always UTF-8 since the encoding is hardcoded in org.apache.catalina.deploy.WebXml.toXml.) -- 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: Where do we stand with maven publishing?
And what about jdbc pool on Maven Central ? 2011/3/4 Filip Hanik - Dev Lists : > Where do we stand with publishing Tomcat jars/artifacts to a Maven > repository. > I see that the mvn-pub.xml has been updated, but I don't see where the > source JARs are generated from. > > > > best > Filip > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
atomicity violation in the JspServletWrapper class ?
Dear all:
Can you help me analyze the following simplified synchronization
code in tomcat (the servlet function of JspServletWrapper class), I
think it involves an atomicity violation, the detailed explanation is as
follows:
service(Request request, Response response...)
{
if (development_mode) {// the jsp file
// may be updated on the fly
synchronized (this) {...
ctxt.compile(); ...
}
}
synchronized(this) { getServlet();}
if (mt_mode) { // sync to guarantee the
//freshness right before servicing
synchronized (this) {
theServlet.service(request, response);
}
}
}
The service function of JspServletWrapper class processes the incoming
request from a JSP file. In particular, it creates a class
(servletClass) to represent the JSP file, and instantiates an instance
(theServlet) of the class, and then uses the instance to serve the
request.
The class (servletClass) is created at runtime for a JSP file, and
should be updated on the fly once the JSP file changes at runtime. In
the code The (compile) invocation checks the freshness of
servletClass, updates and stores it if necessary. The (getServlet)
invocation retrieves the stored servletClass class and uses it to
create an instance theServlet. The (service) invocation uses the
(theServlet) instance to serve the request. The expected semantic is
that the (service) invocation should use the instance of the most
up-to-date (servletClass). However, the semantic is not preserved by
the original atomic regions due to atomicity violations: the retrieved
(servletClass) by the (getServlet) invocation may be stale as the
(servletClass) may be updated by the other thread since last (compile)
invocation. Even if there is no buggy interleaving between the first
two invocations, there may be an interleaving write to (theServlet)
between the second and third invocation, which makes (theServlet) used
by the third invocation stale. Note that, however, the implementation
of (getServlet) method protects servletClass and theServlet in an atomic
region to avoid the interleaving update of (servletClass} before
instantiating (theServlet).
Thank you sincerely for your help.
Regards
Peng
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50877] Jasper fails to parse the marged web.xml if it contains non-ASCII character and the platform encoding is not UTF-8
https://issues.apache.org/bugzilla/show_bug.cgi?id=50877 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #2 from Mark Thomas 2011-03-06 01:18:52 EST --- *** This bug has been marked as a duplicate of bug 50720 *** -- 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 50720] When using jsp mapped as servlet in web.xml, cyrillic characters are not allowed in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=50720 Mark Thomas changed: What|Removed |Added CC||kenichi-apa...@sysart.jp --- Comment #4 from Mark Thomas 2011-03-06 01:18:53 EST --- *** Bug 50877 has been marked as a duplicate of this bug. *** -- 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: r1078403 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Sun Mar 6 06:26:46 2011 New Revision: 1078403 URL: http://svn.apache.org/viewvc?rev=1078403&view=rev Log: Add missing entry. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1078403&r1=1078402&r2=1078403&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 6 06:26:46 2011 @@ -61,6 +61,9 @@ Improve shut down speed by not renewing threads during shut down when the ThreadLocalLeakPreventionListener is enabled. (markt) + +Don't ignore @ServletSecurity annotations. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078404 - /tomcat/trunk/build.properties.default
Author: markt Date: Sun Mar 6 06:27:30 2011 New Revision: 1078404 URL: http://svn.apache.org/viewvc?rev=1078404&view=rev Log: Prep for next release Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1078404&r1=1078403&r2=1078404&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun Mar 6 06:27:30 2011 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=10 +version.build=11 version.patch=0 version.suffix=-dev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: atomicity violation in the JspServletWrapper class ?
On 05/03/2011 19:30, lpxz wrote: It would of helped if you had mentioned which Tomcat version you were looking at. I'm assuming trunk. > The expected semantic is > that the (service) invocation should use the instance of the most > up-to-date (servletClass). Where is that stated? My expectation is that at least the most recent servletClass at the point the service() method is called is used. If the source JSP is changed while the service() method is executing and the newer version is used, great. If not, it is not an issue. > However, the semantic is not preserved by > the original atomic regions due to atomicity violations: the retrieved > (servletClass) by the (getServlet) invocation may be stale as the > (servletClass) may be updated by the other thread since last (compile) > invocation. This is handled by the reload attribute. If thread 1 calls getServlet() before thread 2 sets reload=true that is fine. > Even if there is no buggy interleaving between the first > two invocations, there may be an interleaving write to (theServlet) > between the second and third invocation, which makes (theServlet) used > by the third invocation stale. If I have understood you correctly, then I think you have a point here. It would be better to store the return value of getServlet() and use that throughout the rest of the service() method rather than using theServlet. I'll get that fixed shortly. It will be in 7.0.11 onwards and I'll propose it for back-port to 6.0.x and 5.5.x as well (assuming they have the same issue). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078409 - in /tomcat/trunk: java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 6 07:17:07 2011
New Revision: 1078409
URL: http://svn.apache.org/viewvc?rev=1078409&view=rev
Log:
Fix threading issue reported on dev list
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1078409&r1=1078408&r2=1078409&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Sun Mar
6 07:17:07 2011
@@ -312,6 +312,8 @@ public class JspServletWrapper {
boolean precompile)
throws ServletException, IOException, FileNotFoundException {
+Servlet servlet;
+
try {
if (ctxt.isRemoved()) {
@@ -351,7 +353,7 @@ public class JspServletWrapper {
/*
* (2) (Re)load servlet class file
*/
-getServlet();
+servlet = getServlet();
// If a page is to be precompiled only, return.
if (precompile) {
@@ -407,14 +409,14 @@ public class JspServletWrapper {
/*
* (4) Service request
*/
-if (theServlet instanceof SingleThreadModel) {
+if (servlet instanceof SingleThreadModel) {
// sync on the wrapper so that the freshness
// of the page is determined right before servicing
synchronized (this) {
- theServlet.service(request, response);
+ servlet.service(request, response);
}
} else {
-theServlet.service(request, response);
+servlet.service(request, response);
}
} catch (UnavailableException ex) {
String includeRequestUri = (String)
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1078409&r1=1078408&r2=1078409&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 6 07:17:07 2011
@@ -42,6 +42,16 @@
General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Tribes,
Other
-->
+
+
+
+
+Correct possible threading issue in JSP compilation when development
+mode is used. (markt)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078410 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Mar 6 07:19:19 2011 New Revision: 1078410 URL: http://svn.apache.org/viewvc?rev=1078410&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1078410&r1=1078409&r2=1078410&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 6 07:19:19 2011 @@ -139,3 +139,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1076212&view=rev +1: markt -1: + +* Fix possible threading issue in JSP compilation when development mode is + enabled + http://svn.apache.org/viewvc?rev=1078409&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078411 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Sun Mar 6 07:21:29 2011 New Revision: 1078411 URL: http://svn.apache.org/viewvc?rev=1078411&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1078411&r1=1078410&r2=1078411&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Mar 6 07:21:29 2011 @@ -66,3 +66,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1076212&view=rev +1: markt -1: + +* Fix possible threading issue in JSP compilation when development mode is + enabled + http://svn.apache.org/viewvc?rev=1078409&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50876] email validation is not in right format
https://issues.apache.org/bugzilla/show_bug.cgi?id=50876 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID OS/Version||All --- Comment #1 from Mark Thomas 2011-03-06 02:24:08 EST --- The Tomcat project just provides the application server used to host that site. It is not responsible for providing the software for the site content. -- 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: r1078412 - in /tomcat/trunk: java/org/apache/catalina/authenticator/AuthenticatorBase.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 6 07:33:58 2011
New Revision: 1078412
URL: http://svn.apache.org/viewvc?rev=1078412&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50855
Fix NPE on HttpServletRequest.logout() when debug logging is enabled.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1078412&r1=1078411&r2=1078412&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Sun Mar 6 07:33:58 2011
@@ -686,9 +686,11 @@ public abstract class AuthenticatorBase
Principal principal, String authType,
String username, String password) {
-if (log.isDebugEnabled())
-log.debug("Authenticated '" + principal.getName() + "' with type '"
-+ authType + "'");
+if (log.isDebugEnabled()) {
+String name = (principal == null) ? "none" : principal.getName();
+log.debug("Authenticated '" + name + "' with type '" + authType +
+"'");
+}
// Cache the authentication information in our request
request.setAuthType(authType);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1078412&r1=1078411&r2=1078412&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 6 07:33:58 2011
@@ -43,6 +43,14 @@
Other
-->
+
+
+
+50855: Fix NPE on HttpServletRequest.logout() when debug
+logging is enabled. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078413 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Mar 6 07:37:04 2011 New Revision: 1078413 URL: http://svn.apache.org/viewvc?rev=1078413&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1078413&r1=1078412&r2=1078413&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 6 07:37:04 2011 @@ -145,3 +145,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1078409&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50855 + Fix NPE on HttpServletRequest.logout() when debug logging is enabled. + http://svn.apache.org/viewvc?rev=1078412&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50855] NullPointerException thrown in AuthenticatorBase.register method for null principal
https://issues.apache.org/bugzilla/show_bug.cgi?id=50855 Mark Thomas changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.6 |6.0.32 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #1 from Mark Thomas 2011-03-06 02:39:41 EST --- Looks like this never got applied to 6.0.x (or 7.0.x) I have fixed 7.0.x (will be in 7.0.11 onwards) and proposed the fix for 6.0.x -- 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: r1078414 - /tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Author: markt
Date: Sun Mar 6 07:47:17 2011
New Revision: 1078414
URL: http://svn.apache.org/viewvc?rev=1078414&view=rev
Log:
Update comments/test case name
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1078414&r1=1078413&r2=1078414&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Sun Mar 6
07:47:17 2011
@@ -27,16 +27,13 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl;
/**
- * Requires test.keystore (checked in), generated with:
- * keytool -genkey -alias tomcat -keyalg RSA
- * pass: changeit
- * CN: localhost ( for hostname validation )
+ * The keys and certificates used in this file are all available in svn and
were
+ * generated using a test CA the files for which are in the Tomcat PMC private
+ * repository since not all of them are AL2 licensed.
*/
public class TestCustomSsl extends TomcatBaseTest {
-public void testSimpleSsl() throws Exception {
-// Install the all-trusting trust manager so https:// works
-// with unsigned certs.
+public void testCustomSslImplementation() throws Exception {
try {
SSLContext sc = SSLContext.getInstance("SSL");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1078416 - in /tomcat/trunk/test/org/apache/tomcat/util/net: TestClientCert.java TesterSupport.java
Author: markt
Date: Sun Mar 6 07:58:26 2011
New Revision: 1078416
URL: http://svn.apache.org/viewvc?rev=1078416&view=rev
Log:
Refactoring for re-use
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java?rev=1078416&r1=1078415&r2=1078416&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java Sun Mar 6
07:58:26 2011
@@ -16,21 +16,8 @@
*/
package org.apache.tomcat.util.net;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.authenticator.SSLAuthenticator;
-import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.deploy.SecurityCollection;
-import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -41,7 +28,6 @@ import org.apache.tomcat.util.buf.ByteCh
* repository since not all of them are AL2 licensed.
*/
public class TestClientCert extends TomcatBaseTest {
-public static final byte DATA = (byte)33;
public void testClientCertGet() throws Exception {
if (!TesterSupport.isRenegotiationSupported(getTomcatInstance())) {
@@ -83,7 +69,7 @@ public class TestClientCert extends Tomc
}
byte[] body = new byte[bodySize];
-Arrays.fill(body, DATA);
+Arrays.fill(body, TesterSupport.DATA);
// Unprotected resource
ByteChunk res = postUrl(body,
@@ -112,79 +98,11 @@ public class TestClientCert extends Tomc
Tomcat tomcat = getTomcatInstance();
-TesterSupport.initSsl(tomcat);
-
-// Need a web application with a protected and unprotected URL
-// Must have a real docBase - just use temp
-Context ctx =
-tomcat.addContext("", System.getProperty("java.io.tmpdir"));
-
-Tomcat.addServlet(ctx, "simple", new SimpleServlet());
-ctx.addServletMapping("/unprotected", "simple");
-ctx.addServletMapping("/protected", "simple");
-
-// Security constraints
-SecurityCollection collection = new SecurityCollection();
-collection.addPattern("/protected");
-SecurityConstraint sc = new SecurityConstraint();
-sc.addAuthRole("testrole");
-sc.addCollection(collection);
-ctx.addConstraint(sc);
-
-// Configure the Realm
-MapRealm realm = new MapRealm();
-realm.addUser("CN=user1, C=US", "not used");
-realm.addUserRole("CN=user1, C=US", "testrole");
-ctx.setRealm(realm);
-
-// Configure the authenticator
-LoginConfig lc = new LoginConfig();
-lc.setAuthMethod("CLIENT-CERT");
-ctx.setLoginConfig(lc);
-ctx.getPipeline().addValve(new SSLAuthenticator());
+TesterSupport.configureClientCertContext(tomcat);
// Start Tomcat
tomcat.start();
TesterSupport.configureClientSsl();
}
-
-public static class SimpleServlet extends HttpServlet {
-
-private static final long serialVersionUID = 1L;
-
-@Override
-protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-throws ServletException, IOException {
-resp.setContentType("text/plain");
-resp.getWriter().print("OK");
-}
-
-@Override
-protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-throws ServletException, IOException {
-// Swallow any request body
-int read = 0;
-int len = 0;
-byte[] buffer = new byte[4096];
-InputStream is = req.getInputStream();
-boolean contentOK = true;
-while (len > -1) {
-len = is.read(buffer);
-read = read + len;
-for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1078416&r1=1078415&r2=1078416&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Sun Mar 6
07:58:
