svn commit: r1480913 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
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.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1480913&r1=1480912&r2=1480913&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Fri May 10 08:08:54 2013 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=40 +version.build=41 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1480913&r1=1480912&r2=1480913&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Fri May 10 08:08:54 2013 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.40 +maven.asf.release.deploy.version=7.0.41 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1480914 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
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/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1480914&r1=1480913&r2=1480914&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 10 08:09:29 2013 @@ -76,7 +76,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/
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.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CVE-2013-2071 Request mix-up if AsyncListener method throws RuntimeException
-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 elements of a previous request may be exposed to a current request. This was very difficult to exploit deliberately but fairly likely to happen unexpectedly if an application used AsyncListeners that threw RuntimeExceptions. The issue was fixed by catching the RuntimeExceptions. Mitigation: Users of affected versions should apply the following mitigation: - - Tomcat 7.0.x users should upgrade to 7.0.40 or later Credit: The security implications of this issue were identified by the Apache Tomcat Security Team. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html https://issues.apache.org/bugzilla/show_bug.cgi?id=54178 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRjLHMAAoJEBDAHFovYFnnOIAP/A9HXwQgnJKYl+gXwqFkjXaq blo70uMMUpKPJ61l/keEguxZ/iGdQC4H2osjQiG7lhoOPvrMKtewCMXDAk/j9Skd HXuQVSge22Na16M6GUNXARziyDk/44k8RHy3cibrPZPhUNVD743N50toPK8Q6UKR PmAANa/kB9vvD589PCQLx/i6oiS5jaAwjoSdbwshtJytXrxoHgUrRLl3P5/sPBiq 57H/pAELR4aorfSj+tJL63ySX9v4NRiB55u3hNDgZOnPz3D9sjMsmq5vSzhfyiHh NnkYGa7+ZfnBL6DJ4eiV5z7lbMFIBa7ZzcyYEhVFCIsbnSwTL2l0a3NSkuQ0xiXS 0jQDenOuCujL1Zw5YYHhRDy2rGbFG8q/Z+ZSQ3NP0vnmQCpCfsY3mBIFCWzhmK+h TnFKdtxA+Ev/HSGPlSK1hADiYwL/iLb6YMoyintgj2mDIxrdHhcfMq8h6GYD1rbF vlbWSpmgN81xdU8JxEbnq6PC60OeZH5x08Sj9B3YQlB8E4Pq9B/EaEFYF9oZdYcP +DQWcd78SBNevg+fgKdKK8CjU5JQhMWetxv6HUomS7j3LgoJQPwVrNcg0yjV1v/g qgddQ1DOamD+KuQxh08NHfMZP08g5a+CrQ6qpe3/pr/OI0PlTN23aCXvCEGl2KlZ Cn4w/1eoL4agb5oREL2U =vQbB -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.40 released
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 improvements compared to version 7.0.39. The notable changes include: - A fix for CVE-2013-2071 (bug 54178) an informatio disclosure issue. - Various fixes to stop Tomcat attempting to parse text that looks like an EL expression in a JSP document as an EL expression when EL expressions are either not permitted or not enabled. - Improved handling and reporting if a ConcurrentModificationException occurs while checking for memory leaks when a web application is being stopped. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Note: This version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for Windows operating systems running on different CPU architectures. Note: If you use the APR/native AJP or HTTP connector you *must* upgrade to version 1.1.24 or later of the AJP/native library and it is recommended that you upgrade to 1.1.27 Downloads: http://tomcat.apache.org/download-70.cgi Migration guides from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[SECURITY] CVE-2013-2067 Session fixation with FORM authenticator
-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 request requiring authentication with the current session. By repeatedly sending a request for an authenticated resource while the victim is completing the login form, an attacker could inject a request that would be executed using the victim's credentials. This attack has been prevented by changing the session ID prior to displaying the login page as well as after the user has successfully authenticated. Mitigation: Users of affected versions should apply one of the following mitigations: - - Tomcat 7.0.x users should upgrade to 7.0.33 or later - - Tomcat 6.0.x users should upgrade to 6.0.37 or later Credit: This issue was identified by the Apache Tomcat Security Team. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRjLHUAAoJEBDAHFovYFnnUnEP/0R3q0uPTHRXem+Jlx6DLLfs jL3TD1idxqHcUDJhX/mnePwTxIle5lAbPZn6hBknFPdD77kjyflq4TB3ZPUipsip s2bKzGGlDDZwzRIY46ZqBRcVXuemCu73BjFNLBP6CvjQwm1/wFGuOS+oRRKKigwQ Ew1Mau3c6Sb0VIED4yrgvhPwJwdi1+rA1TO87p/8rxQIS9CTcUy6J/MICPdvIQiI zIfr7pIRSNDk9JeC6Ybr/SC5lYqAox6eqOYYNoQ+5zQ1BcCw/eQgWpm4WYM2IDV3 2eNbjS/dylz5zBQEDbzz9VtReBTncQLF6Do2KDhWxkaUaX2oaOTPKlLiyL0gwA4e IDpHDl9D5mLmBaJi4Lz14cwey5wNgs28ZqX9JCUaLz7qc03J9Au7PrplOr3Xth/Z rQqeKVxFZKaIKQOm2NKs7v7bZAhzp/mKt/u9ndnk0uKk2Tf3i6QJ1GtICTY22eB6 Eh4s/o2BJDgGop0P7cTmrAv1uKu6/72eoUJBMyyGCIN67URzVZRwMQnmW6TqZoBt tASvlTVD53HV3aPdhDHDjP9x/6V6cODD29fzn5op59BWhMVuzf+1lhqphJT0hlQQ lnuf4H9UWG8I8/OzN7XNabIbVuYyhjYWnt8HI/8N/4cAHfA67fXkcbDqleKOd6qo Pcp0qDLiZqVFSotSkVFl =hWpv -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[SECURITY] CVE-2012-3544 Chunked transfer encoding extension size is not limited
-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 submitted using the chunked transfer encoding, Tomcat ignored but did not limit any extensions that were included. This allows a client to perform a limited DOS by streaming an unlimited amount of data to the server. Mitigation: Users of affected versions should apply one of the following mitigations: - - Tomcat 7.0.x users should upgrade to 7.0.30 or later - - Tomcat 6.0.x users should upgrade to 6.0.37 or later Credit: This issue was identified by Steve Jones. References: http://tomcat.apache.org/security.html http://tomcat.apache.org/security-7.html http://tomcat.apache.org/security-6.html -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRjLHYAAoJEBDAHFovYFnnNacQAKZ8VVSZkh1Tz1hkenVQH9ic rZGNE3dzfdum8sbL18iObOyt7b7iJMDwSv96sD6Ig+6EgiqRJGcj65a9DOIoyNlD dmYT8qj4wK2OUsefUpfX0RQHgAZcZMRHX6UcgBETgVDTVcWoZ3lDWEBCYap9CTLf 2MX34mMawDp+WEXloDIvxtSC5q5u2nW/O4UJHH+jaPnnmYmghHqb2yh9Tkjj3fkG HUtJlK0WuL9TM7IlQySPUHw98BN46illVu8go6xVslE3CLzXIOOOelOnyDH9IFoF D4SbhKb0nSwSi9aUJsjLNAmgx9Cj5shYyWQSP+CCNXfpOaBz11R3lxSmRvbRBDTf lW8SPgKiCIjXSbbKtZzhl9cu21i4yZFwaKm22wKSRoEWghHs5mCNcVwt+qNE34Zx v2eliMYymkc/EDy/aCTz4DwWhGP9XLi8hOtPkSFB46jLLbUOJcAcy3jPnPa9X8Gq FX07EAncpG8uC9wpSd1Vtr8SPJlbRbkwY2NJ9MaRuEtetbC/Gpq8I5fT7MuBM7X9 8r+GoEcjTMYGWb7T+vGzg5HpcnOVY07wvG1Kvdp/cLxxAjGONsAwvZQ1D6VAjkJx bgDOGWqTDm1c7U3MIY+CdrGKpKaRCoCI6UX5vlD/+H3NYjMKadUwpDrFNCwSMF4T 7QzwCUk2DGUI/n7o7S5n =vhss -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[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
https://issues.apache.org/bugzilla/show_bug.cgi?id=54178 Mark Thomas changed: What|Removed |Added Summary|runtime exception in|[CVE-2013-2071] runtime |onComplete of |exception in onComplete of |AsyncListener, will make|AsyncListener, will make |org.apache.catalina.connect |org.apache.catalina.connect |or.Request not recycled |or.Request not recycled |(orginally reported MESSAGE |(orginally reported MESSAGE |POST to tomcat, but it |POST to tomcat, but it |called doGet) |called doGet) --- Comment #14 from Mark Thomas --- The Tomcat security team has determined that this bug has security implications. It has been assigned CVE-2013-2071. The fix was included in the 7.0.40 release. -- 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 propchange: r1378921 - svn:log
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-3544 More chunked encoding improvements - Expand unit tests for chunked encoding - Fix a parsing error at eol when multiple headers are present (regression in r1378702) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1378702 - svn:log
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-3544 Resolve a FIXME and expand unit tests to cover CRLF vs LF checking. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1408044 - svn:log
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 Merged revision 1408043 from tomcat/trunk: In FormAuthenticator: If it is configured to change Session IDs, do the change before displaying the login form. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1471372 - svn:log
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 Protect against AsyncListeners that throw RuntimeExceptions (they should normally only throw IOExceptions). Includes a test case. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1417891 - svn:log
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 FormAuthenticator: If it is configured to change Session IDs, do the change before displaying the login form. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1480933 - in /tomcat/site/trunk: docs/oldnews-2012.html docs/security-6.html xdocs/security-6.xml
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/security-6.xml Added: tomcat/site/trunk/docs/oldnews-2012.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1480933&view=auto == --- tomcat/site/trunk/docs/oldnews-2012.html (added) +++ tomcat/site/trunk/docs/oldnews-2012.html Fri May 10 08:42:18 2013 @@ -0,0 +1,1114 @@ + + + +Apache Tomcat - Old news! - 2012 + + + + + + + + + +http://tomcat.apache.org/";> +Apache Tomcat + +http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"> + + + +http://www.google.com/search"; method="get"> + + + + + + + + + + + + + + +Apache Tomcat + + + +Home + + +Taglibs + + +Maven Plugin + + + +Download + + + +Which version? + + +Tomcat 7.0 + + +Tomcat 6.0 + + +Tomcat Connectors + + +Tomcat Native + + +http://archive.apache.org/dist/tomcat/";>Archives + + + +Documentation + + + +Tomcat 7.0 + + +Tomcat 6.0 + + +Tomcat Connectors + + +Tomcat Native + + +http://wiki.apache.org/tomcat/FrontPage";>Wiki + + +Migration Guide + + + +Problems? + + + +Security Reports + + +Find help + + +http://wiki.apache.org/tomcat/FAQ";>FAQ + + +Mailing Lists + + +Bug Database + + +IRC + + + +Get Involved + + + +Overview + + +SVN Repositories + + +Buildbot + + +https://reviews.apache.org/groups/tomcat/";>Reviewboard + + +Tools + + + +Media + + + +http://blogs.apache.org/tomcat/";>Blog + + +http://twitter.com/theapachetomcat";>Twitter + + + +Misc + + + +Who We Are + + +Heritage + + +http://www.apache.org";>Apache Home + + +Resources + + +Contact + + +Legal + + +http://www.apache.org/foundation/sponsorship.html";>Sponsorship + + +http://www.apache.org/foundation/thanks.html";>Thanks + + + + + + + +Tomcat 7.0.34 Released2012-12-12 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 7.0.34 of +Apache Tomcat. This release contains a small number of bug fixes and +improvements compared to version 7.0.33. The notable changes include: + + +Improvements to the AccessLogValve to better handle non-standard DST changes +and to provide option for the current access log to have a standard name. + + +Fix various JMX registration and deregistration issues. + +Update the Eclipse JDT compiler to 4.2.1 + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + + + +Download | +ChangeLog for 7.0.34 + + + + + + + + + + + + + + + + +Tomcat 7.0.33 Released2012-11-21 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 7.0.33 of +Apache Tomcat. This release contains a small number of bug fixes and +improvements compared to version 7.0.32. The notable changes include: + + +A fix to the AccessLogValve to address a bug that caused some entries to be +made with incorrect time stamps. + +A re-written, smaller, faster HTTP header parser. + +Further performance improvements for Jasper, Tomcat's JSP engine. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + + + +Download | +ChangeLog for 7.0.33 + + + + + + + + + + + + + + + + +Tomcat 6.0.36 Released2012-10-19 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 6.0.36 of +Apache Tomcat. This release includes security and bug fixes over Apache Tomcat +6.0.35. + + + + + +Download | +ChangeLog for 6.0.36 + + + + + + + + + + + + + + + + +Tomcat 5.5.36 Released2012-10-10 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 5.5.36 of +Apache Tomcat. This release is primarily a bug fix release. + + + +Note: As per the previous +end of life announcement this will almost certainly be the final Apache +Tomcat 5.5.x release. Users of the 5.5.x series are strongly encouraged to +upgrade to at least 6.0.x and ideally 7.0.x. + + + + +Download | +ChangeLog for 5.5.36 + + + + + + + + + + + + + + + + +Tomcat 7.0.32 Released2012-10-09 + + + + + + + +The Apache Tomcat Project is proud to announce the release of version 7.0.32 of +Apache Tomcat. This release contains a small number of bug fixes and +improvements compared to version 7.0.30. The notable changes include: + + +A new option to automatically remove old, unused versions (ones where there +are no longer any active sessions) of applications deployed using parallel +deployment. + +Faster parsing of JSPs. + +Make the members and deployer associated with a cluster visible via JMX. + + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + + + +Download | +ChangeLog for 7.0.32 + + + + + + + + + + + + + + + + +Tomcat
svn propchange: r1476592 - svn:log
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 commit accepted patch for Chunked encoding improvements. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1480940 - /tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
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/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1480940&r1=1480939&r2=1480940&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Fri May 10 08:55:28 2013
@@ -142,13 +142,6 @@ public class TestNonBlockingAPI extends
return;
}
-// TODO Non-blocking writes are not yet implemented for APR so this
test
-// will not pass.
-if (tomcat.getConnector().getProtocolHandlerClassName().equals(
-"org.apache.coyote.http11.Http11AprProtocol")) {
-return;
-}
-
// Must have a real docBase - just use temp
StandardContext ctx = (StandardContext) tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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
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/InternalAprOutputBuffer.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1480963&r1=1480962&r2=1480963&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Fri
May 10 09:35:53 2013
@@ -21,6 +21,8 @@ import java.io.IOException;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
@@ -89,9 +91,10 @@ public class InternalAprInputBuffer exte
private long socket;
-// - Public Methods
+private SocketWrapper wrapper;
+// - Public Methods
/**
* Recycle the input buffer. This should be called when closing the
@@ -100,6 +103,7 @@ public class InternalAprInputBuffer exte
@Override
public void recycle() {
socket = 0;
+wrapper = null;
super.recycle();
}
@@ -133,7 +137,7 @@ public class InternalAprInputBuffer exte
if (useAvailableData) {
return false;
}
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -150,7 +154,7 @@ public class InternalAprInputBuffer exte
if (useAvailableData) {
return false;
}
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -165,7 +169,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -188,7 +192,7 @@ public class InternalAprInputBuffer exte
while (space) {
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
@@ -213,7 +217,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -249,7 +253,7 @@ public class InternalAprInputBuffer exte
while (space) {
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
@@ -273,7 +277,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -340,7 +344,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -374,7 +378,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -416,7 +420,7 @@ public class InternalAprInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
-if (!fill())
+if (!fill(true))
throw new EOFException(sm.getString("iib.eof.error"));
}
@@ -435,7 +439,7 @@
svn commit: r1480964 - in /tomcat/trunk/java: javax/servlet/ServletContext.java org/apache/catalina/core/Constants.java
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/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1480964&r1=1480963&r2=1480964&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri May 10 09:40:44 2013
@@ -87,7 +87,7 @@ public interface ServletContext {
/**
* Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 3.0
must
+ * container supports. All implementations that comply with Version 3.1
must
* have this method return the integer 3.
*
* @return 3
@@ -96,8 +96,8 @@ public interface ServletContext {
/**
* Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 3.0 must have
this
- * method return the integer 0.
+ * supports. All implementations that comply with Version 3.1 must have
this
+ * method return the integer 1.
*
* @return 0
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/Constants.java?rev=1480964&r1=1480963&r2=1480964&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/Constants.java Fri May 10
09:40:44 2013
@@ -23,7 +23,7 @@ public class Constants {
public static final String Package = "org.apache.catalina.core";
public static final int MAJOR_VERSION = 3;
-public static final int MINOR_VERSION = 0;
+public static final int MINOR_VERSION = 1;
public static final String JSP_SERVLET_CLASS =
"org.apache.jasper.servlet.JspServlet";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/
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) of tabs
Added:
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd (with props)
tomcat/trunk/java/javax/servlet/resources/javaee_7.xsd (with props)
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_4.xsd
(with props)
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd
(with props)
tomcat/trunk/java/javax/servlet/resources/web-app_3_1.xsd (with props)
tomcat/trunk/java/javax/servlet/resources/web-common_3_1.xsd (with props)
tomcat/trunk/java/javax/servlet/resources/web-fragment_3_1.xsd (with
props)
Modified:
tomcat/trunk/LICENSE
tomcat/trunk/NOTICE
tomcat/trunk/res/META-INF/jsp-api.jar.license
tomcat/trunk/res/META-INF/jsp-api.jar.notice
tomcat/trunk/res/META-INF/servlet-api.jar.license
tomcat/trunk/res/META-INF/servlet-api.jar.notice
Modified: tomcat/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/LICENSE?rev=1480974&r1=1480973&r2=1480974&view=diff
==
--- tomcat/trunk/LICENSE (original)
+++ tomcat/trunk/LICENSE Fri May 10 10:07:21 2013
@@ -718,6 +718,13 @@ For the following XML Schemas for Java E
- web-app_3_0.xsd
- web-common_3_0.xsd
- web-fragment_3_0.xsd
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: tomcat/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1480974&r1=1480973&r2=1480974&view=diff
==
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Fri May 10 10:07:21 2013
@@ -33,4 +33,13 @@ The original XML Schemas for Java EE Dep
- web-app_3_0.xsd
- web-common_3_0.xsd
- web-fragment_3_0.xsd
-may be obtained from http://java.sun.com/xml/ns/javaee/
+ - javaee_7.xsd
+ - javaee_web_services_1_4.xsd
+ - javaee_web_services_client_1_4.xsd
+ - jsp_2_3.xsd
+ - web-app_3_1.xsd
+ - web-common_3_1.xsd
+ - web-fragment_3_1.xsd
+
+may be obtained from:
+http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
Added: tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd?rev=1480974&view=auto
==
--- tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd (added)
+++ tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd Fri May 10
10:07:21 2013
@@ -0,0 +1,396 @@
+
+http://www.w3.org/2001/XMLSchema";
+targetNamespace="http://xmlns.jcp.org/xml/ns/javaee";
+xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee";
+xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+elementFormDefault="qualified"
+attributeFormDefault="unqualified"
+version="2.3">
+
+
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights
reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common Development
+ and Distribution License("CDDL") (collectively, the "License"). You
+ may not use this file except in compliance with the License. You can
+ obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ or packager/legal/LICENSE.txt. See the License for the specific
+ language governing permissions and limitations under the License.
+
+ When distributing the software, include this License Header Notice in
each
+ file and include the License file at packager/legal/LICENSE.txt.
+
+ GPL Classpath Exception:
+ Oracle designates this particular file as subject to the "Classpath"
+ exception as provided by Oracle in the GPL Version 2 section of the
License
+ file that accompanied this code.
+
+ Modifications:
+ If applicable, add the following below the License Header, with the
fields
+ enclosed by brackets [] replaced by your own identifying information:
+ "Portions Copyright [year] [name of copyright owner]"
+
+ Contributor(s):
+ If you wish your version of this file to be governed by only the CDDL or
+ only the GPL Version 2, indicate your decision by adding "[Contributor]
+ elects to include this software in this distribution under the [CDDL or
GPL
+ Version 2]
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
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-websocket.jar/web-fragment.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/trunk/webapps/docs/WEB-INF/web.xml
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://java.sun.com/xml/ns/javaee";
+http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1480975&r1=1480974&r2=1480975&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri May 10
10:19:25 2013
@@ -630,12 +630,12 @@ public class WebXml {
sb.append("\n");
// Root element
-sb.append("http://java.sun.com/xml/ns/javaee\"\n";);
+sb.append("http://xmlns.jcp.org/xml/ns/javaee\"\n";);
sb.append(" xmlns:xsi=");
sb.append("\"http://www.w3.org/2001/XMLSchema-instance\"\n";);
sb.append(" xsi:schemaLocation=");
-sb.append("\"http://java.sun.com/xml/ns/javaee"; +
- " http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
+sb.append("\"http://xmlns.jcp.org/xml/ns/javaee"; +
+ " http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd\"\n";);
sb.append(" version=\"");
sb.append(getVersion());
sb.append("\"\n");
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Fri May 10
10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://java.sun.com/xml/ns/javaee";
+http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd";
- version="3.0"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
org_apache_tomcat_websocket
Modified:
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml?rev=1480975&r1=1480974&r2=1480975&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
Fri May 10 10:19:25 2013
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the Licens
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
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 (with props) tomcat/trunk/test/webapp-3.1/ tomcat/trunk/test/webapp-3.1/WEB-INF/ tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml (with props) Added: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1480977&view=auto == --- tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml (added) +++ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Fri May 10 10:37:34 2013 @@ -0,0 +1,36 @@ + + +http://java.sun.com/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; + version="3.0" + metadata-complete="true"> + + Tomcat Servlet 3.0 Tests + +Provides a web application used by the Tomcat unit tests to ensure that +Tomcat meets the requirements of the current JSP and Servlet specification +for web applications that declare that they follow version 3.0 of the +Servlet specification and version 2.2 of the JSP specification. This +typically means ensuring that features introduced in later versions of the +specification do not change the behaviour of applications that declared an +earlier version of the specification. + + + \ No newline at end of file Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml -- svn:eol-style = native Added: tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml?rev=1480977&view=auto == --- tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml (added) +++ tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml Fri May 10 10:37:34 2013 @@ -0,0 +1,36 @@ + + +http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + version="3.1" + metadata-complete="true"> + + Tomcat Servlet 3.1 Tests + +Provides a web application used by the Tomcat unit tests to ensure that +Tomcat meets the requirements of the current JSP and Servlet specification +for web applications that declare that they follow version 3.1 of the +Servlet specification and version 2.3 of the JSP specification. This +typically means ensuring that features introduced in later versions of the +specification do not change the behaviour of applications that declared an +earlier version of the specification. + + + \ No newline at end of file Propchange: tomcat/trunk/test/webapp-3.1/WEB-INF/web.xml -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/
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 props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld (with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld (with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld (with props)
tomcat/trunk/test/webapp-3.0/el-as-literal.jsp
- copied unchanged from r1480976,
tomcat/trunk/test/webapp/el-as-literal.jsp
tomcat/trunk/test/webapp-3.0/tld-versions.jsp
- copied unchanged from r1480976,
tomcat/trunk/test/webapp/tld-versions.jsp
tomcat/trunk/test/webapp-3.1/WEB-INF/tags11.tld
- copied unchanged from r1480757,
tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld
tomcat/trunk/test/webapp-3.1/WEB-INF/tags12.tld
- copied unchanged from r1480757,
tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld
tomcat/trunk/test/webapp-3.1/WEB-INF/tags20.tld
- copied unchanged from r1480757,
tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld
tomcat/trunk/test/webapp-3.1/WEB-INF/tags21.tld
- copied unchanged from r1480757,
tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld
tomcat/trunk/test/webapp-3.1/el-as-literal.jsp
- copied unchanged from r1480976,
tomcat/trunk/test/webapp/el-as-literal.jsp
tomcat/trunk/test/webapp-3.1/tld-versions.jsp
- copied unchanged from r1480976,
tomcat/trunk/test/webapp/tld-versions.jsp
Removed:
tomcat/trunk/test/webapp/WEB-INF/tags11.tld
tomcat/trunk/test/webapp/WEB-INF/tags12.tld
tomcat/trunk/test/webapp/WEB-INF/tags20.tld
tomcat/trunk/test/webapp/WEB-INF/tags21.tld
tomcat/trunk/test/webapp/el-as-literal.jsp
tomcat/trunk/test/webapp/tld-versions.jsp
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1480979&r1=1480978&r2=1480979&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Fri May 10
10:55:19 2013
@@ -132,7 +132,32 @@ public class TestValidator extends Tomca
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/tld-versions.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-hello world") > 0);
+assertTrue(result.indexOf("#{'01-hello world'}") > 0);
+assertTrue(result.indexOf("02-hello world") > 0);
+assertTrue(result.indexOf("#{'03-hello world'}") > 0);
+assertTrue(result.indexOf("04-hello world") > 0);
+assertTrue(result.indexOf("#{'05-hello world'}") > 0);
+assertTrue(result.indexOf("06-hello world") > 0);
+}
+
+@Test
+public void testTldVersions31() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-3.1");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld?rev=1480979&view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld Fri May 10 10:55:19 2013
@@ -0,0 +1,37 @@
+
+http://java.sun.com/dtd/web-jsptaglibrary_1_1.dtd";>
+
+ 1.0
+ 1.1
+ Tags11
+ http://tomcat.apache.org/tags11
+
+
+Echo
+org.apache.jasper.compiler.TestValidator$Echo
+empty
+
+ echo
+ yes
+ true
+
+
+
+
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld?rev=1480979&view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld Fri May 10 10:55:19 2013
@@ -0,0 +1,37 @@
+
+http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
+
+ 1.0
+ 1.2
+
svn commit: r1480984 - in /tomcat/trunk: res/META-INF/tomcat-websocket.jar/ test/org/apache/catalina/startup/
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 tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1480984&r1=1480983&r2=1480984&view=diff == --- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original) +++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Fri May 10 11:39:36 2013 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee"; +http://xmlns.jcp.org/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; version="3.1" metadata-complete="true"> org_apache_tomcat_websocket Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml?rev=1480984&r1=1480983&r2=1480984&view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml (original) +++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml Fri May 10 11:39:36 2013 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee"; +http://xmlns.jcp.org/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; version="3.1" metadata-complete="true"> name1 Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml?rev=1480984&r1=1480983&r2=1480984&view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml (original) +++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml Fri May 10 11:39:36 2013 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee"; +http://xmlns.jcp.org/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; version="3.1" metadata-complete="true"> Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml?rev=1480984&r1=1480983&r2=1480984&view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml (original) +++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml Fri May 10 11:39:36 2013 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://xmlns.jcp.org/xml/ns/javaee"; +http://xmlns.jcp.org/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee - http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; version="3.1" metadata-complete="true"> name1 Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml?rev=1480984&r1=1480983&r2=1480984&view=diff == --- tomcat/trunk/test/org/apache/catalina/star
svn commit: r1480987 - /tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
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/TestJspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1480987&r1=1480986&r2=1480987&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Fri May 10
12:05:45 2013
@@ -93,7 +93,7 @@ public class TestJspConfig extends Tomca
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -107,4 +107,22 @@ public class TestJspConfig extends Tomca
assertTrue(result.indexOf("00-hello world") > 0);
}
+@Test
+public void testServlet31NoEL() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-3.1");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/el-as-literal.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-hello world") > 0);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481001 - in /tomcat/trunk/res/maven: tomcat-jsp-api.pom tomcat-servlet-api.pom
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.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jsp-api.pom?rev=1481001&r1=1481000&r2=1481001&view=diff == --- tomcat/trunk/res/maven/tomcat-jsp-api.pom (original) +++ tomcat/trunk/res/maven/tomcat-jsp-api.pom Fri May 10 12:57:35 2013 @@ -35,7 +35,7 @@ repo The Apache License, version 2.0 applies to all files apart from -jsp_2_2.xsd to which the CDDL version 1.0 applies. +jsp_2_2.xsd and jsp_2_3.xsd to which the CDDL version 1.0 applies. Modified: tomcat/trunk/res/maven/tomcat-servlet-api.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?rev=1481001&r1=1481000&r2=1481001&view=diff == --- tomcat/trunk/res/maven/tomcat-servlet-api.pom (original) +++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Fri May 10 12:57:35 2013 @@ -38,8 +38,10 @@ javaee_5.xsd, javaee_web_services_1_2.xsd, javaee_web_services_client_1_2.xsd, javaee_6.xsd, javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd, -web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the -CDDL version 1.0 applies. +web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd, javaee_7.xsd, +javaee_web_services_1_4.xsd, javaee_web_services_client_1_4.xsd, +web-app_3_1.xsd, web-common_3_1.xsd and web-fragment_3_1.xsd to which +the CDDL version 1.0 applies. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481002 - /tomcat/trunk/res/INSTALLLICENSE
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/INSTALLLICENSE?rev=1481002&r1=1481001&r2=1481002&view=diff == --- tomcat/trunk/res/INSTALLLICENSE (original) +++ tomcat/trunk/res/INSTALLLICENSE Fri May 10 12:58:30 2013 @@ -718,6 +718,13 @@ For the following XML Schemas for Java E - web-app_3_0.xsd - web-common_3_0.xsd - web-fragment_3_0.xsd + - javaee_7.xsd + - javaee_web_services_1_4.xsd + - javaee_web_services_client_1_4.xsd + - jsp_2_3.xsd + - web-app_3_1.xsd + - web-common_3_1.xsd + - web-fragment_3_1.xsd COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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
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/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1481005&r1=1481004&r2=1481005&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri May 10
13:11:22 2013
@@ -184,6 +184,13 @@ public class WebXml {
// Update major and minor version
if (publicId == null) {
// skip
+} else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_31.
+equalsIgnoreCase(publicId) ||
+
org.apache.catalina.startup.Constants.WebFragmentSchemaPublicId_31.
+equalsIgnoreCase(publicId)) {
+majorVersion = 3;
+minorVersion = 1;
+this.publicId = publicId;
} else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_30.
equalsIgnoreCase(publicId) ||
org.apache.catalina.startup.Constants.WebFragmentSchemaPublicId_30.
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1481005&r1=1481004&r2=1481005&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Fri May 10
13:11:22 2013
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.startup;
-
/**
* String constants for the startup package.
*
@@ -26,7 +23,6 @@ package org.apache.catalina.startup;
* @author Jean-Francois Arcand
* @version $Id$
*/
-
public final class Constants {
public static final String Package = "org.apache.catalina.startup";
@@ -73,6 +69,11 @@ public final class Constants {
public static final String JavaeeSchemaResourcePath_6 =
"/javax/servlet/resources/javaee_6.xsd";
+public static final String JavaeeSchemaPublicId_7 =
+"javaee_7.xsd";
+public static final String JavaeeSchemaResourcePath_7 =
+"/javax/servlet/resources/javaee_6.xsd";
+
// W3C
public static final String W3cSchemaPublicId_10 =
@@ -107,6 +108,11 @@ public final class Constants {
public static final String JspSchemaResourcePath_22 =
"/javax/servlet/jsp/resources/jsp_2_2.xsd";
+public static final String JspSchemaPublicId_23 =
+"jsp_2_3.xsd";
+public static final String JspSchemaResourcePath_23 =
+"/javax/servlet/jsp/resources/jsp_2_3.xsd";
+
// TLD
public static final String TldDtdPublicId_11 =
@@ -166,6 +172,22 @@ public final class Constants {
public static final String WebFragmentSchemaResourcePath_30 =
"/javax/servlet/resources/web-fragment_3_0.xsd";
+public static final String WebSchemaPublicId_31 =
+"web-app_3_1.xsd";
+public static final String WebSchemaResourcePath_31 =
+"/javax/servlet/resources/web-app_3_1.xsd";
+
+public static final String WebCommonSchemaPublicId_31 =
+"web-common_3_1.xsd";
+public static final String WebCommonSchemaResourcePath_31 =
+"/javax/servlet/resources/web-common_3_1.xsd";
+
+public static final String WebFragmentSchemaPublicId_31 =
+"web-fragment_3_1.xsd";
+public static final String WebFragmentSchemaResourcePath_31 =
+"/javax/servlet/resources/web-fragment_3_1.xsd";
+
+
// Web service
public static final String J2eeWebServiceSchemaPublicId_11 =
"j2ee_web_services_1_1.xsd";
@@ -197,4 +219,13 @@ public final class Constants {
public static final String JavaeeWebServiceClientSchemaResourcePath_13 =
"/javax/servlet/resources/javaee_web_services_client_1_3.xsd";
+public static final String JavaeeWebServiceSchemaPublicId_14 =
+"javaee_web_services_1_4.xsd";
+public static final String JavaeeWebServiceSchemaResourcePath_14 =
+"/javax/servlet/resources/javaee_web_services_1_4.xsd";
+
+public static final String JavaeeWebServiceClientSchemaPublicId_14 =
+"javaee_web_services_client_1_4.xsd";
+public st
buildbot success in ASF Buildbot on tomcat-trunk
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 Stamp: [branch tomcat/trunk] 1480987 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/
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 where you got them? I'd like to let the IntelliJ IDEA developers know where to find them. Thanks, Nick - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/
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 from some other source? If copied, > could you let me know where you got them? I'd like to let the IntelliJ IDEA > developers know where to find them. As per the statements in the various notice files these were copied from: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1480974 [1/4] - in /tomcat/trunk: ./ java/javax/servlet/jsp/resources/ java/javax/servlet/resources/ res/META-INF/
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 the Java EE 7 XSDs. >> >> Mark, were these hand-coded or copied from some other source? If copied, >> could you let me know where you got them? I'd like to let the IntelliJ IDEA >> developers know where to find them. > > As per the statements in the various notice files these were copied from: > http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html > > Mark My bad for not looking at the notice files. Thanks! Nick - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481164 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
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
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1481164&r1=1481163&r2=1481164&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri May 10
19:50:46 2013
@@ -671,9 +671,6 @@ public class AprEndpoint extends Abstrac
// Ignore
}
poller = null;
-if (log.isTraceEnabled()) {
-log.trace("stopInternal() clearing connections map");
-}
connections.clear();
if (useSendfile) {
try {
@@ -797,8 +794,8 @@ public class AprEndpoint extends Abstrac
try {
// During shutdown, executor may be null - avoid NPE
if (running) {
-if (log.isTraceEnabled()) {
-log.trace("processSocketWithOptions(long): " + socket);
+if (log.isDebugEnabled()) {
+log.debug("processSocketWithOptions(long): " + socket);
}
AprSocketWrapper wrapper =
new AprSocketWrapper(Long.valueOf(socket));
@@ -898,9 +895,6 @@ public class AprEndpoint extends Abstrac
}
private void destroySocket(long socket) {
-if (log.isTraceEnabled()) {
-log.trace("destroySocket(long): " + socket);
-}
// If not running the socket will be destroyed by
// parent pool or acceptor socket.
// In any case disable double free which would cause JVM core.
@@ -914,6 +908,14 @@ public class AprEndpoint extends Abstrac
}
private void destroySocket(long socket, boolean doIt) {
+if (log.isDebugEnabled()) {
+String msg = "destroySocket(long,boolean): " + socket + " " + doIt;
+if (log.isTraceEnabled()) {
+log.trace(msg, new Exception());
+} else {
+log.debug(msg);
+}
+}
// Be VERY careful if you call this method directly. If it is called
// twice for the same socket the JVM will core. Currently this is only
// called from Poller.closePollset() to ensure kept alive connections
@@ -1424,6 +1426,15 @@ public class AprEndpoint extends Abstrac
}
private void add(long socket, int timeout, int flags) {
+if (log.isDebugEnabled()) {
+String msg = "Poller.add(long,int,int) " + socket + " " +
+timeout + " " + flags;
+if (log.isTraceEnabled()) {
+log.trace(msg, new Exception());
+} else {
+log.debug(msg);
+}
+}
if (timeout < 0) {
timeout = getSoTimeout();
}
@@ -1504,8 +1515,8 @@ public class AprEndpoint extends Abstrac
}
long socket = timeouts.check(date);
while (socket != 0) {
-if (log.isTraceEnabled()) {
-log.trace("Poller maintain() timing out socket: " +
socket);
+if (log.isDebugEnabled()) {
+log.debug("Poller maintain() timing out socket: " +
socket);
}
removeFromPoller(socket);
boolean comet = connections.get(
@@ -1587,8 +1598,8 @@ public class AprEndpoint extends Abstrac
}
SocketInfo info = localAddList.get();
while (info != null) {
-if (log.isTraceEnabled()) {
-log.trace("Poller run() adding socket: " +
+if (log.isDebugEnabled()) {
+log.debug("Poller run() adding socket: " +
info.socket);
}
removeFromPoller(info.socket);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481165 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java InternalNioOutputBuffer.java
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:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1481165&r1=1481164&r2=1481165&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri
May 10 19:53:12 2013
@@ -1057,8 +1057,6 @@ public abstract class AbstractHttp11Proc
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
-registerForWrite();
-
if (error || endpoint.isPaused()) {
return SocketState.CLOSED;
} else if (isAsync() || comet) {
@@ -1612,7 +1610,6 @@ public abstract class AbstractHttp11Proc
if (error) {
return SocketState.CLOSED;
} else if (isAsync()) {
-registerForWrite();
return SocketState.LONG;
} else {
if (!keepAlive) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1481165&r1=1481164&r2=1481165&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Fri
May 10 19:53:12 2013
@@ -153,6 +153,10 @@ public class InternalNioOutputBuffer ext
bytebuffer.clear();
flipped = false;
}
+if (flipped) {
+// Still have data to write
+att.getPoller().add(socket, SelectionKey.OP_WRITE);
+}
return written;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481201 - in /tomcat/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java LocalStrings.properties
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: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1481201&r1=1481200&r2=1481201&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri May
10 21:47:18 2013
@@ -423,7 +423,7 @@ public class CoyoteAdapter implements Ad
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
success = false;
-log.error(sm.getString("coyoteAdapter.service"), t);
+log.error(sm.getString("coyoteAdapter.asyncDispatch"), t);
} finally {
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1481201&r1=1481200&r2=1481201&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Fri
May 10 21:47:18 2013
@@ -15,9 +15,10 @@
cometEvent.nullRequest=The event object has been recycled and is no longer
associated with a request
-coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
-coyoteAdapter.debug=The variable [{0}] has value [{1}]
coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the
access log
+coyoteAdapter.asyncDispatch=Exception while processing an asynchronous request
+coyoteAdapter.debug=The variable [{0}] has value [{1}]
+coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
coyoteConnector.invalidPort=The connector cannot start since the specified
port value of [{0}] is invalid
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1481233 - /tomcat/trunk/java/org/apache/catalina/startup/Constants.java
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:
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1481233&r1=1481232&r2=1481233&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Fri May 10
23:33:50 2013
@@ -70,9 +70,9 @@ public final class Constants {
"/javax/servlet/resources/javaee_6.xsd";
public static final String JavaeeSchemaPublicId_7 =
-"javaee_7.xsd";
-public static final String JavaeeSchemaResourcePath_7 =
-"/javax/servlet/resources/javaee_6.xsd";
+"javaee_7.xsd";
+public static final String JavaeeSchemaResourcePath_7 =
+"/javax/servlet/resources/javaee_7.xsd";
// W3C
@@ -109,9 +109,9 @@ public final class Constants {
"/javax/servlet/jsp/resources/jsp_2_2.xsd";
public static final String JspSchemaPublicId_23 =
-"jsp_2_3.xsd";
-public static final String JspSchemaResourcePath_23 =
-"/javax/servlet/jsp/resources/jsp_2_3.xsd";
+"jsp_2_3.xsd";
+public static final String JspSchemaResourcePath_23 =
+"/javax/servlet/jsp/resources/jsp_2_3.xsd";
// TLD
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
