svn commit: r9627 - /dev/tomcat/tomcat-7/v7.0.63/ /release/tomcat/tomcat-7/v7.0.63/
Author: violetagg Date: Mon Jul 6 08:41:10 2015 New Revision: 9627 Log: Release Tomcat 7.0.63 Added: release/tomcat/tomcat-7/v7.0.63/ - copied from r9626, dev/tomcat/tomcat-7/v7.0.63/ Removed: dev/tomcat/tomcat-7/v7.0.63/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689357 - /tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Author: markt
Date: Mon Jul 6 10:26:14 2015
New Revision: 1689357
URL: http://svn.apache.org/r1689357
Log:
Better test name
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java?rev=1689357r1=1689356r2=1689357view=diff
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Mon Jul 6 10:26:14 2015
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.buf.ByteCh
public class TestFileResource extends TomcatBaseTest {
@Test
-public void doIt() throws Exception {
+public void testGetCodePath() throws Exception {
getTomcatInstanceTestWebapp(false, true);
ByteChunk out = new ByteChunk();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689358 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ test/webapp/WEB-INF/classes/org/ test/webapp/WEB-INF/classes/org/apach
Author: markt Date: Mon Jul 6 10:29:46 2015 New Revision: 1689358 URL: http://svn.apache.org/r1689358 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58096 Ensure that the correct codeBase is returned for classes loaded from WEB-INF/classes Added: tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResource.java - copied, changed from r1689346, tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/classes/org/ - copied from r1689346, tomcat/trunk/test/webapp/WEB-INF/classes/org/ tomcat/tc8.0.x/trunk/test/webapp/bug5/bug58096.jsp - copied unchanged from r1689346, tomcat/trunk/test/webapp/bug5/bug58096.jsp Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 6 10:29:46 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
svn commit: r1689350 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/Cache.java webapps/docs/changelog.xml
Author: markt Date: Mon Jul 6 09:45:25 2015 New Revision: 1689350 URL: http://svn.apache.org/r1689350 Log: Ensure only the classes and lib directory are excluded from the cache Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 6 09:45:25 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,1687268,168734 0,1688563,1688841,1688878,165,1688896,1688901
[Bug 58096] Incorrect CodeSource location from ProtectionDomain for classes in WEB-INF/classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58096 Mark Thomas ma...@apache.org changed: What|Removed |Added Product|Tomcat 8|Tomcat 7 Component|Catalina|Catalina Target Milestone||--- --- Comment #3 from Mark Thomas ma...@apache.org --- Thanks for the patch. I took a slightly different approach which was to use getURL() on the resource obtained for /WEB-INF/classes/. The fix has been applied to trunk (for 9.0.x) and to 8.0.x for 8.0.25 onwards. 7.0.x will need a different fix since it uses a different resources implementation. -- 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 58105] Incorrect access log messages
https://bz.apache.org/bugzilla/show_bug.cgi?id=58105 --- Comment #2 from Mark Thomas ma...@apache.org --- Any idea what triggers these? -- 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
[Tomcat Wiki] Update of ReleaseProcess by VioletaGeorgieva
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The ReleaseProcess page has been changed by VioletaGeorgieva: https://wiki.apache.org/tomcat/ReleaseProcess?action=diffrev1=11rev2=12 * Update the release date in the changelog to the date the files were copied to the the release area in -mm-dd format.BRE.g. released 2013-05-03 (for stable versions), beta, 2007-02-08 (for betas). * Add the version number in Bugzilla * Drop the artifacts for the previous release from https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/ + * Add release data (version and date) to reporter.apache.org - https://reporter.apache.org/addrelease.html?tomcat == If the vote does not pass == - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689345 - /tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Author: markt
Date: Mon Jul 6 09:23:42 2015
New Revision: 1689345
URL: http://svn.apache.org/r1689345
Log:
Ensure only the classes and lib directory are excluded from the cache
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1689345r1=1689344r2=1689345view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Mon Jul 6
09:23:42 2015
@@ -205,8 +205,8 @@ public class Cache {
private boolean noCache(String path) {
// Don't cache resources used by the class loader (it has its own
cache)
-if (path.startsWith(/WEB-INF/classes) ||
-path.startsWith(/WEB-INF/lib)) {
+if (path.startsWith(/WEB-INF/classes/) ||
+path.startsWith(/WEB-INF/lib/)) {
return true;
}
return false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT][VOTE] Release Apache Tomcat 7.0.63
Hi, 2015-06-30 12:01 GMT+03:00 Violeta Georgieva violet...@apache.org: The proposed Apache Tomcat 7.0.63 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.63/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1046/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_63/ The proposed 7.0.63 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.63 Stable +1 (binding): violetagg, remm, schultz, kfujino +1 (non-binding): fschumacher, Ognjen Blagojevic No other voters were cast. The vote has passed. I'll do the release shortly and announce it once the mirrors catch up. Regards, Violeta
svn commit: r1689346 - in /tomcat/trunk: java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ test/webapp/WEB-INF/classes/org/ test/webapp/WEB-INF/classes/org/apache/ test/web
Author: markt
Date: Mon Jul 6 09:29:44 2015
New Revision: 1689346
URL: http://svn.apache.org/r1689346
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=58096
Ensure that the correct codeBase is returned for classes loaded from
WEB-INF/classes
Added:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
(with props)
tomcat/trunk/test/webapp/WEB-INF/classes/org/
tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/
tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/
tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class
(with props)
tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java
(with props)
tomcat/trunk/test/webapp/bug5/bug58096.jsp (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1689346r1=1689345r2=1689346view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Mon
Jul 6 09:29:44 2015
@@ -210,7 +210,11 @@ public class FileResource extends Abstra
@Override
public URL getCodeBase() {
-return getURL();
+if (getWebappPath().startsWith(/WEB-INF/classes/)
name.endsWith(.class)) {
+return
getWebResourceRoot().getResource(/WEB-INF/classes/).getURL();
+} else {
+return getURL();
+}
}
@Override
Added: tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java?rev=1689346view=auto
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Mon Jul 6 09:29:44 2015
@@ -0,0 +1,45 @@
+/*
+ * 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.catalina.webresources;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestFileResource extends TomcatBaseTest {
+
+@Test
+public void doIt() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk out = new ByteChunk();
+
+int rc = getUrl(http://localhost:; + getPort() +
/test/bug5/bug58096.jsp, out, null);
+
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+// Build the expected location the same way the webapp base dir is
built
+File f = new File(test/webapp/WEB-INF/classes);
+Assert.assertEquals(f.toURI().toURL().toString(),
out.toString().trim());
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class?rev=1689346view=auto
==
Binary file - no diff available.
Propchange:
tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.class
--
svn:mime-type = application/octet-stream
Added: tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java?rev=1689346view=auto
==
---
svn commit: r1689337 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Mon Jul 6 08:46:30 2015 New Revision: 1689337 URL: http://svn.apache.org/r1689337 Log: Update the release date for 7.0.63 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1689337r1=1689336r2=1689337view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 6 08:46:30 2015 @@ -81,7 +81,7 @@ /changelog /subsection /section -section name=Tomcat 7.0.63 (violetagg) +section name=Tomcat 7.0.63 (violetagg) rtext=released 2015-07-06 subsection name=Catalina changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689392 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt
Date: Mon Jul 6 12:53:56 2015
New Revision: 1689392
URL: http://svn.apache.org/r1689392
Log:
Remove unnecessary code
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1689392r1=1689391r2=1689392view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Jul 6 12:53:56 2015
@@ -88,7 +88,6 @@ import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
-import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
@@ -1990,19 +1989,6 @@ public class StandardContext extends Con
}
-/**
- * Set the Loader with which this Context is associated.
- *
- * @param loader The newly associated loader
- */
-@Override
-public synchronized void setLoader(Loader loader) {
-
-super.setLoader(loader);
-
-}
-
-
/**
* Return the boolean on the annotations parsing.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689395 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/ test/org/apache/catalina/loader/ test/webapp-3.0/WEB-INF/classes/org/ test/webapp-3.0/WEB-INF/classes/org/apache/to
Author: markt Date: Mon Jul 6 13:27:56 2015 New Revision: 1689395 URL: http://svn.apache.org/r1689395 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58096 Ensure that the correct codeBase is returned for classes loaded from WEB-INF/classes Added: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java - copied, changed from r1689358, tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResource.java tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/classes/org/ - copied from r1689358, tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/classes/org/ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5/bug58096.jsp - copied unchanged from r1689358, tomcat/tc8.0.x/trunk/test/webapp/bug5/bug58096.jsp Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.class tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 6 13:27:56 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
Re: svn commit: r1689392 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
On 06/07/2015 14:18, Violeta Georgieva wrote:
Hi Mark,
2015-07-06 15:53 GMT+03:00 ma...@apache.org:
Author: markt
Date: Mon Jul 6 12:53:56 2015
New Revision: 1689392
URL: http://svn.apache.org/r1689392
Log:
Remove unnecessary code
Is the trigger for this change only that it is not necessary or something
else?
Just that it isn't necessary. All it does is call the super class that
has the exact same signature.
For example I'm using this in OSGi environment.
You might need to re-compile but this should still work exactly the same
way with no code changes. If that is not the case I'm happy to restore
the code but I'd like to understand why.
Mark
Regards,
Violeta
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1689392r1=1689391r2=1689392view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Jul 6 12:53:56 2015
@@ -88,7 +88,6 @@ import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
-import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
@@ -1990,19 +1989,6 @@ public class StandardContext extends Con
}
-/**
- * Set the Loader with which this Context is associated.
- *
- * @param loader The newly associated loader
- */
-@Override
-public synchronized void setLoader(Loader loader) {
-
-super.setLoader(loader);
-
-}
-
-
/**
* Return the boolean on the annotations parsing.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58096] Incorrect CodeSource location from ProtectionDomain for classes in WEB-INF/classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58096 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #4 from Mark Thomas ma...@apache.org --- Fixed in 7.0.x as well for 7.0.64 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1689392 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Hi Mark,
2015-07-06 15:53 GMT+03:00 ma...@apache.org:
Author: markt
Date: Mon Jul 6 12:53:56 2015
New Revision: 1689392
URL: http://svn.apache.org/r1689392
Log:
Remove unnecessary code
Is the trigger for this change only that it is not necessary or something
else?
For example I'm using this in OSGi environment.
Regards,
Violeta
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1689392r1=1689391r2=1689392view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Jul 6 12:53:56 2015
@@ -88,7 +88,6 @@ import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
-import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
@@ -1990,19 +1989,6 @@ public class StandardContext extends Con
}
-/**
- * Set the Loader with which this Context is associated.
- *
- * @param loader The newly associated loader
- */
-@Override
-public synchronized void setLoader(Loader loader) {
-
-super.setLoader(loader);
-
-}
-
-
/**
* Return the boolean on the annotations parsing.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689401 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Mon Jul 6 13:53:07 2015
New Revision: 1689401
URL: http://svn.apache.org/r1689401
Log:
58103: closeSocket already does a countdown as long as the socket is not null,
so remove two instances of extra countdown.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1689401r1=1689400r2=1689401view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jul 6
13:53:07 2015
@@ -522,11 +522,9 @@ public class Nio2Endpoint extends Abstra
if (running !paused) {
// Hand this socket off to an appropriate processor
if (!setSocketOptions(socket)) {
-countDownConnection();
closeSocket(socket);
}
} else {
-countDownConnection();
// Close socket right away
closeSocket(socket);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1689403 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Mon Jul 6 13:59:24 2015
New Revision: 1689403
URL: http://svn.apache.org/r1689403
Log:
Revert r1689401: actually calling another closeSocket method, so no issue there.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1689403r1=1689402r2=1689403view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jul 6
13:59:24 2015
@@ -522,9 +522,11 @@ public class Nio2Endpoint extends Abstra
if (running !paused) {
// Hand this socket off to an appropriate processor
if (!setSocketOptions(socket)) {
+countDownConnection();
closeSocket(socket);
}
} else {
+countDownConnection();
// Close socket right away
closeSocket(socket);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57741] Add support for error-pages to CGIServlet
https://bz.apache.org/bugzilla/show_bug.cgi?id=57741 --- Comment #4 from Mark Thomas ma...@apache.org --- I've had a look at this request. I'm currently leaning towards using the debug level to determine whether to use setStatus() or sendError() rather than a new configuration setting. I'll document that setting debug = 10 will disable custom error pages and show debug pages instead. Probably with a further comment not to use this setting in production. Looking at the docs, some further explanation of what the signfificant values for debug are (once I've worked them out) wouldn't go amiss either. -- 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: r1689503 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Mon Jul 6 21:15:43 2015
New Revision: 1689503
URL: http://svn.apache.org/r1689503
Log:
Javadoc fixes
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1689503r1=1689502r2=1689503view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Jul 6
21:15:43 2015
@@ -290,6 +290,10 @@ public class Http11Processor extends Abs
/**
* Set compression level.
+ *
+ * @param compression One of codeon/code, codeforce/code,
+ *codeoff/code or the minimum compression size in
+ *bytes which implies codeon/code
*/
public void setCompression(String compression) {
if (compression.equals(on)) {
@@ -312,6 +316,9 @@ public class Http11Processor extends Abs
/**
* Set Minimum size to trigger compression.
+ *
+ * @param compressionMinSize The minimum content length required for
+ * compression in bytes
*/
public void setCompressionMinSize(int compressionMinSize) {
this.compressionMinSize = compressionMinSize;
@@ -320,9 +327,11 @@ public class Http11Processor extends Abs
/**
* Set no compression user agent pattern. Regular expression as supported
- * by {@link Pattern}.
+ * by {@link Pattern}. e.g.: codegorilla|desesplorer|tigrus/code.
*
- * ie: gorilla|desesplorer|tigrus
+ * @param noCompressionUserAgents The regular expression for user agent
+ *strings for which compression should not
+ *be applied
*/
public void setNoCompressionUserAgents(String noCompressionUserAgents) {
if (noCompressionUserAgents == null ||
noCompressionUserAgents.length() == 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58104] APR log error: org.apache.tomcat.jni.Error: 20005: An invalid socket was returned
https://bz.apache.org/bugzilla/show_bug.cgi?id=58104 Ognjen Blagojevic ognjen.d.blagoje...@gmail.com changed: What|Removed |Added OS|All |Windows 7 --- Comment #2 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com --- Steps to reproduce: 1. Install tcnative 1.1.33 2. Download Tomcat 8.0.24 (.zip) 3. Unpack 4. Add APR connector config as described above 5. Start Tomcat 6. Use provided Java test class. It will crawl all pages (except websocket, manager, etc), looking for URLs, and then it will fetch all found pages 5 times. When it finishes, don't stop Tomcat yet. After some time (~20s, errors start to apear in the console. Config details: 06-Jul-2015 22:57:10.941 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log Server version:Apache Tomcat/8.0.24 06-Jul-2015 22:57:10.943 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log Server built: Jul 1 2015 20:19:55 UTC 06-Jul-2015 22:57:10.943 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log Server number: 8.0.24.0 06-Jul-2015 22:57:10.943 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log OS Name: Windows 7 06-Jul-2015 22:57:10.944 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log OS Version:6.1 06-Jul-2015 22:57:10.944 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log Architecture: amd64 06-Jul-2015 22:57:10.944 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log Java Home: C:\Program Files\Java\jdk1.7.0_79\jre 06-Jul-2015 22:57:10.944 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log JVM Version: 1.7.0_79-b15 06-Jul-2015 22:57:10.945 INFO [main] org.apache.catalina.startup.VersionLoggerLi stener.log JVM Vendor:Oracle Corporation ... 06-Jul-2015 22:57:10.951 INFO [main] org.apache.catalina.core.AprLifecycleListen er.lifecycleEvent Loaded APR based Apache Tomcat Native library 1.1.33 using APR version 1.5.1. 06-Jul-2015 22:57:10.952 INFO [main] org.apache.catalina.core.AprLifecycleListen er.lifecycleEvent APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. 06-Jul-2015 22:57:11.773 INFO [main] org.apache.catalina.core.AprLifecycleListen er.initializeSSL OpenSSL successfully initialized (OpenSSL 1.0.1m 19 Mar 2015) 06-Jul-2015 22:57:11.927 INFO [main] org.apache.coyote.AbstractProtocol.init Ini tializing ProtocolHandler [http-apr-83] ... -- 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: r9655 - /dev/tomcat/tomcat-8/v8.0.24/ /release/tomcat/tomcat-8/v8.0.24/
Author: markt Date: Mon Jul 6 20:21:06 2015 New Revision: 9655 Log: Release 8.0.24 Added: release/tomcat/tomcat-8/v8.0.24/ - copied from r9654, dev/tomcat/tomcat-8/v8.0.24/ Removed: dev/tomcat/tomcat-8/v8.0.24/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58095] Empty script tag results in generated jsp having a self-closing script tag, which is invalid and results in rendering issues
https://bz.apache.org/bugzilla/show_bug.cgi?id=58095 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #4 from Mark Thomas ma...@apache.org --- JSP documents have to be well-formed XML. If you use tags from another namespace then there is an assumption that they follow the rules for XML. If they don't then you'll need to work-around it. The approach Chris suggests is probably the easiest in this case but you can also use CDATA blocks if you wish. -- 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
[RESULT][VOTE] Release Apache Tomcat 8.0.24
The following votes were cast: Binding +1: markt, violetagg, remm, schultz, kfujino Non-Binding: +1: Ognjen Blagojevic This vote therefore passes. I'll update the distribution servers shortly and announce / update the website tomorrow once the mirrors have caught up. Thanks to everyone who reviewed the release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58104] APR log error: org.apache.tomcat.jni.Error: 20005: An invalid socket was returned
https://bz.apache.org/bugzilla/show_bug.cgi?id=58104 --- Comment #3 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com --- Created attachment 32885 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32885action=edit Java class to reproduce the problem. -- 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 58105] Incorrect access log messages
https://bz.apache.org/bugzilla/show_bug.cgi?id=58105 --- Comment #3 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com --- While narrowing steps to reproduce bug 58104, I noticed that same steps trigger log messages I reported here. So, it is possible to reproduce only with APR HTTP connector. And it seems that when I get error described in bug 58104, I also get access log messages described here. -Ognjen -- 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 58086] Deploy WAR file using http:// throws FileNotFoundException
https://bz.apache.org/bugzilla/show_bug.cgi?id=58086
Lukasz Jader ljader...@gmail.com changed:
What|Removed |Added
Resolution|FIXED |---
Status|RESOLVED|REOPENED
--- Comment #2 from Lukasz Jader ljader...@gmail.com ---
@Violeta Georgieva
I'm searching a little bit more about this and I found out,
that this is much more complicated issue - sorry for misleading you.
Previous implementation worked for all kind of local filesystem files, because
when:
a) war=C:/Users/john/app.war
was loaded using FileInputStream
b) war=file:/C:/Users/john/app.war
was loaded using URL and URLConnection (effectively FileURLConnection)
But it does not worked other protocols (ex. http, https),
since it tried to load them using FileInputStream.
Current implementation (AFTER FIX) does NOT WORK for any of local filesystem
files, because when:
a) war=C:/Users/john/app.war
was loaded using URL and URLConnection - and the exception is thrown
java.net.MalformedURLException: no protocol
b) war=file:/C:/Users/john/app.war
was is loaded using FileInputStream, which in constructor uses java.io.File,
which incorrectly handles files URIs in different situations:
https://weblogs.java.net/blog/kohsuke/archive/2007/04/how_to_convert.html
http://bugs.java.com/view_bug.do?bug_id=5086147
https://commons.apache.org/proper/commons-io/apidocs/org/apache/commons/io/FileUtils.html#toFile%28java.net.URL%29
I don't see any quick solution to this fix :(.
I think the best way would be reverting previous commit and figuring out
how to implement this.
For my own needs I've dirty fixed this problem to:
if (war.startsWith(file:) || war.startsWith(http:) ||
war.startsWith(https:)) {
//execute the URL code
} else {
//execute the File code as fallback
}
--
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-tc8.0.x-test-apr (in module tomcat-8.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-tc8.0.x-test-apr 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-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 33 mins 21 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150706-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150706/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150706.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150706-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150706/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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-junit4.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:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv
[Bug 58096] Incorrect CodeSource location from ProtectionDomain for classes in WEB-INF/classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58096 --- Comment #5 from Xuan MA super...@gmail.com --- Thanks, your fix is much better than mine, I need to learn more about Tomcat codebase :) -- 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 57741] Add support for error-pages to CGIServlet
https://bz.apache.org/bugzilla/show_bug.cgi?id=57741 --- Comment #3 from Phil Dicke philc...@aol.com --- I'm seeing the same issue and it would be good to get this merged instead of having to build and deploy custom Tomcats -- 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
