[Bug 62670] driverManagerProtection in JreMemoryLeakPreventionListener results in java.sql.SQLException: No suitable driver found
https://bz.apache.org/bugzilla/show_bug.cgi?id=62670 --- Comment #7 from Padmanarayanan --- (In reply to Mark Thomas from comment #5) > Getting back to the original bug report... > > The behaviour described is expected when a JDBC driver is packaged in > WEB-INF/lib. The behaviour (and explanation for it) is documented here: > http://tomcat.apache.org/tomcat-9.0-doc/jndi-datasource-examples-howto.html > > That default behaviour is not going to change. > > The described behaviour when the driver is in CATALINA_HOME/lib is not > expected. That needs further investigation. Could you also clarify about the shared/endorsed lib? -- 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 62670] driverManagerProtection in JreMemoryLeakPreventionListener results in java.sql.SQLException: No suitable driver found
https://bz.apache.org/bugzilla/show_bug.cgi?id=62670 --- Comment #8 from Mark Thomas --- Sure. I can include that in the doc updates. The short version is: - endorsed (where the JRE still supports it) is effectively the same as the system class path - using the shared loader (where it has been configured since it is not used by default) needs to be handled the same was as the web application class loader. -- 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-native trunk
Hi, I am working on a jar to laod the libraries in tomcat-native. I have noted that the examples don't compile and that the test directory is empty. I am planning to clean that and go for maven build for the new jar. Comments? -- Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839922 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml webapps/docs/jndi-datasource-ex
Author: markt
Date: Mon Sep 3 09:24:24 2018
New Revision: 1839922
URL: http://svn.apache.org/viewvc?rev=1839922&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62670
Adjust the memory leak protection for the DriverManager so that JDBC drivers
located in $CATALINA_HOME/lib and $CATALINA_BASE/lib are loaded via the service
loader mechanism when the protection is enabled.
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1839922&r1=1839921&r2=1839922&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Mon Sep 3 09:24:24 2018
@@ -197,6 +197,21 @@ public class JreMemoryLeakPreventionList
// Initialise these classes when Tomcat starts
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
+/*
+ * First call to this loads all drivers visible to the current
class
+ * loader and its parents.
+ *
+ * Note: This is called before the context class loader is changed
+ * because we want any drivers located in CATALINA_HOME/lib
+ * and/or CATALINA_HOME/lib to be visible to DriverManager.
+ * Users wishing to avoid having JDBC drivers loaded by this
+ * class loader should add the JDBC driver(s) to the class
+ * path so they are loaded by the system class loader.
+ */
+if (driverManagerProtection) {
+DriverManager.getDrivers();
+}
+
ClassLoader loader =
Thread.currentThread().getContextClassLoader();
try
@@ -206,14 +221,6 @@ public class JreMemoryLeakPreventionList
Thread.currentThread().setContextClassLoader(
ClassLoader.getSystemClassLoader());
-/*
- * First call to this loads all drivers in the current class
- * loader
- */
-if (driverManagerProtection) {
-DriverManager.getDrivers();
-}
-
// Trigger the creation of the AWT (AWT-Windows, AWT-XAWT,
// etc.) thread.
// Note this issue is fixed in Java 8 update 05 onwards.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1839922&r1=1839921&r2=1839922&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 3 09:24:24 2018
@@ -57,6 +57,13 @@
@MultipartConfig annotation regardless of HTTP method.
(markt)
+
+62670: Adjust the memory leak protection for the
+DriverManager so that JDBC drivers located in
+$CATALINA_HOME/lib and $CATALINA_BASE/lib are
+loaded via the service loader mechanism when the protection is enabled.
+(markt)
+
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1839922&r1=1839921&r2=1839922&view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Mon Sep 3 09:24:24 2018
@@ -199,10 +199,10 @@
The first use of java.sql.DriverManager will trigger
the
-loading of JDBC Driver in the current class loader. The web
-application level memory leak protection can take care of this in most
-cases but triggering the loading here has fewer side-effects. The
-default is true.
+loading of JDBC Drivers visible to the current class loader and its
+parents. The web application level memory leak protection can take care
+of this in most cases but triggering the loading here has fewer
+side-effects. The default is true.
Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1839922&r1=1839921&r2=1839922&view=diff
==
--- tomcat/trunk/webapps/d
svn commit: r1839923 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml webapps/docs/jndi-da
Author: markt Date: Mon Sep 3 09:25:20 2018 New Revision: 1839923 URL: http://svn.apache.org/viewvc?rev=1839923&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62670 Adjust the memory leak protection for the DriverManager so that JDBC drivers located in $CATALINA_HOME/lib and $CATALINA_BASE/lib are loaded via the service loader mechanism when the protection is enabled. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml tomcat/tc8.5.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 09:25:20 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,176220
svn commit: r1839925 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml webapps/docs/jndi-da
Author: markt Date: Mon Sep 3 09:27:33 2018 New Revision: 1839925 URL: http://svn.apache.org/viewvc?rev=1839925&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62670 Adjust the memory leak protection for the DriverManager so that JDBC drivers located in $CATALINA_HOME/lib and $CATALINA_BASE/lib are loaded via the service loader mechanism when the protection is enabled. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 09:27:33 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1659907,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,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809
Re: tomcat-native trunk
On 03/09/18 09:38, jean-frederic clere wrote: > Hi, > > I am working on a jar to laod the libraries in tomcat-native. I have > noted that the examples don't compile and that the test directory is > empty. I am planning to clean that and go for maven build for the new jar. > > Comments? Odd. The examples compile for me - at least in the IDE anyway. The test directory (like the main directory) looks to be an svn external. There should be 4 classes in it. I wonder if we wouldn't be better to drop the Java code from the native project entirely (probably an idea for 2.x). Thinking about some of our previous discussions, if we drop APR/native from 10.x onwards and we reduce the native API in a 2.x down to only what we use we might end up a very thin wrapper around OpenSSL that exposed the small subset of OpenSSL functionality we use. No strong views on which build system to use but I will say that Gradle might be worth a look. I do think that a build system should either be supported or completely removed. Having files lying around for old, no longer used build systems just causes confusion. I suspect there is a lot of cruft that needs to be removed as well. It would be good to go through and have a good clean-up. I see references to Netware in some files. Having just removed those from JK I'll take a look at removing them from Native as well. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62670] driverManagerProtection in JreMemoryLeakPreventionListener results in java.sql.SQLException: No suitable driver found
https://bz.apache.org/bugzilla/show_bug.cgi?id=62670 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #9 from Mark Thomas --- Fixed in: - trunk for 9.0.12 onwards - 8.5.x for 8.5.34 onwards - 7.0.x for 7.0.91 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
svn commit: r1839928 - in /tomcat/trunk: java/org/apache/tomcat/jni/OS.java java/org/apache/tomcat/jni/Procattr.java webapps/docs/changelog.xml
Author: markt
Date: Mon Sep 3 09:47:49 2018
New Revision: 1839928
URL: http://svn.apache.org/viewvc?rev=1839928&view=rev
Log:
Remove Netware support.
Deprecate the public API that refers to Netware.
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/jni/OS.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/OS.java?rev=1839928&r1=1839927&r2=1839928&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/OS.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/OS.java Mon Sep 3 09:47:49 2018
@@ -25,7 +25,6 @@ public class OS {
/* OS Enums */
private static final int UNIX = 1;
-private static final int NETWARE = 2;
private static final int WIN32 = 3;
private static final int WIN64 = 4;
private static final int LINUX = 5;
@@ -47,7 +46,13 @@ public class OS {
private static native boolean is(int type);
public static final boolean IS_UNIX= is(UNIX);
-public static final boolean IS_NETWARE = is(NETWARE);
+/**
+ * @deprecated Hard-coded to false since there has not been a supported
+ * Netware platform for many years.
+ * This will be removed in Tomcat 10 onwards
+ */
+@Deprecated
+public static final boolean IS_NETWARE = false;
public static final boolean IS_WIN32 = is(WIN32);
public static final boolean IS_WIN64 = is(WIN64);
public static final boolean IS_LINUX = is(LINUX);
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java?rev=1839928&r1=1839927&r2=1839928&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Procattr.java Mon Sep 3 09:47:49
2018
@@ -139,8 +139,8 @@ public class Procattr {
* Determine if the child should start in its own address space or using
the
* current one from its parent
* @param attr The procattr we care about.
- * @param addrspace Should the child start in its own address space?
Default
- * is no on NetWare and yes on other platforms.
+ * @param addrspace Should the child start in its own address space?
+ * Default is yes.
* @return the operation status
*/
public static native int addrspaceSet(long attr, int addrspace);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1839928&r1=1839927&r2=1839928&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 3 09:47:49 2018
@@ -81,6 +81,11 @@
bodies when writing large bodies using asynchronous processing over
HTTP/2. (markt)
+
+Support for Netware in the org.apache.tomcat.jni package
+has been removed as there has not been a supported Netware platform for
+a number of years. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839929 - /tomcat/native/trunk/java/org/apache/tomcat/
Author: markt Date: Mon Sep 3 09:50:00 2018 New Revision: 1839929 URL: http://svn.apache.org/viewvc?rev=1839929&view=rev Log: Update external to latest 9.0.x jni code Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Mon Sep 3 09:50:00 2018 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1805752 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1839928 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839930 - in /tomcat/native/trunk: native/os/netware/ native/src/proc.c xdocs/miscellaneous/changelog.xml
Author: markt
Date: Mon Sep 3 09:54:19 2018
New Revision: 1839930
URL: http://svn.apache.org/viewvc?rev=1839930&view=rev
Log:
Remove Netware support
Removed:
tomcat/native/trunk/native/os/netware/
Modified:
tomcat/native/trunk/native/src/proc.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/proc.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/proc.c?rev=1839930&r1=1839929&r2=1839930&view=diff
==
--- tomcat/native/trunk/native/src/proc.c (original)
+++ tomcat/native/trunk/native/src/proc.c Mon Sep 3 09:54:19 2018
@@ -311,7 +311,7 @@ TCN_IMPLEMENT_CALL(jint, Proc, detach)(T
{
UNREFERENCED_STDARGS;
-#if defined(WIN32) || defined (NETWARE)
+#if defined(WIN32)
UNREFERENCED(daemonize);
return APR_ENOTIMPL;
#else
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1839930&r1=1839929&r2=1839930&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 3 09:54:19
2018
@@ -39,6 +39,10 @@
62641: libtool invocations should use --tag=CC. (michaelo)
+
+ Remove support for Netware as there has not been a supported Netware
+ platform for a number of years. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 9.0.x
Hi all, As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) shortly and roll the next monthly release. I've a couple of things I want to look at first so I'll probably be tagging in the next day or two. What is the view on BZ 62667 (the rewrite issue). Is that a bug or an enhancement request? For Bug 62669 I'll leave it as long as I can for the OP to respond but if they don't by the time I'm ready to tag I'll go ahead and fix it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tomcat-native trunk
Am 03.09.2018 um 11:41 schrieb Mark Thomas: On 03/09/18 09:38, jean-frederic clere wrote: Hi, I am working on a jar to laod the libraries in tomcat-native. I have noted that the examples don't compile and that the test directory is empty. I am planning to clean that and go for maven build for the new jar. Comments? Odd. The examples compile for me - at least in the IDE anyway. Same here. I do it via script when testing release candidates. Roughly: ant compile ant javadocs ant jar ant download ant test ant run-echo & echopid=$! sleep 20 ( printf 'a\n'; sleep 3; printf '!\n'; sleep 3) | telnet localhost 8023 kill $echopid The test directory (like the main directory) looks to be an svn external. There should be 4 classes in it. I wonder if we wouldn't be better to drop the Java code from the native project entirely (probably an idea for 2.x). There's a top-level TODO.txt file to which I added a few years ago the following: Java Tests and Examples --- - "ant run-echo": what is the expected behaviour of this example. I couldn't get it to do something understandable. Document the example in the README.txt. - "ant run-ssl-server": Couldn't we include a test certificate in the distribution? - "ant run-ssl-server": What should the test produce, if run successfully? Document the example in the README.txt. - "ant run-local-server": Creates a unix socket "\\.\PIPE\test" in the examples directory, then waits. How is the test expected to work? And the file name doesn't seem to be appropriate for Unix. Document the example in the README.txt. Java Classes Source Distribution Check on how to handle the test and examples classes. I think they have no other home. Furthermore some of the Java files do not exist inside TC: - Apr.java, apr.properties, jni/Buffer.java and jni/Thread.java I don't know their purpose and whether we can delete them. So I think the use and state of the java files is very questionable. Thinking about some of our previous discussions, if we drop APR/native from 10.x onwards and we reduce the native API in a 2.x down to only what we use we might end up a very thin wrapper around OpenSSL that exposed the small subset of OpenSSL functionality we use. No strong views on which build system to use but I will say that Gradle might be worth a look. I do think that a build system should either be supported or completely removed. Having files lying around for old, no longer used build systems just causes confusion. Which old build system do you mean? I thought it uses ant, just like Tomcat. Or do you mean the native autotools/make parts? I suspect there is a lot of cruft that needs to be removed as well. It would be good to go through and have a good clean-up. I see references to Netware in some files. Having just removed those from JK I'll take a look at removing them from Native as well. +1 Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tomcat-native trunk
On 03/09/18 11:31, Rainer Jung wrote: > Am 03.09.2018 um 11:41 schrieb Mark Thomas: >> No strong views on which build system to use but I will say that Gradle >> might be worth a look. I do think that a build system should either be >> supported or completely removed. Having files lying around for old, no >> longer used build systems just causes confusion. > > Which old build system do you mean? I thought it uses ant, just like > Tomcat. Or do you mean the native autotools/make parts? More that if the build system is switched to !Ant then make sure that all the Ant parts are removed. I'm less familiar with the native build bits although I do wonder if there is merit in keeping the VS6 files given that: - you can't get VS6 via MSDN - it is ~20 years old - we don't use Visual Studio to build the Windows binaries On the other hand, for those that prefer to develop in Visual Studio there may be merit in providing files for a more recent version. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 9.0.x
On Mon, Sep 3, 2018 at 12:19 PM Mark Thomas wrote: > Hi all, > > As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) > shortly and roll the next monthly release. > > I've a couple of things I want to look at first so I'll probably be > tagging in the next day or two. > > What is the view on BZ 62667 (the rewrite issue). Is that a bug or an > enhancement request? > It's a bug (I didn't know it was supposed to be possible :) ). I don't know exactly what level of recursion is actually allowed either. I'm working on it (assuming it's the simplest case) but I'm not sure it's going to be done tomorrow. Rémy > > For Bug 62669 I'll leave it as long as I can for the OP to respond but > if they don't by the time I'm ready to tag I'll go ahead and fix it. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r1839935 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt
Date: Mon Sep 3 10:52:16 2018
New Revision: 1839935
URL: http://svn.apache.org/viewvc?rev=1839935&view=rev
Log:
On balance, I think keeping these methods separate is the better option due to:
- easier to follow code
- simpler maintenance
- subtle differences between blocking/non-blocking that may be lost / become
less obvious if combined
- ability for sub-classes to over-ride
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1839935&r1=1839934&r2=1839935&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Sep
3 10:52:16 2018
@@ -399,8 +399,6 @@ public abstract class SocketWrapperBase<
* - To enable a marginally more efficient implemented for blocking
* writes which do not require the additional checks related to the
* use of the non-blocking write buffer
- * TODO: Explore re-factoring options to remove the split into
- * separate methods
*/
if (block) {
writeBlocking(buf, off, len);
@@ -448,8 +446,6 @@ public abstract class SocketWrapperBase<
* - To enable a marginally more efficient implemented for blocking
* writes which do not require the additional checks related to the
* use of the non-blocking write buffer
- * TODO: Explore re-factoring options to remove the split into
- * separate methods
*/
if (block) {
writeBlocking(from);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 9.0.x
On 03/09/18 11:40, Rémy Maucherat wrote: > On Mon, Sep 3, 2018 at 12:19 PM Mark Thomas wrote: > >> Hi all, >> >> As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) >> shortly and roll the next monthly release. >> >> I've a couple of things I want to look at first so I'll probably be >> tagging in the next day or two. >> >> What is the view on BZ 62667 (the rewrite issue). Is that a bug or an >> enhancement request? >> > > It's a bug (I didn't know it was supposed to be possible :) ). I don't know > exactly what level of recursion is actually allowed either. I'm working on > it (assuming it's the simplest case) but I'm not sure it's going to be done > tomorrow. Ack. I can hold off the tag for a day or two if that helps. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667 --- Comment #5 from Rainer Jung --- httpd mod_rewrite code seems to be recursive, but it contains the following a little cryptic comment: To make rewrite maps useful, the lookup key and default values must be expanded, so we make recursive calls to do the work. For security reasons we must never expand a string that includes verbatim data from the network. The recursion here isn't a problem because the result of expansion is only passed to lookup_map() so it cannot be re-expanded, only re-looked-up. Another way of looking at it is that the recursion is entirely driven by the syntax of the nested curly brackets. Regards, Rainer -- 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 on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3553 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1839935 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tomcat-native trunk
Le 03/09/2018 à 11:41, Mark Thomas a écrit : > No strong views on which build system to use but I will say that Gradle > might be worth a look. With my Debian maintainer hat on I have to say that Gradle is a real hindrance and I hope the Tomcat components will stay out of it. Gradle itself is a behemoth that is very difficult to maintain, as a build system it has little respect for backward compatibility, and its imperative nature quickly turns build files into a non standard, project specific, mess. Gradle is barely an improvement over Ant IMHO, but at least Ant is stable and really cares about backward compatibility. Beyond Ant I think a declarative build system like Maven is a saner choice. The tomcat-native fork maintained by netty [1] is built with Maven, maybe we could get some inspiration from it. Emmanuel Bourg [1] https://github.com/netty/netty-tcnative - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667 --- Comment #6 from Remy Maucherat --- Ok, so adding recursion works. I suppose maps are the only thing that need it, right ? -- 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: r1839955 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/Substitution.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml
Author: remm
Date: Mon Sep 3 12:54:34 2018
New Revision: 1839955
URL: http://svn.apache.org/viewvc?rev=1839955&view=rev
Log:
62667: Add recursion for the parsing and evaluation of map keys and values.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java?rev=1839955&r1=1839954&r2=1839955&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java Mon
Sep 3 12:54:34 2018
@@ -101,14 +101,13 @@ public class Substitution {
public class MapElement extends SubstitutionElement {
public RewriteMap map = null;
-public String key;
-public String defaultValue = "";
-public int n;
+public SubstitutionElement[] defaultValue = null;
+public SubstitutionElement[] key = null;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
-String result = map.lookup(rule.group(n));
-if (result == null) {
-result = defaultValue;
+String result = map.lookup(evaluateSubstitution(key, rule, cond,
resolver));
+if (result == null && defaultValue != null) {
+result = evaluateSubstitution(defaultValue, rule, cond,
resolver);
}
return result;
}
@@ -126,6 +125,10 @@ public class Substitution {
}
public void parse(Map maps) {
+this.elements = parseSubtitution(sub, maps);
+}
+
+private SubstitutionElement[] parseSubtitution(String sub, Map maps) {
List elements = new ArrayList<>();
int pos = 0;
@@ -183,17 +186,20 @@ public class Substitution {
if (newElement.map == null) {
throw new IllegalArgumentException(sub + ": No map: "
+ sub.substring(open + 1, colon));
}
+String key = null;
+String defaultValue = null;
if (def > -1) {
if (!(colon < def && def < close)) {
throw new IllegalArgumentException(sub);
}
-newElement.key = sub.substring(colon + 1, def);
-newElement.defaultValue = sub.substring(def + 1,
close);
+key = sub.substring(colon + 1, def);
+defaultValue = sub.substring(def + 1, close);
} else {
-newElement.key = sub.substring(colon + 1, close);
+key = sub.substring(colon + 1, close);
}
-if (newElement.key.startsWith("$")) {
-newElement.n =
Integer.parseInt(newElement.key.substring(1));
+newElement.key = parseSubtitution(key, maps);
+if (defaultValue != null) {
+newElement.defaultValue =
parseSubtitution(defaultValue, maps);
}
pos = close + 1;
elements.add(newElement);
@@ -253,7 +259,7 @@ public class Substitution {
}
}
-this.elements = elements.toArray(new SubstitutionElement[0]);
+return elements.toArray(new SubstitutionElement[0]);
}
@@ -265,6 +271,10 @@ public class Substitution {
* @return The substitution result
*/
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
+return evaluateSubstitution(elements, rule, cond, resolver);
+}
+
+private String evaluateSubstitution(SubstitutionElement[] elements,
Matcher rule, Matcher cond, Resolver resolver) {
StringBuffer buf = new StringBuffer();
for (int i = 0; i < elements.length; i++) {
buf.append(elements[i].evaluate(rule, cond, resolver));
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1839955&r1=1839954&r2=1839955&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Mon Sep 3 12:54:34 2018
@@ -81,6 +81,13 @@ public class TestRewriteValve extends To
"RewriteRule /b/(.*).html$ /c/${mapa:$1|dd}", "/b/x.html",
"/c/dd");
}
+// BZ
svn commit: r1839960 - in /tomcat/trunk/test/org/apache/catalina/valves/rewrite: TestRewriteValve.java TesterRewriteMapA.java
Author: remm
Date: Mon Sep 3 13:09:27 2018
New Revision: 1839960
URL: http://svn.apache.org/viewvc?rev=1839960&view=rev
Log:
Also add a test for the map key.
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1839960&r1=1839959&r2=1839960&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Mon Sep 3 13:09:27 2018
@@ -89,6 +89,12 @@ public class TestRewriteValve extends To
}
@Test
+public void testRewriteMap04() throws Exception {
+doTestRewrite("RewriteMap mapa
org.apache.catalina.valves.rewrite.TesterRewriteMapA\n" +
+"RewriteRule /b/(.*).html$ /c/${mapa:a$1|dd}", "/b/a.html",
"/c/");
+}
+
+@Test
public void testRewriteServerVar() throws Exception {
doTestRewrite("RewriteRule /b/(.*).html$ /c%{SERVLET_PATH}",
"/b/x.html", "/c/b/x.html");
}
Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java?rev=1839960&r1=1839959&r2=1839960&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
Mon Sep 3 13:09:27 2018
@@ -25,6 +25,7 @@ public class TesterRewriteMapA implement
static {
map.put("a", "aa");
+map.put("aa", "");
map.put("b", "bb");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3554 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1839955 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839963 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/
Author: remm Date: Mon Sep 3 13:42:25 2018 New Revision: 1839963 URL: http://svn.apache.org/viewvc?rev=1839963&view=rev Log: 62667: Add recursion for the parsing and evaluation of map keys and values. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 13:42:25 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769
[Bug 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667
Remy Maucherat changed:
What|Removed |Added
Resolution|--- |FIXED
Status|NEW |RESOLVED
--- Comment #7 from Remy Maucherat ---
I added the "feature"/bugfix for 9.0.12 and 8.5.34.
I have no idea what the language from the comment "For security reasons we must
never expand a string that includes verbatim data from the network." means
since well, that's the point and this BZ asks for ${portals:%{HTTP_HOST}}
(%{HTTP_HOST} is clearly verbatim network data). Comments ? Maybe it means you
shouldn't parse network data (only evaluate), but that's not the case here
obviously: the configuration is parsed on valve start and that's it.
--
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: Tagging 9.0.x
On Mon, Sep 3, 2018 at 12:53 PM Mark Thomas wrote: > On 03/09/18 11:40, Rémy Maucherat wrote: > > On Mon, Sep 3, 2018 at 12:19 PM Mark Thomas wrote: > > > >> Hi all, > >> > >> As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) > >> shortly and roll the next monthly release. > >> > >> I've a couple of things I want to look at first so I'll probably be > >> tagging in the next day or two. > >> > >> What is the view on BZ 62667 (the rewrite issue). Is that a bug or an > >> enhancement request? > >> > > > > It's a bug (I didn't know it was supposed to be possible :) ). I don't > know > > exactly what level of recursion is actually allowed either. I'm working > on > > it (assuming it's the simplest case) but I'm not sure it's going to be > done > > tomorrow. > > Ack. I can hold off the tag for a day or two if that helps. > The fix I had in the works went well. I don't think there are other places that need recursion in rewrite. Rémy
[Bug 62408] (New feature) Make configurable the number of retries in case of upstream failures
https://bz.apache.org/bugzilla/show_bug.cgi?id=62408 --- Comment #4 from Frederik --- (Sorry for the late reply, just back from vacations) Thanks for the corrections, I'll keep your suggestions in mind for future submitions. Thanks again, F -- 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 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667 --- Comment #8 from Rainer Jung --- (In reply to Remy Maucherat from comment #6) > Ok, so adding recursion works. I suppose maps are the only thing that need > it, right ? Yes, I think so. I didn't find another way to trigger recursion in mod_rewrite. -- 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: Tagging 9.0.x
On 03/09/18 14:47, Rémy Maucherat wrote: > On Mon, Sep 3, 2018 at 12:53 PM Mark Thomas wrote: > >> On 03/09/18 11:40, Rémy Maucherat wrote: >>> On Mon, Sep 3, 2018 at 12:19 PM Mark Thomas wrote: >>> Hi all, As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) shortly and roll the next monthly release. I've a couple of things I want to look at first so I'll probably be tagging in the next day or two. What is the view on BZ 62667 (the rewrite issue). Is that a bug or an enhancement request? >>> >>> It's a bug (I didn't know it was supposed to be possible :) ). I don't >> know >>> exactly what level of recursion is actually allowed either. I'm working >> on >>> it (assuming it's the simplest case) but I'm not sure it's going to be >> done >>> tomorrow. >> >> Ack. I can hold off the tag for a day or two if that helps. >> > > The fix I had in the works went well. I don't think there are other places > that need recursion in rewrite. Great news. Tx. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62669] ResponseIncludeWrapper.getContentType() never returns NULL and sets the field
https://bz.apache.org/bugzilla/show_bug.cgi?id=62669 --- Comment #2 from Mark Thomas --- I'm currently struggling to see why ResposneIncludeWrapper goes to the trouble it does to capture the content type and the last modified date. I worry I am missing something so I want to look at this some more but I am currently leaning towards removing all of that code and simply obtaining the content type and last modified date from the response object. That will mean handling a potential NPE but that is one line of code vs rather more in the current 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
Re: tomcat-native trunk
On 03/09/18 12:31, Rainer Jung wrote: > Am 03.09.2018 um 11:41 schrieb Mark Thomas: >> On 03/09/18 09:38, jean-frederic clere wrote: >>> Hi, >>> >>> I am working on a jar to laod the libraries in tomcat-native. I have >>> noted that the examples don't compile and that the test directory is >>> empty. I am planning to clean that and go for maven build for the new >>> jar. >>> >>> Comments? >> >> Odd. The examples compile for me - at least in the IDE anyway. > > Same here. I do it via script when testing release candidates. Roughly: > > ant compile > ant javadocs > ant jar > ant download > ant test > > ant run-echo & > echopid=$! > sleep 20 > ( printf 'a\n'; sleep 3; printf '!\n'; sleep 3) | telnet localhost 8023 > kill $echopid OK, I was just the github mirror when using svn I have: Fetching external item into 'trunk/test/org/apache/tomcat/jni': ... Fetching external item into 'trunk/java/org/apache/tomcat/jni': OK that was the part missing. > >> The test directory (like the main directory) looks to be an svn >> external. There should be 4 classes in it. >> >> I wonder if we wouldn't be better to drop the Java code from the native >> project entirely (probably an idea for 2.x). > > There's a top-level TODO.txt file to which I added a few years ago the > following: > > Java Tests and Examples > --- > > - "ant run-echo": what is the expected behaviour of this example. > I couldn't get it to do something understandable. > Document the example in the README.txt. > > - "ant run-ssl-server": Couldn't we include a test certificate in the > distribution? > > - "ant run-ssl-server": What should the test produce, if run successfully? > Document the example in the README.txt. > > - "ant run-local-server": Creates a unix socket "\\.\PIPE\test" in the > examples directory, then waits. How is the test expected to work? > And the file name doesn't seem to be appropriate for Unix. > Document the example in the README.txt. > > > Java Classes Source Distribution > > > Check on how to handle the test and examples classes. > I think they have no other home. > > Furthermore some of the Java files do not exist inside TC: > - Apr.java, apr.properties, jni/Buffer.java and jni/Thread.java > I don't know their purpose and whether we can delete them. > > So I think the use and state of the java files is very questionable. > >> Thinking about some of our previous discussions, if we drop APR/native >> from 10.x onwards and we reduce the native API in a 2.x down to only >> what we use we might end up a very thin wrapper around OpenSSL that >> exposed the small subset of OpenSSL functionality we use. >> >> No strong views on which build system to use but I will say that Gradle >> might be worth a look. I do think that a build system should either be >> supported or completely removed. Having files lying around for old, no >> longer used build systems just causes confusion. > > Which old build system do you mean? I thought it uses ant, just like > Tomcat. Or do you mean the native autotools/make parts? > >> I suspect there is a lot of cruft that needs to be removed as well. It >> would be good to go through and have a good clean-up. I see references >> to Netware in some files. Having just removed those from JK I'll take a >> look at removing them from Native as well. > > +1 > > Regards, > > Rainer > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tagging 9.0.x
On 2018-09-03 12:19, Mark Thomas wrote: Hi all, As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) shortly and roll the next monthly release. Hi! Will there be a new release of tomcat native to go with 9.0.x? - Eric L - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62669] ResponseIncludeWrapper.getContentType() never returns NULL and sets the field
https://bz.apache.org/bugzilla/show_bug.cgi?id=62669 --- Comment #3 from Sven --- I am not a maintainer or contributor to this project yet but I also suggestion to remove the wrapper. Currently I simply add another filter after SSIFilter that wraps the ResponseIncludeWrapper again and return the original response's content type as a work-around for this issue. So far it works well but to be honest I did no in-depth testing. -- 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: Tagging 9.0.x
On 03/09/18 17:30, Eric Lilja wrote: > On 2018-09-03 12:19, Mark Thomas wrote: >> Hi all, >> >> As the start of September is here I'm planning to tag 9.0.x (and 8.5.x) >> shortly and roll the next monthly release. >> > > Hi! Will there be a new release of tomcat native to go with 9.0.x? There is nothing in the 1.2.18 changelog that seems worthy of a new release. What were you hoping for in a new Tomcat Native release? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839977 - in /tomcat/trunk/java/org/apache/catalina: Globals.java ssi/SSIFilter.java ssi/SSIServlet.java
Author: markt
Date: Mon Sep 3 17:58:46 2018
New Revision: 1839977
URL: http://svn.apache.org/viewvc?rev=1839977&view=rev
Log:
Remove / deprecate code originally added to enable the CGI Servlet to
work as an include with SSI. The CGI servlet has generic handling for
the include case and this flag is no longer required.
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1839977&r1=1839976&r2=1839977&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Mon Sep 3 17:58:46 2018
@@ -118,9 +118,13 @@ public final class Globals {
* We do this because of the pathInfo mangling happening when using
* the CGIServlet in conjunction with the SSI servlet. (value stored
* as an object of type String)
+ *
+ * @deprecated Unused. This is no longer used as the CGIO servlet now has
+ * generic handling for when it is used as an include.
+ * This will be removed in Tomcat 10
*/
- public static final String SSI_FLAG_ATTR =
- "org.apache.catalina.ssi.SSIServlet";
+@Deprecated
+public static final String SSI_FLAG_ATTR =
"org.apache.catalina.ssi.SSIServlet";
/**
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1839977&r1=1839976&r2=1839977&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Mon Sep 3
17:58:46 2018
@@ -35,8 +35,6 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.catalina.Globals;
/**
* Filter to process SSI requests within a webpage. Mapped to a content types
* from within web.xml.
@@ -92,9 +90,6 @@ public class SSIFilter extends GenericFi
HttpServletRequest req = (HttpServletRequest)request;
HttpServletResponse res = (HttpServletResponse)response;
-// indicate that we're in SSI processing
-req.setAttribute(Globals.SSI_FLAG_ATTR, "true");
-
// setup to capture output
ByteArrayServletOutputStream basos = new
ByteArrayServletOutputStream();
ResponseIncludeWrapper responseIncludeWrapper =
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=1839977&r1=1839976&r2=1839977&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Mon Sep 3
17:58:46 2018
@@ -32,8 +32,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.catalina.Globals;
/**
* Servlet to process SSI requests within a webpage. Mapped to a path from
* within web.xml.
@@ -178,7 +176,6 @@ public class SSIServlet extends HttpServ
res.setDateHeader("Expires", (new java.util.Date()).getTime()
+ expires.longValue() * 1000);
}
-req.setAttribute(Globals.SSI_FLAG_ATTR, "true");
processSSI(req, res, resource);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839983 - in /tomcat/trunk: java/org/apache/catalina/ssi/ResponseIncludeWrapper.java java/org/apache/catalina/ssi/SSIFilter.java java/org/apache/catalina/ssi/SSIServletExternalResolver.ja
Author: markt
Date: Mon Sep 3 19:08:53 2018
New Revision: 1839983
URL: http://svn.apache.org/viewvc?rev=1839983&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62669
When using the SSIFilter and a resource does not specify a content type,
do not force the content type to application/x-octet-stream
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1839983&r1=1839982&r2=1839983&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Mon
Sep 3 19:08:53 2018
@@ -22,9 +22,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
@@ -41,11 +39,9 @@ public class ResponseIncludeWrapper exte
/**
* The names of some headers we want to capture.
*/
-private static final String CONTENT_TYPE = "content-type";
private static final String LAST_MODIFIED = "last-modified";
protected long lastModified = -1;
-private String contentType = null;
/**
* Our ServletOutputStream
@@ -54,24 +50,16 @@ public class ResponseIncludeWrapper exte
protected ServletOutputStream servletOutputStream;
protected PrintWriter printWriter;
-private final ServletContext context;
-private final HttpServletRequest request;
-
/**
* Initialize our wrapper with the current HttpServletResponse and
* ServletOutputStream.
*
- * @param context The servlet context
- * @param request The HttpServletResponse to use
* @param response The response to use
* @param captureServletOutputStream The ServletOutputStream to use
*/
-public ResponseIncludeWrapper(ServletContext context,
-HttpServletRequest request, HttpServletResponse response,
+public ResponseIncludeWrapper(HttpServletResponse response,
ServletOutputStream captureServletOutputStream) {
super(response);
-this.context = context;
-this.request = request;
this.captureServletOutputStream = captureServletOutputStream;
}
@@ -152,41 +140,6 @@ public class ResponseIncludeWrapper exte
return lastModified;
}
-/**
- * Returns the value of the content-type header field.
- *
- * @return the content type of the resource referenced by this
- * ResponseIncludeWrapper, or null if not
known.
- */
-@Override
-public String getContentType() {
-if (contentType == null) {
-String url = request.getRequestURI();
-String mime = context.getMimeType(url);
-if (mime != null) {
-setContentType(mime);
-} else {
-// return a safe value
-setContentType("application/x-octet-stream");
-}
-}
-return contentType;
-}
-
-/**
- * Sets the value of the content-type header field.
- *
- * @param mime a mime type
- */
-@Override
-public void setContentType(String mime) {
-contentType = mime;
-if (contentType != null) {
-getResponse().setContentType(contentType);
-}
-}
-
-
@Override
public void addDateHeader(String name, long value) {
super.addDateHeader(name, value);
@@ -205,8 +158,6 @@ public class ResponseIncludeWrapper exte
if (lastModified != -1) {
this.lastModified = lastModified;
}
-} else if (lname.equals(CONTENT_TYPE)) {
-contentType = value;
}
}
@@ -228,8 +179,6 @@ public class ResponseIncludeWrapper exte
if (lastModified != -1) {
this.lastModified = lastModified;
}
-} else if (lname.equals(CONTENT_TYPE)) {
-contentType = value;
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1839983&r1=1839982&r2=1839983&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Mon Sep
svn commit: r1839984 - /tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Author: markt
Date: Mon Sep 3 19:10:08 2018
New Revision: 1839984
URL: http://svn.apache.org/viewvc?rev=1839984&view=rev
Log:
Simplify code
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1839984&r1=1839983&r2=1839984&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Mon
Sep 3 19:10:08 2018
@@ -132,11 +132,6 @@ public class ResponseIncludeWrapper exte
* known.
*/
public long getLastModified() {
-if (lastModified == -1) {
-// javadocs say to return -1 if date not known, if you want another
-// default, put it here
-return -1;
-}
return lastModified;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1839985 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/Globals.java java/org/apache/catalina/ssi/SSIFilter.java java/org/apache/catalina/ssi/SSIServlet.java
Author: markt Date: Mon Sep 3 19:12:26 2018 New Revision: 1839985 URL: http://svn.apache.org/viewvc?rev=1839985&view=rev Log: Remove / deprecate code originally added to enable the CGI Servlet to work as an include with SSI. The CGI servlet has generic handling for the include case and this flag is no longer required. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 19:12:26 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,176276
svn commit: r1839986 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ssi/ResponseIncludeWrapper.java java/org/apache/catalina/ssi/SSIFilter.java java/org/apache/catalina/ssi/SSIServletExternal
Author: markt Date: Mon Sep 3 19:14:07 2018 New Revision: 1839986 URL: http://svn.apache.org/viewvc?rev=1839986&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62669 When using the SSIFilter and a resource does not specify a content type, do not force the content type to application/x-octet-stream Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 19:14:07 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1
svn commit: r1839987 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Author: markt Date: Mon Sep 3 19:14:31 2018 New Revision: 1839987 URL: http://svn.apache.org/viewvc?rev=1839987&view=rev Log: Simplify Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 19:14:31 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,
svn commit: r1839988 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/Globals.java java/org/apache/catalina/ssi/SSIFilter.java java/org/apache/catalina/ssi/SSIServlet.java
Author: markt Date: Mon Sep 3 19:16:34 2018 New Revision: 1839988 URL: http://svn.apache.org/viewvc?rev=1839988&view=rev Log: Remove / deprecate code originally added to enable the CGI Servlet to work as an include with SSI. The CGI servlet has generic handling for the include case and this flag is no longer required. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIServlet.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 19:16:34 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1659907,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,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814
svn commit: r1839989 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ssi/ResponseIncludeWrapper.java java/org/apache/catalina/ssi/SSIFilter.java java/org/apache/catalina/ssi/SSIServletExternal
Author: markt Date: Mon Sep 3 19:20:36 2018 New Revision: 1839989 URL: http://svn.apache.org/viewvc?rev=1839989&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62669 When using the SSIFilter and a resource does not specify a content type, do not force the content type to application/x-octet-stream Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 3 19:20:36 2018 @@ -1,3 +1,3 @@ /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,1644525,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,1659907,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,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574
svn commit: r1839990 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Author: markt
Date: Mon Sep 3 19:20:54 2018
New Revision: 1839990
URL: http://svn.apache.org/viewvc?rev=1839990&view=rev
Log:
Simplify
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1839990&r1=1839989&r2=1839990&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
Mon Sep 3 19:20:54 2018
@@ -142,11 +142,6 @@ public class ResponseIncludeWrapper exte
* known.
*/
public long getLastModified() {
-if (lastModified == -1) {
-// javadocs say to return -1 if date not known, if you want another
-// default, put it here
-return -1;
-}
return lastModified;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62669] ResponseIncludeWrapper.getContentType() never returns NULL and sets the field
https://bz.apache.org/bugzilla/show_bug.cgi?id=62669 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in: - trunk for 9.0.12 onwards - 8.5.x for 8.5.34 onwards - 7.0.x for 7.0.91 onwards I've removed the Content-Type processing from the wrapper. I left the last modified processing as it did serve a purpose (it saved looking for and parsing the header to pass the value to the SSIProcessor). -- 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 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667
--- Comment #9 from Felix Schumacher ---
(In reply to Remy Maucherat from comment #7)
> I added the "feature"/bugfix for 9.0.12 and 8.5.34.
>
> I have no idea what the language from the comment "For security reasons we
> must never expand a string that includes verbatim data from the network."
> means since well, that's the point and this BZ asks for
> ${portals:%{HTTP_HOST}} (%{HTTP_HOST} is clearly verbatim network data).
> Comments ? Maybe it means you shouldn't parse network data (only evaluate),
> but that's not the case here obviously: the configuration is parsed on valve
> start and that's it.
I would read it so that data sent from client should not be expanded any
further.
So for example a user sends "%{HTTP_HOST}" as the value of the host header,
this would/could result in a infinite loop. There are probably more malicious
examples that could be thought of.
--
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 62667] RewriteMap not working with %{HTTP_HOST}
https://bz.apache.org/bugzilla/show_bug.cgi?id=62667
--- Comment #10 from Remy Maucherat ---
Ok, then it's fine as there's no dynamic parsing. If "%{HTTP_HOST}" evaluates
to "%{HTTP_HOST}", then it's the final result.
--
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
