[Bug 54239] Extensible EL Interpreter
https://issues.apache.org/bugzilla/show_bug.cgi?id=54239 --- Comment #18 from Sheldon Shao xs...@ebay.com --- Hi Mark, The code has been refined. Test cases and document also have been provided. Could you please take a look ? -- 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
[Bug 54262] An empty absolute-ordering / should turn off all web-fragments
https://issues.apache.org/bugzilla/show_bug.cgi?id=54262 --- Comment #3 from Violeta Georgieva violet...@apache.org --- Created attachment 29811 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29811action=edit Patch proposal -- 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
[Bug 54262] An empty absolute-ordering / should turn off all web-fragments
https://issues.apache.org/bugzilla/show_bug.cgi?id=54262 --- Comment #4 from Violeta Georgieva violet...@apache.org --- Created attachment 29812 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29812action=edit Test case -- 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
[Bug 54262] An empty absolute-ordering / should turn off all web-fragments
https://issues.apache.org/bugzilla/show_bug.cgi?id=54262 --- Comment #5 from Violeta Georgieva violet...@apache.org --- Please find attached a patch proposal and a test case for it. Any comments will be appreciated. Regards Violeta -- 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
[Bug 54372] New: Digest Authentication fails on Safari and IE8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=54372 Bug ID: 54372 Summary: Digest Authentication fails on Safari and IE8/9 Product: Tomcat 7 Version: 7.0.34 Hardware: Macintosh Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: jborch...@crimsonwing.com Classification: Unclassified Created attachment 29814 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29814action=edit Log with Firefox Live HTTP Headers Login with Safari on the Mac and on IOS with DIGEST authentication fails. Also with IE8/9 the login fails. With Firefox and Chrome login works perfect. I did store the password in tomcat-users.xml as plain text. Then I did configure the realm as MD5 and stored the password as a MD5 hash of [user]:[realm]:[password]. Also then Firefox and Chrome login perfectly and Safari and IE8/9 are failing. I did attach a log file of the headers with Firefox succeeding to login. Thanks, Johan Borchers -- 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
[Bug 54372] Digest Authentication fails on Safari and IE8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=54372 Johan Borchers jborch...@crimsonwing.com changed: What|Removed |Added OS||All --- Comment #1 from Johan Borchers jborch...@crimsonwing.com --- Version 7.0.30 and 7.0.32 are working fine with the same configuration. Safari can login with DIGEST authentication. Version 7.0.33 is not working anymore and has the same problem as described for version 7.0.34. -- 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
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate-eoln (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate-eoln has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate-eoln : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate-eoln (Type: Build) Work ended in a state of : Failed Elapsed: 18 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/bin [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/conf [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/lib [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps compile-prepare: [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/startup [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-7.0.x/webapps/docs validate-eoln: [javac] Compiling 1 source file to /srv/gump/public/workspace/tomcat-7.0.x/output/classes [checkeol] Checking line ends in 2249 file(s) [checkeol] Checking line ends in 84 file(s) [checkeol] Done line ends check in 2333 file(s), 1 error(s) found. [checkeol] The following files have wrong line ends: [ [checkeol] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/util/Tester.java: uses CRLF on line 1] BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:522: The following files have wrong line ends: [ /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/util/Tester.java: uses CRLF on line 1] Total time: 17 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 07001204012013, vmgump.apache.org:vmgump:07001204012013 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate-eoln has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate-eoln : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build) Work ended in a state of : Failed Elapsed: 20 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/bin [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/conf [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/lib [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/logs [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/webapps compile-prepare: [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup [copy] Copying 1 file to /srv/gump/public/workspace/tomcat-trunk/webapps/docs validate-eoln: [javac] Compiling 1 source file to /srv/gump/public/workspace/tomcat-trunk/output/classes [checkeol] Checking line ends in 2348 file(s) [checkeol] Checking line ends in 85 file(s) [checkeol] Done line ends check in 2433 file(s), 1 error(s) found. [checkeol] The following files have wrong line ends: [ [checkeol] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/util/Tester.java: uses CRLF on line 1] BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:549: The following files have wrong line ends: [ /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/util/Tester.java: uses CRLF on line 1] Total time: 19 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 07001204012013, vmgump.apache.org:vmgump:07001204012013 Gump E-mail Identifier (unique within run) #2. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1428869 - /tomcat/trunk/test/org/apache/el/util/Tester.java
Author: markt
Date: Fri Jan 4 14:11:53 2013
New Revision: 1428869
URL: http://svn.apache.org/viewvc?rev=1428869view=rev
Log:
Fix line endings
Modified:
tomcat/trunk/test/org/apache/el/util/Tester.java (contents, props changed)
Modified: tomcat/trunk/test/org/apache/el/util/Tester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/util/Tester.java?rev=1428869r1=1428868r2=1428869view=diff
==
--- tomcat/trunk/test/org/apache/el/util/Tester.java (original)
+++ tomcat/trunk/test/org/apache/el/util/Tester.java Fri Jan 4 14:11:53 2013
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.el.util;
-
-import java.io.InputStream;
-
-public class Tester {
-
-@SuppressWarnings(unused)
-public void testA(InputStream param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testA(Long param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testB(InputStream param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testB(long param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testC(long param1) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testD(String param1) {
-// NO-OP
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.util;
+
+import java.io.InputStream;
+
+public class Tester {
+
+@SuppressWarnings(unused)
+public void testA(InputStream param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testA(Long param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testB(InputStream param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testB(long param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testC(long param1) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testD(String param1) {
+// NO-OP
+}
+}
Propchange: tomcat/trunk/test/org/apache/el/util/Tester.java
--
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: r1428870 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/el/util/Tester.java
Author: markt
Date: Fri Jan 4 14:13:37 2013
New Revision: 1428870
URL: http://svn.apache.org/viewvc?rev=1428870view=rev
Log:
Fix line endings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java (contents, props
changed)
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1428869
Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java?rev=1428870r1=1428869r2=1428870view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java Fri Jan 4
14:13:37 2013
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.el.util;
-
-import java.io.InputStream;
-
-public class Tester {
-
-@SuppressWarnings(unused)
-public void testA(InputStream param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testA(Long param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testB(InputStream param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testB(long param1, String param2) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testC(long param1) {
-// NO-OP
-}
-
-@SuppressWarnings(unused)
-public void testD(String param1) {
-// NO-OP
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.util;
+
+import java.io.InputStream;
+
+public class Tester {
+
+@SuppressWarnings(unused)
+public void testA(InputStream param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testA(Long param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testB(InputStream param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testB(long param1, String param2) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testC(long param1) {
+// NO-OP
+}
+
+@SuppressWarnings(unused)
+public void testD(String param1) {
+// NO-OP
+}
+}
Propchange: tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54372] Digest Authentication fails on Safari and IE8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=54372 --- Comment #2 from Mark Thomas ma...@apache.org --- The likely suspect is the new lightweight HTTP header parser that we switched to in 7.0.33. The question at the moment is whether it is the parser or the client that is non-spec compliant. -- 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
[Bug 54372] Digest Authentication fails on Safari and IE8/9
https://issues.apache.org/bugzilla/show_bug.cgi?id=54372 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas ma...@apache.org --- IE8 is not compliant with RFC2617 so the authentication request is rejected. The browser is adding quotes to the qop field which is meant to be a token (and hence not quoted). Tomcat is rejecting this malformed request. You need to raise a bug with Microsoft to get that fixed. I suspect IE9 has the same problem. Safari is also adding quotes to the qop field. You'll need to raise a bug with Apple to get that fixed. It seems the browser developers were confusing the server qop field (which is a quoted, comma separated list of tokens) with the browser qop field which is a token (i.e. not quoted). Web servers are encouraged to be tolerant of misbehaving clients where they can. I'll see if there is a way this invalid header can be safely (since this is security related) parsed. -- 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: r1428959 - in /tomcat/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ modules/jdbc-pool/ modules/jdbc-pool/doc/ webapps/manager/WEB-INF/jsp/
Author: kkolinko
Date: Fri Jan 4 16:37:54 2013
New Revision: 1428959
URL: http://svn.apache.org/viewvc?rev=1428959view=rev
Log:
s/2012/2013/g
Modified:
tomcat/trunk/NOTICE
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/trunk/modules/jdbc-pool/NOTICE
tomcat/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Modified: tomcat/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Fri Jan 4 16:37:54 2013
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
+Copyright 1999-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan 4
16:37:54 2013
@@ -201,7 +201,7 @@ public class Constants {
HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em
+
+ emCopyright copy; 1999-2013, Apache Software Foundation/em
+
/font/center\n +
\n +
/body\n +
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri
Jan 4 16:37:54 2013
@@ -792,7 +792,7 @@ public final class HTMLManagerServlet ex
*/
@Override
public String getServletInfo() {
-return HTMLManagerServlet, Copyright (c) 1999-2012, The Apache
Software Foundation;
+return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache
Software Foundation;
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan
4 16:37:54 2013
@@ -111,7 +111,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em +
+ emCopyright copy; 1999-2013, Apache Software Foundation/em +
/font/center\n +
\n +
/body\n +
Modified: tomcat/trunk/modules/jdbc-pool/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/NOTICE?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/modules/jdbc-pool/NOTICE (original)
+++ tomcat/trunk/modules/jdbc-pool/NOTICE Fri Jan 4 16:37:54 2013
@@ -1,5 +1,5 @@
Apache Tomcat JDBC Pool
-Copyright 2008-2012 The Apache Software Foundation
+Copyright 2008-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=1428959r1=1428958r2=1428959view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/package.xsl (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/package.xsl Fri Jan 4 16:37:54 2013
@@ -150,7 +150,7 @@ td#mainBody {width: 100%;}
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 1999-2012, Apache Software Foundation
+
svn commit: r1428969 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ modules/jdbc-pool/ modules/jdbc-pool/doc/ webapps/manager/WEB-INF/jsp/
Author: kkolinko
Date: Fri Jan 4 16:45:13 2013
New Revision: 1428969
URL: http://svn.apache.org/viewvc?rev=1428969view=rev
Log:
s/2012/2013/g
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/NOTICE
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1428959
Modified: tomcat/tc7.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/NOTICE?rev=1428969r1=1428968r2=1428969view=diff
==
--- tomcat/tc7.0.x/trunk/NOTICE (original)
+++ tomcat/tc7.0.x/trunk/NOTICE Fri Jan 4 16:45:13 2013
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
+Copyright 1999-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1428969r1=1428968r2=1428969view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri
Jan 4 16:45:13 2013
@@ -201,7 +201,7 @@ public class Constants {
HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em
+
+ emCopyright copy; 1999-2013, Apache Software Foundation/em
+
/font/center\n +
\n +
/body\n +
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1428969r1=1428968r2=1428969view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Fri Jan 4 16:45:13 2013
@@ -774,7 +774,7 @@ public final class HTMLManagerServlet ex
*/
@Override
public String getServletInfo() {
-return HTMLManagerServlet, Copyright (c) 1999-2012, The Apache
Software Foundation;
+return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache
Software Foundation;
}
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1428969r1=1428968r2=1428969view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
Fri Jan 4 16:45:13 2013
@@ -111,7 +111,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em +
+ emCopyright copy; 1999-2013, Apache Software Foundation/em +
/font/center\n +
\n +
/body\n +
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE?rev=1428969r1=1428968r2=1428969view=diff
==
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE Fri Jan 4 16:45:13 2013
@@ -1,5 +1,5 @@
Apache Tomcat JDBC Pool
-Copyright 2008-2012 The Apache Software Foundation
+Copyright 2008-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl?rev=1428969r1=1428968r2=1428969view=diff
==
---
svn commit: r1428973 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/tribes/ webapps/manager/WEB-INF/jsp/
Author: kkolinko
Date: Fri Jan 4 16:53:02 2013
New Revision: 1428973
URL: http://svn.apache.org/viewvc?rev=1428973view=rev
Log:
s/2012/2013/g
Modified:
tomcat/tc6.0.x/trunk/NOTICE
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Modified: tomcat/tc6.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=1428973r1=1428972r2=1428973view=diff
==
--- tomcat/tc6.0.x/trunk/NOTICE (original)
+++ tomcat/tc6.0.x/trunk/NOTICE Fri Jan 4 16:53:02 2013
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
+Copyright 1999-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1428973r1=1428972r2=1428973view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri
Jan 4 16:53:02 2013
@@ -182,7 +182,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em +
+ emCopyright copy; 1999-2013, Apache Software Foundation/em +
/font/center\n +
\n +
/body\n +
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1428973r1=1428972r2=1428973view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Fri Jan 4 16:53:02 2013
@@ -676,7 +676,7 @@ public final class HTMLManagerServlet ex
* @see javax.servlet.Servlet#getServletInfo()
*/
public String getServletInfo() {
-return HTMLManagerServlet, Copyright (c) 1999-2012, The Apache
Software Foundation;
+return HTMLManagerServlet, Copyright (c) 1999-2013, The Apache
Software Foundation;
}
/**
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1428973r1=1428972r2=1428973view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
Fri Jan 4 16:53:02 2013
@@ -186,7 +186,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
hr size=\1\ noshade=\noshade\\n +
centerfont size=\-1\ color=\#525D76\\n +
- emCopyright copy; 1999-2012, Apache Software Foundation/em +
+ emCopyright copy; 1999-2013, Apache Software Foundation/em +
/font/center\n +
\n +
/body\n +
Modified: tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl?rev=1428973r1=1428972r2=1428973view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl Fri Jan 4
16:53:02 2013
@@ -182,7 +182,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 1999-2012, Apache Software Foundation
+Copyright #169; 1999-2013, Apache Software Foundation
/em/font/div
/td/tr
Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1428973r1=1428972r2=1428973view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
(original)
+++
svn commit: r1428977 - in /tomcat/site/trunk/xdocs: legal.xml stylesheets/tomcat-site.xsl stylesheets/tomcat.css
Author: kkolinko
Date: Fri Jan 4 16:57:22 2013
New Revision: 1428977
URL: http://svn.apache.org/viewvc?rev=1428977view=rev
Log:
s/2012/2013/g
Modified:
tomcat/site/trunk/xdocs/legal.xml
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
tomcat/site/trunk/xdocs/stylesheets/tomcat.css
Modified: tomcat/site/trunk/xdocs/legal.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1428977r1=1428976r2=1428977view=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Fri Jan 4 16:57:22 2013
@@ -11,7 +11,7 @@
section name=Legal Stuff They Make Us Say
p
-All material on this website is Copyright #169; 1999-2012, The Apache
+All material on this website is Copyright #169; 1999-2013, The Apache
Software Foundation
/p
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1428977r1=1428976r2=1428977view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Fri Jan 4 16:57:22 2013
@@ -135,7 +135,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 1999-2012, The Apache Software Foundation
+Copyright #169; 1999-2013, The Apache Software Foundation
br/
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache
Tomcat
project logo are trademarks of the Apache Software Foundation.
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=1428977r1=1428976r2=1428977view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Fri Jan 4 16:57:22 2013
@@ -1,5 +1,5 @@
/*
-* Copyright 2002-2012 The Apache Software Foundation
+* Copyright 2002-2013 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1428985 - in /tomcat/site/trunk: README.txt build.properties.default build.xml
Author: kkolinko
Date: Fri Jan 4 17:04:58 2013
New Revision: 1428985
URL: http://svn.apache.org/viewvc?rev=1428985view=rev
Log:
Remove support for Tomcat 5 from the site build script
Modified:
tomcat/site/trunk/README.txt
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1428985r1=1428984r2=1428985view=diff
==
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Fri Jan 4 17:04:58 2013
@@ -61,7 +61,7 @@ reflected on the live tomcat.apache.org
immediately, so go to http://tomcat.apache.org/ and have fun.
-To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x:
+To update the documentation for Tomcat 6.0.x or 7.0.x:
==
1. If you are using the sparse checkout feature, make sure that
@@ -71,7 +71,6 @@ To update the documentation for Tomcat 5
The commands are:
cd tomcat-site
- svn up --set-depth infinity docs/tomcat-5.5-doc
svn up --set-depth infinity docs/tomcat-6.0-doc
svn up --set-depth infinity docs/tomcat-7.0-doc
@@ -92,7 +91,6 @@ To update the documentation for Tomcat 5
The commands are:
cd tomcat-site
- ant release-5
ant release-6
ant release-7
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1428985r1=1428984r2=1428985view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Fri Jan 4 17:04:58 2013
@@ -36,7 +36,6 @@ tomcat.loc=http://www.apache.org/dist/to
# - Tomcat versions -
-tomcat55=5.5.36
tomcat60=6.0.36
tomcat70=7.0.34
@@ -45,9 +44,6 @@ tomcat70=7.0.34
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
# - Tomcat Docs locations -
-tomcat55.loc=${tomcat.loc}/tomcat-5/v${tomcat55}/bin/apache-tomcat-${tomcat55}-fulldocs.tar.gz
-tomcat55.home=${tomcat-site-docs.home}/${tomcat55}
-
tomcat60.loc=${tomcat.loc}/tomcat-6/v${tomcat60}/bin/apache-tomcat-${tomcat60}-fulldocs.tar.gz
tomcat60.home=${tomcat-site-docs.home}/${tomcat60}
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1428985r1=1428984r2=1428985view=diff
==
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Fri Jan 4 17:04:58 2013
@@ -22,7 +22,6 @@
property name=faq.src location=xdocs-faq/
property name=faq.dest location=${docs.dest}/faq/
- !-- Requires JDK 1.4 --
target name=docs
description=Render HTML Pages via XSLT
@@ -86,28 +85,6 @@
/target
- target name=release-5
- depends=docs
- description=Used after a release to update the docs for Tomcat 5.5
-
-!-- Download the latest version --
-antcall target=downloadgz
- param name=sourcefile value=${tomcat55.loc}/
- param name=destfile
value=${tomcat55.home}/tomcat-5.5-doc/index.html/
- param name=destdir value=${tomcat55.home}/
-/antcall
-
-!-- Delete the old version --
-delete dir=${docs.dest}/tomcat-5.5-doc/
-
-!-- Copy the latest version --
-copy todir=${docs.dest}/tomcat-5.5-doc
- fileset dir=${tomcat55.home}/tomcat-5.5-doc
-exclude name=/WEB-INF/** /
- /fileset
-/copy
- /target
-
target name=release-6
depends=docs
description=Used after a release to update the docs for Tomcat 6.0
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1428988 - in /tomcat/site/trunk: ./ docs/ docs/stylesheets/
Author: kkolinko Date: Fri Jan 4 17:10:55 2013 New Revision: 1428988 URL: http://svn.apache.org/viewvc?rev=1428988view=rev Log: Regenerate the site after year update Several pages (such as ci.html) still had Tomcat 5.5 in their menus. It is now fixed. Fix indent in README.txt Modified: tomcat/site/trunk/README.txt tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/stylesheets/tomcat.css tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1428988r1=1428987r2=1428988view=diff == --- tomcat/site/trunk/README.txt (original) +++ tomcat/site/trunk/README.txt Fri Jan 4 17:10:55 2013 @@ -40,7 +40,7 @@ Sparse checkout: Once you have the site checked out locally, cd into your tomcat-site directory and execute: -ant + ant This will build the documentation from xdocs/ into the docs/ directory. The output will show you which files got re-generated. Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1428988r1=1428987r2=1428988view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Fri Jan 4 17:10:55 2013 @@ -1174,7 +1174,7 @@ See a href=security.htmlSecurity Rep td colspan=2 div align=center font color=#525D76 size=-1em -Copyright copy; 1999-2012, The Apache Software Foundation +Copyright copy; 1999-2013, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1428988r1=1428987r2=1428988view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Jan 4 17:10:55 2013 @@ -59,9 +59,6 @@ a href=./download-60.cgiTomcat 6.0/a /li li -a href=./download-55.cgiTomcat 5.5/a -/li -li a href=./download-connectors.cgiTomcat Connectors/a /li li @@ -82,9 +79,6 @@ a href=./tomcat-6.0-doc/index.htmlTomcat 6.0/a /li li -a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a -/li -li a href=./connectors-doc/Tomcat Connectors/a /li li @@ -1093,7 +1087,7 @@ on the Gump project page. Links to them td colspan=2 div align=center font color=#525D76 size=-1em -Copyright copy; 1999-2012, The Apache Software Foundation +Copyright copy; 1999-2013, The Apache Software Foundation br Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1428988r1=1428987r2=1428988view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Fri Jan 4 17:10:55 2013 @@ -59,9 +59,6 @@ a href=./download-60.cgiTomcat 6.0/a /li li -a href=./download-55.cgiTomcat 5.5/a -/li -li a href=./download-connectors.cgiTomcat Connectors/a /li li @@ -82,9 +79,6 @@ a href=./tomcat-6.0-doc/index.htmlTomcat 6.0/a /li li -a href=./tomcat-5.5-doc/index.htmlTomcat 5.5/a -/li -li a
svn commit: r1428993 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Author: kkolinko
Date: Fri Jan 4 17:32:18 2013
New Revision: 1428993
URL: http://svn.apache.org/viewvc?rev=1428993view=rev
Log:
Review of r1428643
Align implememntation between IS_SECURITY_ENABLED true and false branches
(essentially add i18n to the IS_SECURITY_ENABLED==true branch).
Add the same fix to setFilterDef(null), though I think nobody passes null
filterDef to that method.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1428993r1=1428992r2=1428993view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri
Jan 4 17:32:18 2013
@@ -301,23 +301,22 @@ public final class ApplicationFilterConf
if (this.filter != null)
{
-if (Globals.IS_SECURITY_ENABLED) {
-try {
-SecurityUtil.doAsPrivilege(destroy, filter);
-} catch(java.lang.Exception ex){
-
context.getLogger().error(ApplicationFilterConfig.doAsPrivilege, ex);
-}
-SecurityUtil.remove(filter);
-} else {
-try {
+try {
+if (Globals.IS_SECURITY_ENABLED) {
+try {
+SecurityUtil.doAsPrivilege(destroy, filter);
+} finally {
+SecurityUtil.remove(filter);
+}
+} else {
filter.destroy();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-context.getLogger().error(sm.getString(
-applicationFilterConfig.release,
-filterDef.getFilterName(),
-filterDef.getFilterClass()), t);
}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+context.getLogger().error(sm.getString(
+applicationFilterConfig.release,
+filterDef.getFilterName(),
+filterDef.getFilterClass()), t);
}
if (!context.getIgnoreAnnotations()) {
try {
@@ -357,20 +356,28 @@ public final class ApplicationFilterConf
IllegalAccessException, InstantiationException,
ServletException, InvocationTargetException, NamingException {
+FilterDef oldFilterDef = this.filterDef;
this.filterDef = filterDef;
if (filterDef == null) {
// Release any previously allocated filter instance
if (this.filter != null){
-if (Globals.IS_SECURITY_ENABLED) {
-try{
-SecurityUtil.doAsPrivilege(destroy, filter);
-} catch(java.lang.Exception ex){
-
context.getLogger().error(ApplicationFilterConfig.doAsPrivilege, ex);
+try {
+if (Globals.IS_SECURITY_ENABLED) {
+try{
+SecurityUtil.doAsPrivilege(destroy, filter);
+} finally {
+SecurityUtil.remove(filter);
+}
+} else {
+filter.destroy();
}
-SecurityUtil.remove(filter);
-} else {
-filter.destroy();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+context.getLogger().error(sm.getString(
+applicationFilterConfig.release,
+oldFilterDef.getFilterName(),
+oldFilterDef.getFilterClass()), t);
}
if (!context.getIgnoreAnnotations()) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Seeking guidance on use of apache commons classes
On 29/11/12 16:11, Brian Burch wrote: On 29/11/12 14:37, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=54190 Re: [Bug 54190] TestNonLoginAndBasicAuthenticator does not test session timeout properly Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- snip/ If you start looking at the TODOs, I suggest you take a look at org.apache.tomcat.util.http.parser.HttpParser#parseAuthorizationDigest() I suspect a new parseAuthorizationBasic() method is the way to go as that should handle the various whitespace issues noted. Noted. Assume that I will look into it unless you hear otherwise. I won't open a bug against BasicAuthenticator yet. My motive is the original thread above, but my question has a wider scope. I have started a new thread, even if it doesn't run far, just to make it easier for others to find. I started looking at Mark's suggestion and got a long way with the change. Currently, BasicAuthenticator.authenticate uses org.apache.catalina.util.Base64.decode(ByteChunk,CharChunk). I decided to follow the pattern used by DigestAuthenticator and create a new method org.apache.tomcat.util.http.parser.HttpParser.parseAuthorizationBasic(StringReader). Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. It didn't take me long to find org.apache.commons.codec.binary.Base64.Base64, which has all the right methods to make my own change lightweight and in need of fewer unit tests. I then started hacking the build to use the commons Base64 jar as an external dependency. Unfortunately, that turned out to be more difficult than I expected, and I haven't yet finished the job. I had a lot of non-tomcat priorities and have only just gone back to my work-in-progress. Before I go any further, I would like to find out what the general policy is in this sort of situation: 1. we have code that uses a tomcat-specific utility class that has been stable for a long time. 2. The function of that class is similar, but not identical, to that of one in apache commons. Should we: a) extend the tomcat-specific utility class to provide methods for new logic that is not related to an important bugfix (effectively increasing the duplication of a commons class) or b) use the commons class for the new logic, but leave everything else unchanged (effectively having two classes performing similar tasks) or c) use the commons class and eliminate any redundant logic in tomcat-specific classes (our class wraps the commons class to provide extra functionality but no duplication of core logic) I'm happy to go in any of these 3 directions. My preference would be to use (b) initially, and follow up with (c) soon after. Is there a policy, or a generally held opinion? tia, Brian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Seeking guidance on use of apache commons classes
2013/1/4 Brian Burch br...@pingtoo.com: On 29/11/12 16:11, Brian Burch wrote: On 29/11/12 14:37, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=54190 Re: [Bug 54190] TestNonLoginAndBasicAuthenticator does not test session timeout properly Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- snip/ If you start looking at the TODOs, I suggest you take a look at org.apache.tomcat.util.http.parser.HttpParser#parseAuthorizationDigest() I suspect a new parseAuthorizationBasic() method is the way to go as that should handle the various whitespace issues noted. Noted. Assume that I will look into it unless you hear otherwise. I won't open a bug against BasicAuthenticator yet. My motive is the original thread above, but my question has a wider scope. I have started a new thread, even if it doesn't run far, just to make it easier for others to find. I started looking at Mark's suggestion and got a long way with the change. Currently, BasicAuthenticator.authenticate uses org.apache.catalina.util.Base64.decode(ByteChunk,CharChunk). I decided to follow the pattern used by DigestAuthenticator and create a new method org.apache.tomcat.util.http.parser.HttpParser.parseAuthorizationBasic(StringReader). Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. It didn't take me long to find org.apache.commons.codec.binary.Base64.Base64, which has all the right methods to make my own change lightweight and in need of fewer unit tests. I then started hacking the build to use the commons Base64 jar as an external dependency. Unfortunately, that turned out to be more difficult than I expected, and I haven't yet finished the job. I had a lot of non-tomcat priorities and have only just gone back to my work-in-progress. Before I go any further, I would like to find out what the general policy is in this sort of situation: 1. we have code that uses a tomcat-specific utility class that has been stable for a long time. 2. The function of that class is similar, but not identical, to that of one in apache commons. Should we: a) extend the tomcat-specific utility class to provide methods for new logic that is not related to an important bugfix (effectively increasing the duplication of a commons class) or b) use the commons class for the new logic, but leave everything else unchanged (effectively having two classes performing similar tasks) or c) use the commons class and eliminate any redundant logic in tomcat-specific classes (our class wraps the commons class to provide extra functionality but no duplication of core logic) I'm happy to go in any of these 3 directions. My preference would be to use (b) initially, and follow up with (c) soon after. Is there a policy, or a generally held opinion? The general rule is that Tomcat cannot directly use the commons library, as it might clash with such use in a web application. (Though if you need them for tests only, such a clash should not be a matter). Whenever we need classes from commons, we copy them into our source tree into a different package (usually with svn copy to preserve history). Mark usually removes unused code from the copy, leaving only those bits that are actually used by Tomcat. Examples: org.apache.tomcat.util.http.fileupload org.apache.tomcat.util.bcel org.apache.tomcat.util.digester Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. HTTP headers are converted from bytes to characters using ISO-8859-1 encoding. (Actually they should be 7-bit ASCII). This conversion is reversible. If all you need it for is a test method, I think I would just convert the string to bytes and use the existing API. Do you need to support a Reader there? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Seeking guidance on use of apache commons classes
On 04/01/2013 19:58, Konstantin Kolinko wrote: 2013/1/4 Brian Burch br...@pingtoo.com: On 29/11/12 16:11, Brian Burch wrote: Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. HTTP headers are converted from bytes to characters using ISO-8859-1 encoding. (Actually they should be 7-bit ASCII). This conversion is reversible. If all you need it for is a test method, I think I would just convert the string to bytes and use the existing API. Do you need to support a Reader there? Even in non-test code I'd be tempted to at least start with that approach. Anything that handles String is going to have to convert to bytes anyway. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429123 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Author: markt
Date: Fri Jan 4 20:55:34 2013
New Revision: 1429123
URL: http://svn.apache.org/viewvc?rev=1429123view=rev
Log:
Make HTTP DIGEST authentication header parsing tolerant of known buggy clients.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1429123r1=1429122r2=1429123view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Fri
Jan 4 20:55:34 2013
@@ -48,6 +48,7 @@ public class HttpParser {
private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING =
Integer.valueOf(2);
private static final Integer FIELD_TYPE_LHEX = Integer.valueOf(3);
private static final Integer FIELD_TYPE_QUOTED_LHEX = Integer.valueOf(4);
+private static final Integer FIELD_TYPE_QUOTED_TOKEN = Integer.valueOf(5);
private static final MapString,Integer fieldTypes = new HashMap();
@@ -64,7 +65,7 @@ public class HttpParser {
fieldTypes.put(algorithm, FIELD_TYPE_TOKEN);
fieldTypes.put(cnonce, FIELD_TYPE_QUOTED_STRING);
fieldTypes.put(opaque, FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put(qop, FIELD_TYPE_TOKEN);
+fieldTypes.put(qop, FIELD_TYPE_QUOTED_TOKEN);
fieldTypes.put(nc, FIELD_TYPE_LHEX);
// Setup the flag arrays
@@ -148,6 +149,10 @@ public class HttpParser {
// FIELD_TYPE_QUOTED_LHEX
value = readQuotedLhex(input);
break;
+case 5:
+// FIELD_TYPE_QUOTED_TOKEN
+value = readQuotedToken(input);
+break;
default:
// Error
throw new IllegalArgumentException(
@@ -346,6 +351,58 @@ public class HttpParser {
}
/**
+ * This is not defined in any RFC. It is a special case to handle data from
+ * buggy clients (known buggy clients include Microsoft IE 8 9, Apple
+ * Safari for OSX and iOS) that add quotes to values that should be tokens.
+ *
+ * @return the token if one was found, null if data other than a token or
+ * quoted token was found or null if the end of data was reached
+ * before a quoted token was terminated
+ */
+private static String readQuotedToken(StringReader input)
+throws IOException {
+
+StringBuilder result = new StringBuilder();
+boolean quoted = false;
+
+int c = input.read();
+
+// Skip lws
+while (c == 32 || c == 9) {
+c = input.read();
+}
+
+if (c == '') {
+quoted = true;
+} else if (c == -1) {
+return null;
+} else {
+result.append((char) c);
+}
+c = input.read();
+
+while (c != -1 isToken[c]) {
+result.append((char) c);
+c = input.read();
+}
+
+if (quoted) {
+if (c != '') {
+return null;
+}
+} else {
+// Skip back so non-token character is available for next read
+input.skip(-1);
+}
+
+if (c != -1 result.length() == 0) {
+return null;
+} else {
+return result.toString();
+}
+}
+
+/**
* Parses lower case hex but permits upper case hex to be used (converting
* it to lower case before returning).
*
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java?rev=1429123r1=1429122r2=1429123view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Fri Jan 4 20:55:34 2013
@@ -155,4 +155,53 @@ public class TestAuthorizationDigest {
Assert.assertNull(result);
}
+@Test
+public void testTokenQop() throws Exception {
+String header = Digest qop=auth;
+
+StringReader input = new StringReader(header);
+
+MapString,String result = HttpParser.parseAuthorizationDigest(input);
+Assert.assertEquals(auth, result.get(qop));
+}
+
+@Test
+public void testQuotedTokenQop() throws Exception {
+String header = Digest qop=\auth\;
+
+StringReader input = new StringReader(header);
+
+
svn commit: r1429124 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java webapps/docs/changelog.
Author: markt
Date: Fri Jan 4 21:01:00 2013
New Revision: 1429124
URL: http://svn.apache.org/viewvc?rev=1429124view=rev
Log:
Make HTTP DIGEST authentication header parsing tolerant of known buggy clients.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1429123
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1429124r1=1429123r2=1429124view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Fri Jan 4 21:01:00 2013
@@ -48,6 +48,7 @@ public class HttpParser {
private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING =
Integer.valueOf(2);
private static final Integer FIELD_TYPE_LHEX = Integer.valueOf(3);
private static final Integer FIELD_TYPE_QUOTED_LHEX = Integer.valueOf(4);
+private static final Integer FIELD_TYPE_QUOTED_TOKEN = Integer.valueOf(5);
private static final MapString,Integer fieldTypes =
new HashMapString,Integer();
@@ -65,7 +66,7 @@ public class HttpParser {
fieldTypes.put(algorithm, FIELD_TYPE_TOKEN);
fieldTypes.put(cnonce, FIELD_TYPE_QUOTED_STRING);
fieldTypes.put(opaque, FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put(qop, FIELD_TYPE_TOKEN);
+fieldTypes.put(qop, FIELD_TYPE_QUOTED_TOKEN);
fieldTypes.put(nc, FIELD_TYPE_LHEX);
// Setup the flag arrays
@@ -149,6 +150,10 @@ public class HttpParser {
// FIELD_TYPE_QUOTED_LHEX
value = readQuotedLhex(input);
break;
+case 5:
+// FIELD_TYPE_QUOTED_TOKEN
+value = readQuotedToken(input);
+break;
default:
// Error
throw new IllegalArgumentException(
@@ -348,6 +353,58 @@ public class HttpParser {
}
/**
+ * This is not defined in any RFC. It is a special case to handle data from
+ * buggy clients (known buggy clients include Microsoft IE 8 9, Apple
+ * Safari for OSX and iOS) that add quotes to values that should be tokens.
+ *
+ * @return the token if one was found, null if data other than a token or
+ * quoted token was found or null if the end of data was reached
+ * before a quoted token was terminated
+ */
+private static String readQuotedToken(StringReader input)
+throws IOException {
+
+StringBuilder result = new StringBuilder();
+boolean quoted = false;
+
+int c = input.read();
+
+// Skip lws
+while (c == 32 || c == 9) {
+c = input.read();
+}
+
+if (c == '') {
+quoted = true;
+} else if (c == -1) {
+return null;
+} else {
+result.append((char) c);
+}
+c = input.read();
+
+while (c != -1 isToken[c]) {
+result.append((char) c);
+c = input.read();
+}
+
+if (quoted) {
+if (c != '') {
+return null;
+}
+} else {
+// Skip back so non-token character is available for next read
+input.skip(-1);
+}
+
+if (c != -1 result.length() == 0) {
+return null;
+} else {
+return result.toString();
+}
+}
+
+/**
* Parses lower case hex but permits upper case hex to be used (converting
* it to lower case before returning).
*
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java?rev=1429124r1=1429123r2=1429124view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Fri Jan 4 21:01:00 2013
@@ -155,4 +155,53 @@ public class TestAuthorizationDigest {
Assert.assertNull(result);
}
+@Test
+public void testTokenQop() throws Exception {
+String header = Digest qop=auth;
+
+StringReader input = new
[Bug 54338] Class cast exception in tagPlugin Set generated code
https://issues.apache.org/bugzilla/show_bug.cgi?id=54338 Mark Thomas ma...@apache.org changed: What|Removed |Added Attachment #29786|application/octet-stream|text/plain mime type|| -- 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
[Bug 54338] Class cast exception in tagPlugin Set generated code
https://issues.apache.org/bugzilla/show_bug.cgi?id=54338 --- Comment #4 from Mark Thomas ma...@apache.org --- It is not a question of what is appropriate or what is best, the JSTL specification requires that an EL coerce is used. I'm looking at this now. The test case is going to need some work. -- 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3720 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1429123 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1429153 - /tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
Author: markt
Date: Fri Jan 4 22:04:04 2013
New Revision: 1429153
URL: http://svn.apache.org/viewvc?rev=1429153view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54338
Correctly coerce the value to the expected type when using the tag plug-in for
the JSTL set tag
Modified:
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java?rev=1429153r1=1429152r2=1429153view=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java Fri Jan
4 22:04:04 2013
@@ -144,7 +144,7 @@ public class Set implements TagPlugin {
//invoke the method through the reflection
ctxt.generateJavaSource(if( + resultName +
!= null){);
-ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new Object[]{( + methodName +
.getParameterTypes()[0]).cast( + resultName + )}););
+ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new
Object[]{org.apache.el.lang.ELSupport.coerceToType( + resultName + , +
methodName + .getParameterTypes()[0])}););
ctxt.generateJavaSource(}else{);
ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new Object[]{null}););
ctxt.generateJavaSource(});
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429156 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/tagplugins/jstl/core/Set.java webapps/docs/changelog.xml
Author: markt
Date: Fri Jan 4 22:08:43 2013
New Revision: 1429156
URL: http://svn.apache.org/viewvc?rev=1429156view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54338
Correctly coerce the value to the expected type when using the tag plug-in for
the JSTL set tag. Patch provided by Sheldon Shao.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1429153
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java?rev=1429156r1=1429155r2=1429156view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
Fri Jan 4 22:08:43 2013
@@ -144,7 +144,7 @@ public class Set implements TagPlugin {
//invoke the method through the reflection
ctxt.generateJavaSource(if( + resultName +
!= null){);
-ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new Object[]{( + methodName +
.getParameterTypes()[0]).cast( + resultName + )}););
+ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new
Object[]{org.apache.el.lang.ELSupport.coerceToType( + resultName + , +
methodName + .getParameterTypes()[0])}););
ctxt.generateJavaSource(}else{);
ctxt.generateJavaSource( + methodName +
.invoke( + targetName + , new Object[]{null}););
ctxt.generateJavaSource(});
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=1429156r1=1429155r2=1429156view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jan 4 22:08:43 2013
@@ -104,6 +104,11 @@
bug54370/bug: Improve handling of nulls when trying to match sets
of
parameters to a method in EL. (markt)
/fix
+ fix
+bug54338/bug: Correctly coerce the value to the expected type when
+using the tag plug-in for the JSTL set tag. Patch provided by Sheldon
+Shao. (markt)
+ /fix
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54338] Class cast exception in tagPlugin Set generated code
https://issues.apache.org/bugzilla/show_bug.cgi?id=54338 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas ma...@apache.org --- Many thanks for the patch. It has been applied to trunk and 7.0.x and will be included in 7.0.35 onwards. I added a different test case to trunk that tests that the coercion works rather than tests the source code for a particular string. Note that the trunk tests for the tag plug-ins depend on the new resources implementation so they have not been back-ported to 7.0.x. -- 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
[Bug 54340] Form-based authentication + url rewriting does not work
https://issues.apache.org/bugzilla/show_bug.cgi?id=54340 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Mark Thomas ma...@apache.org --- *** This bug has been marked as a duplicate of bug 53584 *** -- 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
[Bug 53584] Forms authentication without cookies requires double submission in 6.0.33
https://issues.apache.org/bugzilla/show_bug.cgi?id=53584 Mark Thomas ma...@apache.org changed: What|Removed |Added CC||k...@emweb.be --- Comment #4 from Mark Thomas ma...@apache.org --- *** Bug 54340 has been marked as a duplicate of this bug. *** -- 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
[Bug 54361] Deploy release zip to Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=54361 --- Comment #2 from Mark Thomas ma...@apache.org --- Putting full binaries in a Maven repo still seems wrong to me. That said, managing the central repo is not my problem and - based on the presence of a number of binaries for a range of projects in the central repo - the folks that do maintain it appear to be quite happy with full binaries being added. Since the repo is happy hosting full binaries and there are folks that want them I have no objection to adding this to our build process. If they are going to be published, better they are published by the Tomcat PMC than a.n. other random person/org. I'll take a look at the patch. -- 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
[Bug 54361] Deploy release zip to Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=54361 Mark Thomas ma...@apache.org changed: What|Removed |Added Attachment #29799|0 |1 is patch|| Attachment #29799|application/octet-stream|text/plain mime type|| --- Comment #3 from Mark Thomas ma...@apache.org --- Comment on attachment 29799 -- https://issues.apache.org/bugzilla/attachment.cgi?id=29799 Very rough cut of something that might work (not verified) Is there a reason so many folks add patches as application/octet-stream rather than plain/text and don't tick the patch checkbox? I seem to find myself tweaking attachment details more often than not. -- 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
[OT] Patch mime-type in Bugzilla (was: Bug 54361)
2013/1/5 bugzi...@apache.org: https://issues.apache.org/bugzilla/show_bug.cgi?id=54361 Mark Thomas ma...@apache.org changed: What|Removed |Added Attachment #29799|0 |1 is patch|| Attachment #29799|application/octet-stream|text/plain mime type|| Is there a reason so many folks add patches as application/octet-stream rather than plain/text and don't tick the patch checkbox? I seem to find myself tweaking attachment details more often than not. As far as I noticed, (a) If you add attachment to an existing bug, you are prompted to select a mime-type for it and there is a checkbox to say that this is a patch (b) If you are creating a new bug and choose to add an attachment to it, you cannot choose its mime-type. There is no such field in that dialog. So in case of (b) you can only rely on auto-detection. This auto-detection is faulty at times, though for me in many times it worked successfully when I named my file as *.patch. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/3721 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1429155 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1429167 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Author: kkolinko
Date: Fri Jan 4 23:13:00 2013
New Revision: 1429167
URL: http://svn.apache.org/viewvc?rev=1429167view=rev
Log:
Further review of ApplicationFilterConfig.
Inline the setFilterDef() method.
In the constructor the filterDef is never null and there is no need to care
about destroying a filter. Thus the code is simplier.
The method was package-visible, thus there should not be any 3rd party callers.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1429167r1=1429166r2=1429167view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri
Jan 4 23:13:00 2013
@@ -101,8 +101,11 @@ public final class ApplicationFilterConf
super();
this.context = context;
-setFilterDef(filterDef);
-if (filterDef.getFilter() != null) {
+this.filterDef = filterDef;
+// Allocate a new filter instance if necessary
+if (filterDef.getFilter() == null) {
+getFilter();
+} else {
this.filter = filterDef.getFilter();
getInstanceManager().newInstance(filter);
initFilter();
@@ -128,7 +131,7 @@ public final class ApplicationFilterConf
/**
* The codeFilterDef/code that defines our associated Filter.
*/
-private FilterDef filterDef = null;
+private final FilterDef filterDef;
/**
* the InstanceManager used to create and destroy filter instances.
@@ -334,74 +337,6 @@ public final class ApplicationFilterConf
}
-/**
- * Set the filter definition we are configured for. This has the side
- * effect of instantiating an instance of the corresponding filter class.
- *
- * @param filterDef The new filter definition
- *
- * @exception ClassCastException if the specified class does not implement
- * the codejavax.servlet.Filter/code interface
- * @exception ClassNotFoundException if the filter class cannot be found
- * @exception IllegalAccessException if the filter class cannot be
- * publicly instantiated
- * @exception InstantiationException if an exception occurs while
- * instantiating the filter object
- * @exception ServletException if thrown by the filter's init() method
- * @throws NamingException
- * @throws InvocationTargetException
- */
-void setFilterDef(FilterDef filterDef)
-throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException,
- ServletException, InvocationTargetException, NamingException {
-
-FilterDef oldFilterDef = this.filterDef;
-this.filterDef = filterDef;
-if (filterDef == null) {
-
-// Release any previously allocated filter instance
-if (this.filter != null){
-try {
-if (Globals.IS_SECURITY_ENABLED) {
-try{
-SecurityUtil.doAsPrivilege(destroy, filter);
-} finally {
-SecurityUtil.remove(filter);
-}
-} else {
-filter.destroy();
-}
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-context.getLogger().error(sm.getString(
-applicationFilterConfig.release,
-oldFilterDef.getFilterName(),
-oldFilterDef.getFilterClass()), t);
-}
-if (!context.getIgnoreAnnotations()) {
-try {
-((StandardContext)
context).getInstanceManager().destroyInstance(this.filter);
-} catch (Exception e) {
-Throwable t = ExceptionUtils
-.unwrapInvocationTargetException(e);
-ExceptionUtils.handleThrowable(t);
-
context.getLogger().error(ApplicationFilterConfig.preDestroy, t);
-}
-}
-}
-this.filter = null;
-
-} else {
-// Allocate a new filter instance if necessary
-if (filterDef.getFilter() == null) {
-getFilter();
-}
-}
-
-}
-
-
// Private Methods
private InstanceManager getInstanceManager() {
-
To unsubscribe, e-mail:
Re: Seeking guidance on use of apache commons classes
On 04/01/13 19:58, Konstantin Kolinko wrote: 2013/1/4 Brian Burch br...@pingtoo.com: On 29/11/12 16:11, Brian Burch wrote: On 29/11/12 14:37, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=54190 Re: [Bug 54190] TestNonLoginAndBasicAuthenticator does not test session timeout properly Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Mark Thomas ma...@apache.org --- snip/ If you start looking at the TODOs, I suggest you take a look at org.apache.tomcat.util.http.parser.HttpParser#parseAuthorizationDigest() I suspect a new parseAuthorizationBasic() method is the way to go as that should handle the various whitespace issues noted. Noted. Assume that I will look into it unless you hear otherwise. I won't open a bug against BasicAuthenticator yet. My motive is the original thread above, but my question has a wider scope. I have started a new thread, even if it doesn't run far, just to make it easier for others to find. I started looking at Mark's suggestion and got a long way with the change. Currently, BasicAuthenticator.authenticate uses org.apache.catalina.util.Base64.decode(ByteChunk,CharChunk). I decided to follow the pattern used by DigestAuthenticator and create a new method org.apache.tomcat.util.http.parser.HttpParser.parseAuthorizationBasic(StringReader). Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. It didn't take me long to find org.apache.commons.codec.binary.Base64.Base64, which has all the right methods to make my own change lightweight and in need of fewer unit tests. I then started hacking the build to use the commons Base64 jar as an external dependency. Unfortunately, that turned out to be more difficult than I expected, and I haven't yet finished the job. I had a lot of non-tomcat priorities and have only just gone back to my work-in-progress. Before I go any further, I would like to find out what the general policy is in this sort of situation: 1. we have code that uses a tomcat-specific utility class that has been stable for a long time. 2. The function of that class is similar, but not identical, to that of one in apache commons. Should we: a) extend the tomcat-specific utility class to provide methods for new logic that is not related to an important bugfix (effectively increasing the duplication of a commons class) or b) use the commons class for the new logic, but leave everything else unchanged (effectively having two classes performing similar tasks) or c) use the commons class and eliminate any redundant logic in tomcat-specific classes (our class wraps the commons class to provide extra functionality but no duplication of core logic) I'm happy to go in any of these 3 directions. My preference would be to use (b) initially, and follow up with (c) soon after. Is there a policy, or a generally held opinion? The general rule is that Tomcat cannot directly use the commons library, as it might clash with such use in a web application. (Though if you need them for tests only, such a clash should not be a matter). Whenever we need classes from commons, we copy them into our source tree into a different package (usually with svn copy to preserve history). Mark usually removes unused code from the copy, leaving only those bits that are actually used by Tomcat. Examples: org.apache.tomcat.util.http.fileupload org.apache.tomcat.util.bcel org.apache.tomcat.util.digester Once I got there, I discovered that org.apache.catalina.util.Base64 doesn't currently have any methods to decode a StringReader or String object. HTTP headers are converted from bytes to characters using ISO-8859-1 encoding. (Actually they should be 7-bit ASCII). This conversion is reversible. If all you need it for is a test method, I think I would just convert the string to bytes and use the existing API. Do you need to support a Reader there? In fact, the change is not aimed at test code - it will be used by BasicAuthenticator, although there will also be new tests for the parser method too. Thanks very much for your helpful explanation. I understand the reasons, but I had not thought about the problem that way before - it is almost the opposite of my intuition. I had thought the dependent jars section of the tomcat build was a kind of prototype of maven dependencies, and so assumed that more external dependencies would be a good thing because it would eliminate duplicate code. It is interesting to be shown a valid counter-argument. I will back out the work I've done already to use commons, and proceed with an extension to the org.apache.catalina.util.Base64 class.
svn commit: r1429172 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationFilterConfig.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Jan 5 00:07:05 2013
New Revision: 1429172
URL: http://svn.apache.org/viewvc?rev=1429172view=rev
Log:
Merged revisions r1428993 r1429167 from tomcat/trunk:
Followup to r1428645
1. in ApplicationFilterConfig.release():
Align implementation between IS_SECURITY_ENABLED==true and ==false branches.
(The difference is i18n and Error handling).
2. in ApplicationFilterConfig constructor and
ApplicationFilterConfig.setFilterDef() method:
Remove the setFilterDef() method and inline the code into the constructor.
(This avoids the need to fix the filter destruction code in setFilterDef()
which is actually never called).
The removed method has package visibility, so there should not be any 3rd-party
callers.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1428993,1429167
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1429172r1=1429171r2=1429172view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Sat Jan 5 00:07:05 2013
@@ -101,8 +101,11 @@ public final class ApplicationFilterConf
super();
this.context = context;
-setFilterDef(filterDef);
-if (filterDef.getFilter() != null) {
+this.filterDef = filterDef;
+// Allocate a new filter instance if necessary
+if (filterDef.getFilter() == null) {
+getFilter();
+} else {
this.filter = filterDef.getFilter();
getInstanceManager().newInstance(filter);
initFilter();
@@ -128,7 +131,7 @@ public final class ApplicationFilterConf
/**
* The codeFilterDef/code that defines our associated Filter.
*/
-private FilterDef filterDef = null;
+private final FilterDef filterDef;
/**
* the InstanceManager used to create and destroy filter instances.
@@ -301,23 +304,22 @@ public final class ApplicationFilterConf
if (this.filter != null)
{
-if (Globals.IS_SECURITY_ENABLED) {
-try {
-SecurityUtil.doAsPrivilege(destroy, filter);
-} catch(java.lang.Exception ex){
-
context.getLogger().error(ApplicationFilterConfig.doAsPrivilege, ex);
-}
-SecurityUtil.remove(filter);
-} else {
-try {
+try {
+if (Globals.IS_SECURITY_ENABLED) {
+try {
+SecurityUtil.doAsPrivilege(destroy, filter);
+} finally {
+SecurityUtil.remove(filter);
+}
+} else {
filter.destroy();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-context.getLogger().error(sm.getString(
-applicationFilterConfig.release,
-filterDef.getFilterName(),
-filterDef.getFilterClass()), t);
}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+context.getLogger().error(sm.getString(
+applicationFilterConfig.release,
+filterDef.getFilterName(),
+filterDef.getFilterClass()), t);
}
if (!context.getIgnoreAnnotations()) {
try {
@@ -335,66 +337,6 @@ public final class ApplicationFilterConf
}
-/**
- * Set the filter definition we are configured for. This has the side
- * effect of instantiating an instance of the corresponding filter class.
- *
- * @param filterDef The new filter definition
- *
- * @exception ClassCastException if the specified class does not implement
- * the codejavax.servlet.Filter/code interface
- * @exception ClassNotFoundException if the filter class cannot be found
- * @exception IllegalAccessException if the filter class cannot be
- * publicly instantiated
- * @exception InstantiationException if an exception occurs while
- * instantiating the filter object
- * @exception ServletException if thrown by the filter's init() method
- * @throws NamingException
- * @throws InvocationTargetException
- */
-void setFilterDef(FilterDef filterDef)
-throws
svn commit: r1429173 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Author: kkolinko
Date: Sat Jan 5 00:38:08 2013
New Revision: 1429173
URL: http://svn.apache.org/viewvc?rev=1429173view=rev
Log:
When running with a SecurityManager, make sure that reference to a Servlet
instance is removed from a static cache when its init() or destroy() methods
fail.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1429173r1=1429172r2=1429173view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat Jan 5
00:38:08 2013
@@ -1210,13 +1210,20 @@ public class StandardWrapper extends Con
servlet);
if( Globals.IS_SECURITY_ENABLED) {
-
-Object[] args = new Object[]{(facade)};
-SecurityUtil.doAsPrivilege(init,
- servlet,
- classType,
- args);
-args = null;
+boolean success = false;
+try {
+Object[] args = new Object[] { facade };
+SecurityUtil.doAsPrivilege(init,
+ servlet,
+ classType,
+ args);
+success = true;
+} finally {
+if (!success) {
+// destroy() will not be called, thus clear the
reference now
+SecurityUtil.remove(servlet);
+}
+}
} else {
servlet.init(facade);
}
@@ -1412,9 +1419,12 @@ public class StandardWrapper extends Con
(InstanceEvent.BEFORE_DESTROY_EVENT, instance);
if( Globals.IS_SECURITY_ENABLED) {
-SecurityUtil.doAsPrivilege(destroy,
- instance);
-SecurityUtil.remove(instance);
+try {
+SecurityUtil.doAsPrivilege(destroy,
+ instance);
+} finally {
+SecurityUtil.remove(instance);
+}
} else {
instance.destroy();
}
@@ -1467,8 +1477,11 @@ public class StandardWrapper extends Con
while (!instancePool.isEmpty()) {
Servlet s = instancePool.pop();
if (Globals.IS_SECURITY_ENABLED) {
-SecurityUtil.doAsPrivilege(destroy, s);
-SecurityUtil.remove(instance);
+try {
+SecurityUtil.doAsPrivilege(destroy, s);
+} finally {
+SecurityUtil.remove(instance);
+}
} else {
s.destroy();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429179 - /tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Author: kkolinko
Date: Sat Jan 5 01:04:56 2013
New Revision: 1429179
URL: http://svn.apache.org/viewvc?rev=1429179view=rev
Log:
Simplify, as the method names are case-sensitive.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1429179r1=1429178r2=1429179view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Sat Jan 5
01:04:56 2013
@@ -339,22 +339,22 @@ public final class SecurityUtil{
*/
private static Method findMethod(Method[] methodsCache,
String methodName){
-if (methodName.equalsIgnoreCase(INIT_METHOD)
+if (methodName.equals(INIT_METHOD)
methodsCache[INIT] != null){
return methodsCache[INIT];
-} else if (methodName.equalsIgnoreCase(DESTROY_METHOD)
+} else if (methodName.equals(DESTROY_METHOD)
methodsCache[DESTROY] != null){
return methodsCache[DESTROY];
-} else if (methodName.equalsIgnoreCase(SERVICE_METHOD)
+} else if (methodName.equals(SERVICE_METHOD)
methodsCache[SERVICE] != null){
return methodsCache[SERVICE];
-} else if (methodName.equalsIgnoreCase(DOFILTER_METHOD)
+} else if (methodName.equals(DOFILTER_METHOD)
methodsCache[DOFILTER] != null){
return methodsCache[DOFILTER];
-} else if (methodName.equalsIgnoreCase(EVENT_METHOD)
+} else if (methodName.equals(EVENT_METHOD)
methodsCache[EVENT] != null){
return methodsCache[EVENT];
-} else if (methodName.equalsIgnoreCase(DOFILTEREVENT_METHOD)
+} else if (methodName.equals(DOFILTEREVENT_METHOD)
methodsCache[DOFILTEREVENT] != null){
return methodsCache[DOFILTEREVENT];
}
@@ -385,17 +385,17 @@ public final class SecurityUtil{
Method method =
targetObject.getClass().getMethod(methodName, targetType);
-if (methodName.equalsIgnoreCase(INIT_METHOD)){
+if (methodName.equals(INIT_METHOD)){
methodsCache[INIT] = method;
-} else if (methodName.equalsIgnoreCase(DESTROY_METHOD)){
+} else if (methodName.equals(DESTROY_METHOD)){
methodsCache[DESTROY] = method;
-} else if (methodName.equalsIgnoreCase(SERVICE_METHOD)){
+} else if (methodName.equals(SERVICE_METHOD)){
methodsCache[SERVICE] = method;
-} else if (methodName.equalsIgnoreCase(DOFILTER_METHOD)){
+} else if (methodName.equals(DOFILTER_METHOD)){
methodsCache[DOFILTER] = method;
-} else if (methodName.equalsIgnoreCase(EVENT_METHOD)){
+} else if (methodName.equals(EVENT_METHOD)){
methodsCache[EVENT] = method;
-} else if (methodName.equalsIgnoreCase(DOFILTEREVENT_METHOD)){
+} else if (methodName.equals(DOFILTEREVENT_METHOD)){
methodsCache[DOFILTEREVENT] = method;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429180 - /tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Author: kkolinko
Date: Sat Jan 5 01:10:57 2013
New Revision: 1429180
URL: http://svn.apache.org/viewvc?rev=1429180view=rev
Log:
Simplify. We are returning null on failure, so there is no need to check
whether it is not-null before returning it.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1429180r1=1429179r2=1429180view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Sat Jan 5
01:10:57 2013
@@ -339,23 +339,17 @@ public final class SecurityUtil{
*/
private static Method findMethod(Method[] methodsCache,
String methodName){
-if (methodName.equals(INIT_METHOD)
- methodsCache[INIT] != null){
+if (methodName.equals(INIT_METHOD)){
return methodsCache[INIT];
-} else if (methodName.equals(DESTROY_METHOD)
- methodsCache[DESTROY] != null){
+} else if (methodName.equals(DESTROY_METHOD)){
return methodsCache[DESTROY];
-} else if (methodName.equals(SERVICE_METHOD)
- methodsCache[SERVICE] != null){
+} else if (methodName.equals(SERVICE_METHOD)){
return methodsCache[SERVICE];
-} else if (methodName.equals(DOFILTER_METHOD)
- methodsCache[DOFILTER] != null){
+} else if (methodName.equals(DOFILTER_METHOD)){
return methodsCache[DOFILTER];
-} else if (methodName.equals(EVENT_METHOD)
- methodsCache[EVENT] != null){
+} else if (methodName.equals(EVENT_METHOD)){
return methodsCache[EVENT];
-} else if (methodName.equals(DOFILTEREVENT_METHOD)
- methodsCache[DOFILTEREVENT] != null){
+} else if (methodName.equals(DOFILTEREVENT_METHOD)){
return methodsCache[DOFILTEREVENT];
}
return null;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429182 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Author: kkolinko
Date: Sat Jan 5 01:33:20 2013
New Revision: 1429182
URL: http://svn.apache.org/viewvc?rev=1429182view=rev
Log:
Fix wrong argument of StandardWrapper.remove() in case when singleThreadModel
and instancePool are used.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1429182r1=1429181r2=1429182view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat Jan 5
01:33:20 2013
@@ -1480,7 +1480,7 @@ public class StandardWrapper extends Con
try {
SecurityUtil.doAsPrivilege(destroy, s);
} finally {
-SecurityUtil.remove(instance);
+SecurityUtil.remove(s);
}
} else {
s.destroy();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429186 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Jan 5 01:43:28 2013
New Revision: 1429186
URL: http://svn.apache.org/viewvc?rev=1429186view=rev
Log:
Merged revisions r1429173 r1429182 from tomcat/trunk:
Fix leak of servlet instances when running with SecurityManager:
a) In case when initServlet() or destroy() fail.
b) In case of a SingleThreadModel servlet. (fix wrong argument)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1429173,1429182
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1429186r1=1429185r2=1429186view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat
Jan 5 01:43:28 2013
@@ -1256,13 +1256,20 @@ public class StandardWrapper extends Con
servlet);
if( Globals.IS_SECURITY_ENABLED) {
-
-Object[] args = new Object[]{(facade)};
-SecurityUtil.doAsPrivilege(init,
- servlet,
- classType,
- args);
-args = null;
+boolean success = false;
+try {
+Object[] args = new Object[] { facade };
+SecurityUtil.doAsPrivilege(init,
+ servlet,
+ classType,
+ args);
+success = true;
+} finally {
+if (!success) {
+// destroy() will not be called, thus clear the
reference now
+SecurityUtil.remove(servlet);
+}
+}
} else {
servlet.init(facade);
}
@@ -1458,9 +1465,12 @@ public class StandardWrapper extends Con
(InstanceEvent.BEFORE_DESTROY_EVENT, instance);
if( Globals.IS_SECURITY_ENABLED) {
-SecurityUtil.doAsPrivilege(destroy,
- instance);
-SecurityUtil.remove(instance);
+try {
+SecurityUtil.doAsPrivilege(destroy,
+ instance);
+} finally {
+SecurityUtil.remove(instance);
+}
} else {
instance.destroy();
}
@@ -1513,8 +1523,11 @@ public class StandardWrapper extends Con
while (!instancePool.isEmpty()) {
Servlet s = instancePool.pop();
if (Globals.IS_SECURITY_ENABLED) {
-SecurityUtil.doAsPrivilege(destroy, s);
-SecurityUtil.remove(instance);
+try {
+SecurityUtil.doAsPrivilege(destroy, s);
+} finally {
+SecurityUtil.remove(s);
+}
} else {
s.destroy();
}
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=1429186r1=1429185r2=1429186view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jan 5 01:43:28 2013
@@ -78,6 +78,11 @@
Make HTTP Digest authentication header parsing tolerant of invalid
headers sent by known buggy clients. (markt)
/add
+ fix
+Fix memory leak of servlet instances when running with a
+SecurityManager and either init() or destroy() methods fail
+or the servlet is a SingleThreadModel one. (kkolinko)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429192 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jan 5 02:01:36 2013 New Revision: 1429192 URL: http://svn.apache.org/viewvc?rev=1429192view=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=1429192r1=1429191r2=1429192view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan 5 02:01:36 2013 @@ -130,3 +130,11 @@ PATCHES/ISSUES THAT ARE STALLED http://svn.apache.org/viewvc?view=revisionrevision=1380841 (Is one supposed to just copy the current version of websocket package from Tomcat 7 here?) + +* Fix memory leak of servlet instances when running with a + SecurityManager and either init() or destroy() methods fail + or the servlet is a SingleThreadModel one. + It is based on r1429186 + http://people.apache.org/~kkolinko/patches/2013-01-05_tc6_SecurityUtil_remove.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
