svn commit: r1481233 - /tomcat/trunk/java/org/apache/catalina/startup/Constants.java

2013-05-10 Thread kkolinko
Author: kkolinko Date: Fri May 10 23:33:50 2013 New Revision: 1481233 URL: http://svn.apache.org/r1481233 Log: Review of r1481005 1) correct typo in the path to javaee schema file. It is "javaee_7.xsd", not "javaee_6.xsd" one. 2) make line indents consistent with adjacent lines Modified: tom

svn commit: r1481201 - in /tomcat/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java LocalStrings.properties

2013-05-10 Thread markt
Author: markt Date: Fri May 10 21:47:18 2013 New Revision: 1481201 URL: http://svn.apache.org/r1481201 Log: Fix missing message Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Modified: t

svn commit: r1481165 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java InternalNioOutputBuffer.java

2013-05-10 Thread markt
Author: markt Date: Fri May 10 19:53:12 2013 New Revision: 1481165 URL: http://svn.apache.org/r1481165 Log: Only register for write when using non-blocking and there is more data to write. This fixes various crashes in APR due to trying to add the same socket to the poller twice. Modified:

svn commit: r1481164 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

2013-05-10 Thread markt
Author: markt Date: Fri May 10 19:50:46 2013 New Revision: 1481164 URL: http://svn.apache.org/r1481164 Log: Tweak the debug code. Use debug to show method calls and other key events. Use trace to add stack traces. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modif

Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/

2013-05-10 Thread Nick Williams
On May 10, 2013, at 8:35 AM, Mark Thomas wrote: > On 10/05/2013 14:22, Nick Williams wrote: >> >> On May 10, 2013, at 5:07 AM, ma...@apache.org wrote: >> >>> Author: markt >>> Date: Fri May 10 10:07:21 2013 >>> New Revision: 1480974 >>> >>> URL: http://svn.apache.org/r1480974 >>> Log: >>> Add

Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/

2013-05-10 Thread Mark Thomas
On 10/05/2013 14:22, Nick Williams wrote: > > On May 10, 2013, at 5:07 AM, ma...@apache.org wrote: > >> Author: markt >> Date: Fri May 10 10:07:21 2013 >> New Revision: 1480974 >> >> URL: http://svn.apache.org/r1480974 >> Log: >> Add the Java EE 7 XSDs. > > Mark, were these hand-coded or copied

Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/

2013-05-10 Thread Nick Williams
On May 10, 2013, at 5:07 AM, ma...@apache.org wrote: > Author: markt > Date: Fri May 10 10:07:21 2013 > New Revision: 1480974 > > URL: http://svn.apache.org/r1480974 > Log: > Add the Java EE 7 XSDs. Mark, were these hand-coded or copied from some other source? If copied, could you let me know

buildbot success in ASF Buildbot on tomcat-trunk

2013-05-10 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4305 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source

svn commit: r1481005 - in /tomcat/trunk: java/org/apache/catalina/deploy/WebXml.java java/org/apache/catalina/startup/Constants.java java/org/apache/catalina/startup/DigesterFactory.java test/org/apac

2013-05-10 Thread markt
Author: markt Date: Fri May 10 13:11:22 2013 New Revision: 1481005 URL: http://svn.apache.org/r1481005 Log: Add constants for new XSDs Ensure new XSDs are registered as local schema Add 3.1 version check to web.xml parsing with the associated unit test Modified: tomcat/trunk/java/org/apache/c

svn commit: r1481002 - /tomcat/trunk/res/INSTALLLICENSE

2013-05-10 Thread markt
Author: markt Date: Fri May 10 12:58:30 2013 New Revision: 1481002 URL: http://svn.apache.org/r1481002 Log: Another Java EE 7 XSD license update Modified: tomcat/trunk/res/INSTALLLICENSE Modified: tomcat/trunk/res/INSTALLLICENSE URL: http://svn.apache.org/viewvc/tomcat/trunk/res/INSTALLLICE

svn commit: r1481001 - in /tomcat/trunk/res/maven: tomcat-jsp-api.pom tomcat-servlet-api.pom

2013-05-10 Thread markt
Author: markt Date: Fri May 10 12:57:35 2013 New Revision: 1481001 URL: http://svn.apache.org/r1481001 Log: More license updates for new XSDs Modified: tomcat/trunk/res/maven/tomcat-jsp-api.pom tomcat/trunk/res/maven/tomcat-servlet-api.pom Modified: tomcat/trunk/res/maven/tomcat-jsp-api.

svn commit: r1480987 - /tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java

2013-05-10 Thread markt
Author: markt Date: Fri May 10 12:05:45 2013 New Revision: 1480987 URL: http://svn.apache.org/r1480987 Log: Fix broken test after re-org Add test for servlet 3.1 Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Modified: tomcat/trunk/test/org/apache/jasper/compiler/T

svn commit: r1480984 - in /tomcat/trunk: res/META-INF/tomcat-websocket.jar/ test/org/apache/catalina/startup/

2013-05-10 Thread markt
Author: markt Date: Fri May 10 11:39:36 2013 New Revision: 1480984 URL: http://svn.apache.org/r1480984 Log: Fix overly enthusiastic copy/paste. Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml

svn commit: r1480979 - in /tomcat/trunk/test: org/apache/jasper/compiler/ webapp-3.0/ webapp-3.0/WEB-INF/ webapp-3.1/ webapp-3.1/WEB-INF/ webapp/ webapp/WEB-INF/

2013-05-10 Thread markt
Author: markt Date: Fri May 10 10:55:19 2013 New Revision: 1480979 URL: http://svn.apache.org/r1480979 Log: Move the 3.0 specific tests from webapp to wepapp-3.0. Copy the tests to 3.1 (tests and results should be the same). Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld (with prop

svn commit: r1480977 - in /tomcat/trunk/test: webapp-3.0/ webapp-3.0/WEB-INF/ webapp-3.0/WEB-INF/web.xml webapp-3.1/ webapp-3.1/WEB-INF/ webapp-3.1/WEB-INF/web.xml

2013-05-10 Thread markt
Author: markt Date: Fri May 10 10:37:34 2013 New Revision: 1480977 URL: http://svn.apache.org/r1480977 Log: Add the new 3.0 and 3.1 specific test web applications Added: tomcat/trunk/test/webapp-3.0/ tomcat/trunk/test/webapp-3.0/WEB-INF/ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml

svn commit: r1480975 - in /tomcat/trunk: conf/ java/org/apache/catalina/deploy/ res/META-INF/tomcat-websocket.jar/ test/org/apache/catalina/startup/ webapps/ROOT/WEB-INF/ webapps/docs/WEB-INF/ webapps

2013-05-10 Thread markt
Author: markt Date: Fri May 10 10:19:25 2013 New Revision: 1480975 URL: http://svn.apache.org/r1480975 Log: Update deployment descriptors to Servlet 3.1 Modified: tomcat/trunk/conf/web.xml tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java tomcat/trunk/res/META-INF/tomcat-websoc

svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/

2013-05-10 Thread markt
Author: markt Date: Fri May 10 10:07:21 2013 New Revision: 1480974 URL: http://svn.apache.org/r1480974 Log: Add the Java EE 7 XSDs. The changes from the originals are: - addition of a notice electing to license only under CDDL - removal of trailing whitespace - removal / replacement (which spaces)

svn commit: r1480964 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/Constants.java

2013-05-10 Thread markt
Author: markt Date: Fri May 10 09:40:44 2013 New Revision: 1480964 URL: http://svn.apache.org/r1480964 Log: Tomcat 8 implements Servlet 3.1 Modified: tomcat/trunk/java/javax/servlet/ServletContext.java tomcat/trunk/java/org/apache/catalina/core/Constants.java Modified: tomcat/trunk/java/

svn commit: r1480963 - in /tomcat/trunk: java/org/apache/coyote/http11/InternalAprInputBuffer.java java/org/apache/coyote/http11/InternalAprOutputBuffer.java test/org/apache/catalina/nonblocking/TestN

2013-05-10 Thread markt
Author: markt Date: Fri May 10 09:35:53 2013 New Revision: 1480963 URL: http://svn.apache.org/r1480963 Log: Non-blocking Servlet 3.1 reads for APR Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputB

svn commit: r1480940 - /tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java

2013-05-10 Thread markt
Author: markt Date: Fri May 10 08:55:28 2013 New Revision: 1480940 URL: http://svn.apache.org/r1480940 Log: Non-blocking write has been implemented Modified: tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java Modified: tomcat/trunk/test/org/apache/catalina/nonblocking

svn propchange: r1476592 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1476592 Modified property: svn:log Modified: svn:log at Fri May 10 08:43:09 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:43:09 2013 @@ -1 +1,2 @@ +This is the fix for CVE-2012-3544 comm

svn commit: r1480933 - in /tomcat/site/trunk: docs/oldnews-2012.html docs/security-6.html xdocs/security-6.xml

2013-05-10 Thread markt
Author: markt Date: Fri May 10 08:42:18 2013 New Revision: 1480933 URL: http://svn.apache.org/r1480933 Log: Fix copy paste error. Add missing file. Added: tomcat/site/trunk/docs/oldnews-2012.html (with props) Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/s

svn propchange: r1417891 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1417891 Modified property: svn:log Modified: svn:log at Fri May 10 08:41:12 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:41:12 2013 @@ -1,2 +1,3 @@ +This is the fix for CVE-2013-2067 In

svn propchange: r1471372 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1471372 Modified property: svn:log Modified: svn:log at Fri May 10 08:38:32 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:38:32 2013 @@ -1,2 +1,3 @@ +This is the fix for CVE-2013-2071 Pr

svn propchange: r1408044 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1408044 Modified property: svn:log Modified: svn:log at Fri May 10 08:38:26 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:38:26 2013 @@ -1,3 +1,4 @@ +This is the fix for CVE-2013-2067 Me

svn propchange: r1378702 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1378702 Modified property: svn:log Modified: svn:log at Fri May 10 08:38:18 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:38:18 2013 @@ -1 +1,2 @@ +This is part of the fix for CVE-2012-35

svn propchange: r1378921 - svn:log

2013-05-10 Thread markt
Author: markt Revision: 1378921 Modified property: svn:log Modified: svn:log at Fri May 10 08:38:06 2013 -- --- svn:log (original) +++ svn:log Fri May 10 08:38:06 2013 @@ -1,3 +1,4 @@ +This is part of the fix for CVE-2012-

[Bug 54178] [CVE-2013-2071] runtime exception in onComplete of AsyncListener, will make org.apache.catalina.connector.Request not recycled (orginally reported MESSAGE POST to tomcat, but it called doG

2013-05-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=54178 Mark Thomas changed: What|Removed |Added Summary|runtime exception in|[CVE-2013-2071] runtime

[SECURITY] CVE-2012-3544 Chunked transfer encoding extension size is not limited

2013-05-10 Thread Mark Thomas
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 CVE-2012-3544 Chunked transfer encoding extension size is not limited Severity: Important Vendor: The Apache Software Foundation Versions Affected: - - Tomcat 7.0.0 to 7.0.29 - - Tomcat 6.0.0 to 6.0.36 Description: When processing a request submitt

[SECURITY] CVE-2013-2067 Session fixation with FORM authenticator

2013-05-10 Thread Mark Thomas
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 CVE-2013-2067 Session fixation with FORM authenticator Severity: Important Vendor: The Apache Software Foundation Versions Affected: - - Tomcat 7.0.0 to 7.0.32 - - Tomcat 6.0.21 to 6.0.36 Description: FORM authentication associates the most recent

[ANN] Apache Tomcat 7.0.40 released

2013-05-10 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.40. Apache Tomcat is an open source software implementation of the Java Servlet, JavaServer Pages and Java Expression Language technologies. This release contains a security fix and a number of bug fixes and improvem

CVE-2013-2071 Request mix-up if AsyncListener method throws RuntimeException

2013-05-10 Thread Mark Thomas
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 CVE-2013-2071 Request mix-up if AsyncListener method throws RuntimeException Severity: Moderate Vendor: The Apache Software Foundation Versions Affected: - - Tomcat 7.0.0 to 7.0.39 Description: Bug 54178 described a scenario where ele

svn commit: r1480931 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2013-05-10 Thread markt
Author: markt Date: Fri May 10 08:30:18 2013 New Revision: 1480931 URL: http://svn.apache.org/r1480931 Log: Update the Tomcat 7 docs for 7.0.40 [This commit notification would consist of 55 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1480914 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2013-05-10 Thread markt
Author: markt Date: Fri May 10 08:09:29 2013 New Revision: 1480914 URL: http://svn.apache.org/r1480914 Log: Bits copied to /dist yesterday Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/to

svn commit: r1480913 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default

2013-05-10 Thread markt
Author: markt Date: Fri May 10 08:08:54 2013 New Revision: 1480913 URL: http://svn.apache.org/r1480913 Log: Prep for next release Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.