svn commit: r1676479 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Author: markt
Date: Tue Apr 28 11:19:22 2015
New Revision: 1676479
URL: http://svn.apache.org/r1676479
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57837
Add text/css to the default for compressableMimeType
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676479r1=1676478r2=1676479view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
Apr 28 11:19:22 2015
@@ -132,7 +132,7 @@ public abstract class AbstractHttp11Prot
}
-private String compressableMimeType = text/html,text/xml,text/plain;
+private String compressableMimeType =
text/html,text/xml,text/plain,text/css;
private String[] compressableMimeTypes = null;
public String getCompressableMimeType() { return compressableMimeType; }
public void setCompressableMimeType(String valueS) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57866] FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 j...@yahoo.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #2 from j...@yahoo.com --- Every byte of data remains uncompressed. No data is compressed after the first flush. Compression is [re]enabled, but Deflater doesn't actually compress anything, just makes every write bigger. -- 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 57837] add text/css to default of compressableMimeType
https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 --- Comment #8 from romain.manni-bucau rmannibu...@gmail.com --- +1 for javascript as well -- 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 exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/226 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1676532 Blamelist: markt BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57870] backport GzipOutputFilter #doWrite to Tomcat 7 to call GZIPOutputStream to enable flushing via reflection when running on Java 7+
https://bz.apache.org/bugzilla/show_bug.cgi?id=57870 j...@yahoo.com changed: What|Removed |Added CC||j...@yahoo.com -- 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 57870] New: backport GzipOutputFilter #doWrite to Tomcat 7 to call GZIPOutputStream to enable flushing via reflection when running on Java 7+
https://bz.apache.org/bugzilla/show_bug.cgi?id=57870 Bug ID: 57870 Summary: backport GzipOutputFilter #doWrite to Tomcat 7 to call GZIPOutputStream to enable flushing via reflection when running on Java 7+ Product: Tomcat 7 Version: 7.0.54 Hardware: PC OS: Linux Status: NEW Severity: enhancement Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: j...@yahoo.com followup of https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 (short version here) FlushableGZIPOutputStream does not compress after the first flush() due to a bug in the JVM (already reported upstream). As per https://bz.apache.org/bugzilla/show_bug.cgi?id=57866#c3 (Konstantin Kolinko): Tomcat 8 does not use FlushableGZIPOutputStream, but uses new Java7+ constructor for java.util.zip.GZIPOutputStream to enable flushing. It should be possible to backport that to Tomcat 7 to call that constructor via reflection when running on Java 7+. -- 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: r1676477 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Protocol.java java/org/apache/coyote/http11/Http11Processor.java webapps/docs/config/http.xml
Author: markt
Date: Tue Apr 28 11:18:32 2015
New Revision: 1676477
URL: http://svn.apache.org/r1676477
Log:
Refactor compressableMimeType
Convert comma separated string to string array once and re-use it rather than
converting for every new Processor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676477r1=1676476r2=1676477view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
Apr 28 11:18:32 2015
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpUpgradeHandler;
@@ -131,16 +132,29 @@ public abstract class AbstractHttp11Prot
}
-private String compressableMimeTypes = text/html,text/xml,text/plain;
-public String getCompressableMimeType() { return compressableMimeTypes; }
+private String compressableMimeType = text/html,text/xml,text/plain;
+private String[] compressableMimeTypes = null;
+public String getCompressableMimeType() { return compressableMimeType; }
public void setCompressableMimeType(String valueS) {
-compressableMimeTypes = valueS;
+compressableMimeType = valueS;
+compressableMimeTypes = null;
}
-public String getCompressableMimeTypes() {
-return getCompressableMimeType();
-}
-public void setCompressableMimeTypes(String valueS) {
-setCompressableMimeType(valueS);
+public String[] getCompressableMimeTypes() {
+String[] result = compressableMimeTypes;
+if (result != null) {
+return result;
+}
+ListString values = new ArrayList();
+StringTokenizer tokens = new StringTokenizer(compressableMimeType,
,);
+while (tokens.hasMoreTokens()) {
+String token = tokens.nextToken().trim();
+if (token.length() 0) {
+values.add(token);
+}
+}
+result = values.toArray(new String[values.size()]);
+compressableMimeTypes = result;
+return result;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1676477r1=1676476r2=1676477view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Apr 28
11:18:32 2015
@@ -21,7 +21,6 @@ import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
import java.util.Locale;
import java.util.Set;
-import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
@@ -201,11 +200,11 @@ public class Http11Processor extends Abs
*/
protected Pattern noCompressionUserAgents = null;
+
/**
- * List of MIMES which could be gzipped
+ * List of MIMES for which compression may be enabled.
*/
-protected String[] compressableMimeTypes =
-{ text/html, text/xml, text/plain };
+protected String[] compressableMimeTypes;
/**
@@ -320,18 +319,6 @@ public class Http11Processor extends Abs
}
}
-/**
- * Add a mime-type which will be compressible
- * The mime-type String will be exactly matched
- * in the response mime-type header .
- *
- * @param mimeType mime-type string
- */
-public void addCompressableMimeType(String mimeType) {
-compressableMimeTypes =
-addStringArray(compressableMimeTypes, mimeType);
-}
-
/**
* Set compressible mime-type list (this method is best when used with
@@ -344,24 +331,6 @@ public class Http11Processor extends Abs
/**
- * Set compressable mime-type list
- * List contains users agents separated by ',' :
- *
- * ie: text/html,text/xml,text/plain
- */
-public void setCompressableMimeTypes(String compressableMimeTypes) {
-if (compressableMimeTypes != null) {
-this.compressableMimeTypes = null;
-StringTokenizer st = new StringTokenizer(compressableMimeTypes,
,);
-
-while (st.hasMoreTokens()) {
-addCompressableMimeType(st.nextToken().trim());
-}
-}
-}
-
-
-/**
* Return compression level.
*/
Fwd: [Bug 56438] If jar scan does not find context config or TLD config, log a message
Hi Mark, As you mentioned in issue thread, i have provided fix for TLD scan to inline Tomcat7 with 8.0 and trunk. Please review the patch and let me know if you see any problem. regards, pravallika -- Forwarded message -- From: bugzi...@apache.org Date: Tue, Apr 28, 2015 at 2:52 PM Subject: [Bug 56438] If jar scan does not find context config or TLD config, log a message To: dev@tomcat.apache.org Created attachment 32694 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32694action=edit Fix for TLD scan in Tomcat7.0 This is the first patch to make Tomcat7.0 to make it in line with 8.0 and recent trunks. It has fix for only TLD scans. It does not include fix for context configs. -- 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 57866] FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to j__n from comment #0) the deflated bytes seem to be a binary header followed by uncompressed text. This is expected. There shall be several uncompressed bytes of data (one byte of data, if I remember correctly), but if you write more then the compression shall be re-enabled automatically. See flagReenableCompression field in FlushableGZIPOutputStream.java -- 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 57837] add text/css to default of compressableMimeType
https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 --- Comment #7 from mgrigorov mgrigo...@apache.org --- I agree with Rainer that JavaScript should be whitelisted as well. @Mark: do you see problem by adding text/javascript and application/javascript to the list? -- 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 57866] FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 j...@yahoo.com changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #4 from j...@yahoo.com --- 1. Thanks for that. Tomcat did call def.setLevel(Deflater.DEFAULT_COMPRESSION); but that call did not re-enable compression. I found a bug report upstream https://bugs.openjdk.java.net/browse/JDK-8020687 so it may be fixed in Java 8. Will give it a try. 2. Thanks for that. I'll give Tomcat 8 a try and open an RFE accordingly. -- 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: r1676525 - /tomcat/trunk/build.xml
Author: markt
Date: Tue Apr 28 12:58:38 2015
New Revision: 1676525
URL: http://svn.apache.org/r1676525
Log:
Fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57707
Clearer error message when trying to build a full release build on a
non-Windows platform without Wine.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1676525r1=1676524r2=1676525view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Apr 28 12:58:38 2015
@@ -2119,9 +2119,27 @@ Apache Tomcat ${version} native binaries
/copy
/target
+ target name=-installer-pre-init
+property environment=env /
+condition property=wine.ok
+ or
+os family=windows /
+available file=wine filepath=${env.PATH} /
+isset property=skip.installer/
+ /or
+/condition
+ /target
+
+ target name=-installer-init depends=-installer-pre-init
unless=${wine.ok}
+fail message=The executable wine was not found on the current path.
+Wine is required to build the Windows installer when running a release build on
+a non-Windows platform. To skip building the Windows installer, set the
+skip.installer property in build.properties /
+ /target
+
target name=-installer-prep
description=Prepares file structure required to build installer
- unless=skip.installer depends=dist-static
+ unless=skip.installer depends=dist-static,-installer-init
copy todir=${tomcat.dist}
fileset dir=res
include name=INSTALLLICENSE /
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676532 - in /tomcat/tc8.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 13:37:38 2015 New Revision: 1676532 URL: http://svn.apache.org/r1676532 Log: Clearer error message when trying to build a full release build on a non-Windows platform without Wine. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/build.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 13:37:38 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479
svn commit: r1676484 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Protocol.java webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt Date: Tue Apr 28 11:23:38 2015 New Revision: 1676484 URL: http://svn.apache.org/r1676484 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 Add text/css to the default for compressableMimeType Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 11:23:38 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57837] add text/css to default of compressableMimeType
https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #6 from Mark Thomas ma...@apache.org --- Thanks for the report. This has been fixed in trunk (for 9.0.x), tc8.0.x/trunk for 8.0.22 onwards and tc7.0.x/trunk for 7.0.62 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
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/225 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1676483 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57866] FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- 1. If Tomcat did call def.setLevel(Deflater.DEFAULT_COMPRESSION); but that call did not re-enable compression, that would be a bug in Deflater class. From Tomcat point of view that is a WONTFIX. It is up to JRE vendor (Oracle) to fix their Deflater implementation. (Disclaimer: I have not run your example yet. IIRC, when I tested it several years ago the compression was re-enabled successfully.) 2. See o.a.coyote.http11.filters.GzipOutputFilter #doWrite(ByteChunk chunk, Response res). That is where FlushableGZIPOutputStream is instantiated. Tomcat 8 does not use FlushableGZIPOutputStream, but uses new Java7+ constructor for java.util.zip.GZIPOutputStream to enable flushing. It should be possible to backport that to Tomcat 7 to call that constructor via reflection when running on Java 7+. (As such, this issue becomes an enhancement request). -- 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 57837] add text/css to default of compressableMimeType
https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 --- Comment #9 from Violeta Georgieva violet...@apache.org --- +1 for javascript -- 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 57707] Execute failed: java.io.IOException: Cannot run program wine
https://bz.apache.org/bugzilla/show_bug.cgi?id=57707 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #11 from Mark Thomas ma...@apache.org --- Yes, the error message could be better but I also don't think it is unreasonable to expect folks to look at BUILDING.txt if they run into a problem building Tomcat. It is in the root of the src distro and the svn repo which are the first places I'd expect people to look for docs if they were having issues. Testing for the presence of a binary on the path (for a given OS) and then failing the build if it is not found is a on-trivial addition to what is already a large, complex build file. There is a balance to strike between between catching all failure modes and a simpler build file. My instinct was to close this as WONTFIX but I wanted a better idea of how much code was required. Having written the patch and found it was ~20 lines I was on the fence whether to apply it or not. It isn't small, but neither is it huge and it is fairly simple so I decided, on balance, to apply it. If I have known at the start it was ~20 lines I probably would have followed by instincts and closed this as WONTFIX. The patch has been applied to trunk and I'll back-port it to 8.0.x but I don't intend to back-port it to 7.0.x. If will probably get back-ported when/if code signing is back-ported to 7.0.x. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676483 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Protocol.java webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt Date: Tue Apr 28 11:23:02 2015 New Revision: 1676483 URL: http://svn.apache.org/r1676483 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57837 Add text/css to the default for compressableMimeType Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 11:23:02 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/637 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1676484 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676552 - /tomcat/trunk/webapps/docs/config/cluster.xml
Author: markt Date: Tue Apr 28 14:55:13 2015 New Revision: 1676552 URL: http://svn.apache.org/r1676552 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Make it clearer that hex values are not valid for cluster send options Based on a patch by Kyohei Nakamura Modified: tomcat/trunk/webapps/docs/config/cluster.xml Modified: tomcat/trunk/webapps/docs/config/cluster.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster.xml?rev=1676552r1=1676551r2=1676552view=diff == --- tomcat/trunk/webapps/docs/config/cluster.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster.xml Tue Apr 28 14:55:13 2015 @@ -123,11 +123,11 @@ codeChannel.SEND_OPTIONS_SYNCHRONIZED_ACK = 0x0004/codebr/ codeChannel.SEND_OPTIONS_ASYNCHRONOUS = 0x0008/codebr/ codeChannel.SEND_OPTIONS_USE_ACK = 0x0002/codebr/ - So to use ACK and ASYNC messaging, the flag would be code10 (8+2) or 0x000B/codebr/ + So to use ACK and ASYNC messaging, the flag would be code10/code (8+2) + br/ Note that if you use ASYNC messaging it is possible for update messages for a session to be processed by the receiving nodes in a different order - to the order in which they were sent. - /p + to the order in which they were sent./p /attribute attribute name=channelStartOptions required=false pSets the start and stop flags for the lt;Channelgt; object used by the cluster. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676557 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/cluster.xml
Author: markt Date: Tue Apr 28 15:04:56 2015 New Revision: 1676557 URL: http://svn.apache.org/r1676557 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Make it clearer that hex values are not valid for cluster send options Based on a patch by Kyohei Nakamura Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 15:04:56 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57864] channelSendOptions attribute is not able to be configured in hexadecimal
https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the report and the patch. I have applied a variation of the patch to trunk (for 9.0.x), tc8.0.x/trunk (for 8.0.22 onwards), tc7.0.x/trunk (for 7.0.62 onwards) and tc6.0.x/trunk for 6.0.44 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: r1676558 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/cluster.xml
Author: markt Date: Tue Apr 28 15:08:58 2015 New Revision: 1676558 URL: http://svn.apache.org/r1676558 Log: CTR: Docs only Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Make it clearer that hex values are not valid for cluster send options Based on a patch by Kyohei Nakamura Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1676558r1=1676557r2=1676558view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 28 15:08:58 2015 @@ -169,6 +169,11 @@ it clear that the order keys are read from the keystore is implementation dependent. (markt) /add + fix +bug57864/bug: Update the documentation web application to make it +clearer that hex values are not valid for cluster send options. Based on +a patch by Kyohei Nakamura. (markt) + /fix /changelog /subsection subsection name=Other Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml?rev=1676558r1=1676557r2=1676558view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml Tue Apr 28 15:08:58 2015 @@ -124,11 +124,11 @@ codeChannel.SEND_OPTIONS_SYNCHRONIZED_ACK = 0x0004/codebr/ codeChannel.SEND_OPTIONS_ASYNCHRONOUS = 0x0008/codebr/ codeChannel.SEND_OPTIONS_USE_ACK = 0x0002/codebr/ - So to use ACK and ASYNC messaging, the flag would be code10 (8+2) or 0x000B/codebr/ + So to use ACK and ASYNC messaging, the flag would be code10/code (8+2) + br/ Note that if you use ASYNC messaging it is possible for update messages for a session to be processed by the receiving nodes in a different order - to the order in which they were sent. - /p + to the order in which they were sent./p /attribute attribute name=channelStartOptions required=false pSets the start and stop flags for the lt;Channelgt; object used by the cluster. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676556 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/cluster.xml
Author: markt Date: Tue Apr 28 15:03:29 2015 New Revision: 1676556 URL: http://svn.apache.org/r1676556 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Make it clearer that hex values are not valid for cluster send options Based on a patch by Kyohei Nakamura Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/cluster.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 15:03:29 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/227 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1676556 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1159 Buildbot URL: http://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] 1676552 Blamelist: markt 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: r1676615 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/Substitution.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java test/org/apache/catalina/valves/rewrite
Author: markt
Date: Tue Apr 28 20:35:21 2015
New Revision: 1676615
URL: http://svn.apache.org/r1676615
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57863
Correct RewriteMap support
Based on a patch provided by Tatsuya Bessho.
Added:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
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=1676615r1=1676614r2=1676615view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java Tue
Apr 28 20:35:21 2015
@@ -30,8 +30,7 @@ public class Substitution {
public String value;
@Override
-public String evaluate
-(Matcher rule, Matcher cond, Resolver resolver) {
+public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
return value;
}
@@ -89,9 +88,10 @@ public class Substitution {
public RewriteMap map = null;
public String key;
public String defaultValue = null;
+public int n;
@Override
public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
-String result = map.lookup(key);
+String result = map.lookup(rule.group(n));
if (result == null) {
result = defaultValue;
}
@@ -162,6 +162,9 @@ public class Substitution {
} else {
newElement.key = sub.substring(colon + 1, close);
}
+if (newElement.key.startsWith($)) {
+newElement.n =
Integer.parseInt(newElement.key.substring(1));
+}
pos = close + 1;
elements.add(newElement);
}
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=1676615r1=1676614r2=1676615view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Tue Apr 28 20:35:21 2015
@@ -46,6 +46,19 @@ public class TestRewriteValve extends To
doTestRewrite(RewriteRule ^/b/(.*) /b/../a/$1, /b/%255A,
/b/../a/%255A);
}
+// BZ 57863
+@Test
+public void testRewriteMap01() throws Exception {
+doTestRewrite(RewriteMap mapa
org.apache.catalina.valves.rewrite.TesterRewriteMapA\n +
+RewriteRule /b/(.*).html$ /c/${mapa:$1}, /b/a.html,
/c/aa);
+}
+
+@Test
+public void testRewriteMap02() throws Exception {
+doTestRewrite(RewriteMap mapa
org.apache.catalina.valves.rewrite.TesterRewriteMapA\n +
+RewriteRule /b/(.*).html$ /c/${mapa:$1|dd}, /b/x.html,
/c/dd);
+}
+
private void doTestRewrite(String config, String request, String
expectedURI) throws Exception {
Tomcat tomcat = getTomcatInstance();
@@ -61,6 +74,7 @@ public class TestRewriteValve extends To
// (http://svn.apache.org/r285186)
Tomcat.addServlet(ctx, snoop, new SnoopServlet());
ctx.addServletMapping(/a/%255A, snoop);
+ctx.addServletMapping(/c/*, snoop);
tomcat.start();
Added:
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=1676615view=auto
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java
Tue Apr 28 20:35:21 2015
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
Re: svn commit: r1676393 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
Mark,
On 4/27/15 7:01 PM, ma...@apache.org wrote:
Author: markt
Date: Mon Apr 27 23:01:16 2015
New Revision: 1676393
URL: http://svn.apache.org/r1676393
Log:
Add some comments to clarify behaviour.
Review by schultz re object allocation
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1676393r1=1676392r2=1676393view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 23:01:16
2015
@@ -41,6 +41,9 @@ import org.apache.el.util.ReflectionUtil
*/
public final class AstValue extends SimpleNode {
+private static final Object[] EMPTY_ARRAY = new Object[0];
+private static final Object[] ARRAY_OF_SINGLE_NULL = new Object[1];
+
protected static class Target {
protected Object base;
@@ -263,7 +266,8 @@ public final class AstValue extends Simp
private Object[] convertArgs(EvaluationContext ctx, Object[] src, Method
m) {
Class?[] types = m.getParameterTypes();
if (types.length == 0) {
-return new Object[0];
+// Treated as if parameters have been provided so src is ignored
+return EMPTY_ARRAY;
}
int paramCount = types.length;
@@ -271,23 +275,24 @@ public final class AstValue extends Simp
if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
!m.isVarArgs() (paramCount 0 src == null ||
src != null src.length != paramCount)) {
-String inputParamCount = null;
+String srcCount = null;
if (src != null) {
-inputParamCount = Integer.toString(src.length);
+srcCount = Integer.toString(src.length);
}
String msg;
if (m.isVarArgs()) {
msg = MessageFactory.get(error.invoke.tooFewParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount, Integer.toString(paramCount));
} else {
msg = MessageFactory.get(error.invoke.wrongParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount, Integer.toString(paramCount));
}
throw new IllegalArgumentException(msg);
}
if (src == null) {
-return new Object[1];
+// Must be a varargs method with a single parameter.
+return ARRAY_OF_SINGLE_NULL;
Is this safe? I'm not sure of the scope of this array, but client code
could potentially mutate the contents. We fully expect
ARRAY_OF_SINGLE_NULL[0] to be == null, but some other code could change
it and it would probably cause a huge mess.
I like the use of a flyweight here, but if that object ever gets out of
our control, it could be poisoned.
Thanks,
-chris
signature.asc
Description: OpenPGP digital signature
[Bug 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #10 from Mark Thomas ma...@apache.org --- Thanks for the patch. It has been applied to 7.0.x/trunk for 7.0.62 onwards with the following changes: - renamed objCallBack to tldCallBack - fixed TldJarScannerCallback so it only reported no TLD was found if it actually looked for a TLD and didn't find one. -- 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: r1676636 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java
Author: markt Date: Tue Apr 28 21:30:30 2015 New Revision: 1676636 URL: http://svn.apache.org/r1676636 Log: Use a new object every time for security. Review by schultz. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 21:30:30 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
Re: svn commit: r1676393 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
Mark,
On 4/28/15 5:26 PM, Mark Thomas wrote:
On 28/04/2015 22:21, Christopher Schultz wrote:
Mark,
On 4/27/15 7:01 PM, ma...@apache.org wrote:
Author: markt
Date: Mon Apr 27 23:01:16 2015
New Revision: 1676393
URL: http://svn.apache.org/r1676393
Log:
Add some comments to clarify behaviour.
Review by schultz re object allocation
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1676393r1=1676392r2=1676393view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27
23:01:16 2015
@@ -41,6 +41,9 @@ import org.apache.el.util.ReflectionUtil
*/
public final class AstValue extends SimpleNode {
+private static final Object[] EMPTY_ARRAY = new Object[0];
+private static final Object[] ARRAY_OF_SINGLE_NULL = new Object[1];
+
protected static class Target {
protected Object base;
@@ -263,7 +266,8 @@ public final class AstValue extends Simp
private Object[] convertArgs(EvaluationContext ctx, Object[] src,
Method m) {
Class?[] types = m.getParameterTypes();
if (types.length == 0) {
-return new Object[0];
+// Treated as if parameters have been provided so src is
ignored
+return EMPTY_ARRAY;
}
int paramCount = types.length;
@@ -271,23 +275,24 @@ public final class AstValue extends Simp
if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
!m.isVarArgs() (paramCount 0 src == null ||
src != null src.length != paramCount)) {
-String inputParamCount = null;
+String srcCount = null;
if (src != null) {
-inputParamCount = Integer.toString(src.length);
+srcCount = Integer.toString(src.length);
}
String msg;
if (m.isVarArgs()) {
msg = MessageFactory.get(error.invoke.tooFewParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount,
Integer.toString(paramCount));
} else {
msg = MessageFactory.get(error.invoke.wrongParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount,
Integer.toString(paramCount));
}
throw new IllegalArgumentException(msg);
}
if (src == null) {
-return new Object[1];
+// Must be a varargs method with a single parameter.
+return ARRAY_OF_SINGLE_NULL;
Is this safe? I'm not sure of the scope of this array, but client code
could potentially mutate the contents. We fully expect
ARRAY_OF_SINGLE_NULL[0] to be == null, but some other code could change
it and it would probably cause a huge mess.
I like the use of a flyweight here, but if that object ever gets out of
our control, it could be poisoned.
Untrusted apps are a minority use case but they do exist. I think you
are right and I'll use a new array every time.
I wasn't sure how far this object would go, but I guess it might
ultimately end up as the parameter to a method controlled by the
application.
There might be a security vulnerability there, like triggering a call to
an evil method to trigger that array to be passed to it, and then
changing the value. Then calling an important method with a null
argument to maybe pass some argument-checking or something. I can't
think of a use-case off the top of my head but someone more creative
than I might be able to.
Since it would affect other web applications running on the same
container, it wouldn't just be dangerous to a single web app.
This is a relatively unlikely case, so I think object-allocation isn't
too much of a concern.
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1676631 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java webapps/docs/changelog.xml
Author: markt Date: Tue Apr 28 21:04:52 2015 New Revision: 1676631 URL: http://svn.apache.org/r1676631 Log: Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57556 Only include a trailing separator in the real path if the requested path included one. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 21:04:52 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615
Re: svn commit: r1676393 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
On 28/04/2015 22:21, Christopher Schultz wrote:
Mark,
On 4/27/15 7:01 PM, ma...@apache.org wrote:
Author: markt
Date: Mon Apr 27 23:01:16 2015
New Revision: 1676393
URL: http://svn.apache.org/r1676393
Log:
Add some comments to clarify behaviour.
Review by schultz re object allocation
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1676393r1=1676392r2=1676393view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 23:01:16
2015
@@ -41,6 +41,9 @@ import org.apache.el.util.ReflectionUtil
*/
public final class AstValue extends SimpleNode {
+private static final Object[] EMPTY_ARRAY = new Object[0];
+private static final Object[] ARRAY_OF_SINGLE_NULL = new Object[1];
+
protected static class Target {
protected Object base;
@@ -263,7 +266,8 @@ public final class AstValue extends Simp
private Object[] convertArgs(EvaluationContext ctx, Object[] src,
Method m) {
Class?[] types = m.getParameterTypes();
if (types.length == 0) {
-return new Object[0];
+// Treated as if parameters have been provided so src is ignored
+return EMPTY_ARRAY;
}
int paramCount = types.length;
@@ -271,23 +275,24 @@ public final class AstValue extends Simp
if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
!m.isVarArgs() (paramCount 0 src == null ||
src != null src.length != paramCount)) {
-String inputParamCount = null;
+String srcCount = null;
if (src != null) {
-inputParamCount = Integer.toString(src.length);
+srcCount = Integer.toString(src.length);
}
String msg;
if (m.isVarArgs()) {
msg = MessageFactory.get(error.invoke.tooFewParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount,
Integer.toString(paramCount));
} else {
msg = MessageFactory.get(error.invoke.wrongParams,
-m.getName(), inputParamCount,
Integer.toString(paramCount));
+m.getName(), srcCount,
Integer.toString(paramCount));
}
throw new IllegalArgumentException(msg);
}
if (src == null) {
-return new Object[1];
+// Must be a varargs method with a single parameter.
+return ARRAY_OF_SINGLE_NULL;
Is this safe? I'm not sure of the scope of this array, but client code
could potentially mutate the contents. We fully expect
ARRAY_OF_SINGLE_NULL[0] to be == null, but some other code could change
it and it would probably cause a huge mess.
I like the use of a flyweight here, but if that object ever gets out of
our control, it could be poisoned.
Untrusted apps are a minority use case but they do exist. I think you
are right and I'll use a new array every time.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57556] getServletContext().getRealPath(/) returns path not ending with /
https://bz.apache.org/bugzilla/show_bug.cgi?id=57556 --- Comment #8 from Mark Thomas ma...@apache.org --- (In reply to Chuck Caldarale from comment #7) (In reply to Christopher Schultz from comment #6) But my position is that this method should unconditionally return null. +1 on that. Anyone using this method for anything other than debugging is fooling themselves. Indeed but this request looks reasonable. I'll take a look. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/639 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1676633 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/640 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1676636 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57863] Can't get the matched pattern in RewriteValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=57863 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the analysis and the patch. I have committed a slight variation (allow for $10+) and added some test cases. The fix has been made in trunk (for 9.0.x) and tc8.0.x/trunk for 8.0.22 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: r1676619 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/
Author: markt Date: Tue Apr 28 20:37:37 2015 New Revision: 1676619 URL: http://svn.apache.org/r1676619 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57863 Correct RewriteMap support Based on a patch provided by Tatsuya Bessho. Added: tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java - copied unchanged from r1676615, tomcat/trunk/test/org/apache/catalina/valves/rewrite/TesterRewriteMapA.java Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 20:37:37 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552
[Bug 57802] Compatibility with ICEfaces 1.8 over JSF 1.1 apps
https://bz.apache.org/bugzilla/show_bug.cgi?id=57802 --- Comment #11 from Patrick WENDJI wlpa2...@gmail.com --- Sorry for the silence. I'm a bit busy right now since I'm building the test case part time. I'll come back to you once it's done. -- 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 exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/228 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1676619 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57802] Compatibility with ICEfaces 1.8 over JSF 1.1 apps
https://bz.apache.org/bugzilla/show_bug.cgi?id=57802 --- Comment #12 from Mark Thomas ma...@apache.org --- OK. No rush. We don't normally close things until there has been at least a month of inactivity. Worst case if this gets closed before you have a test case you can always re-open it when you have the test case. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676634 - /tomcat/trunk/java/org/apache/el/parser/AstValue.java
Author: markt
Date: Tue Apr 28 21:28:26 2015
New Revision: 1676634
URL: http://svn.apache.org/r1676634
Log:
Use a new object every time for security. Review by schultz.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1676634r1=1676633r2=1676634view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Tue Apr 28 21:28:26
2015
@@ -42,7 +42,6 @@ import org.apache.el.util.ReflectionUtil
public final class AstValue extends SimpleNode {
private static final Object[] EMPTY_ARRAY = new Object[0];
-private static final Object[] ARRAY_OF_SINGLE_NULL = new Object[1];
protected static class Target {
protected Object base;
@@ -292,7 +291,9 @@ public final class AstValue extends Simp
if (src == null) {
// Must be a varargs method with a single parameter.
-return ARRAY_OF_SINGLE_NULL;
+// Use a new array every time since the called code could modify
the
+// contents of the array
+return new Object[1];
}
Object[] dest = new Object[paramCount];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676635 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java
Author: markt Date: Tue Apr 28 21:29:32 2015 New Revision: 1676635 URL: http://svn.apache.org/r1676635 Log: Use a new object every time for security. Review by schultz. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/el/parser/AstValue.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 28 21:29:32 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
[Bug 57802] Compatibility with ICEfaces 1.8 over JSF 1.1 apps
https://bz.apache.org/bugzilla/show_bug.cgi?id=57802 --- Comment #10 from Mark Thomas ma...@apache.org --- Without a test case this is going to get resolved as INVALID. -- 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: r1676630 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java
Author: markt
Date: Tue Apr 28 21:03:04 2015
New Revision: 1676630
URL: http://svn.apache.org/r1676630
Log:
Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57556
Only include a trailing separator in the real path if the requested path
included one.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1676630r1=1676629r2=1676630view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Apr 28
21:03:04 2015
@@ -4411,7 +4411,8 @@ public class StandardContext extends Con
String canonicalPath = resource.getCanonicalPath();
if (canonicalPath == null) {
return null;
-} else if (resource.isDirectory()
!canonicalPath.endsWith(File.separator)) {
+} else if ((resource.isDirectory()
!canonicalPath.endsWith(File.separator) ||
+!resource.exists()) path.endsWith(/)) {
return canonicalPath + File.separatorChar;
} else {
return canonicalPath;
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1676630r1=1676629r2=1676630view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue Apr
28 21:03:04 2015
@@ -956,11 +956,11 @@ public class TestStandardContext extends
doTestBug57556(testContext, , base + File.separatorChar);
doTestBug57556(testContext, /, base + File.separatorChar);
-doTestBug57556(testContext, /jsp, base + File.separatorChar+ jsp +
File.separatorChar);
+doTestBug57556(testContext, /jsp, base + File.separatorChar+ jsp);
doTestBug57556(testContext, /jsp/, base + File.separatorChar+ jsp
+ File.separatorChar);
doTestBug57556(testContext, /index.html, base + File.separatorChar +
index.html);
-// Doesn't exist so Tomcat will assume it is a file, not a directory.
doTestBug57556(testContext, /foo, base + File.separatorChar + foo);
+doTestBug57556(testContext, /foo/, base + File.separatorChar + foo
+ File.separatorChar);
}
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676633 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/LocalStrings.properties java/org/apache/catalina/startup/TldConfig.java webapps/docs/changelog.xml
Author: markt
Date: Tue Apr 28 21:20:00 2015
New Revision: 1676633
URL: http://svn.apache.org/r1676633
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=56438
Add logging for unnecessary TLD scans in JARs
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1676633r1=1676632r2=1676633view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Tue Apr 28 21:20:00 2015
@@ -124,8 +124,11 @@ tldConfig.addListeners=Adding {0} listen
tldConfig.cce=Lifecycle event data object {0} is not a Context
tldConfig.dirFail=Failed to process directory [{0}] for TLD files
tldConfig.dirScan=Scanning for TLD files in directory [{0}]
+tldConfig.noTldInDir=No TLD files were found in directory [{0}].
tldConfig.execute=Error processing TLD files for context with name [{0}]
tldConfig.jarFail=Failed to process JAR [{0}] for TLD files
+tldConfig.noTldInJar=No TLD files were found in [{0}]. Consider adding the JAR
to the org.apache.catalina.startup.TldConfig.jarsToSkip property in
CATALINA_BASE/conf/catalina.properties file.
+tldConfig.noTldSummary=At least one JAR was scanned for TLDs yet contained no
TLDs. Enable debug logging for this logger for a complete list of JARs that
were scanned but no TLDs were found in them. Skipping unneeded JARs during
scanning can improve startup time and JSP compilation time.
tldConfig.webinfFail=Failed to process TLD found at [{0}]
tldConfig.webinfScan=Scanning WEB-INF for TLD files in [{0}]
tldConfig.webxmlAdd=Adding path [{0}] for URI [{1}]
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1676633r1=1676632r2=1676633view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue
Apr 28 21:20:00 2015
@@ -266,10 +266,13 @@ public final class TldConfig implements
// Stages 3b 4
JarScanner jarScanner = context.getJarScanner();
-jarScanner.scan(context.getServletContext(),
-context.getLoader().getClassLoader(),
-new TldJarScannerCallback(), noTldJars);
+TldJarScannerCallback tldCallBack = new TldJarScannerCallback();
+jarScanner.scan(context.getServletContext(),
context.getLoader().getClassLoader(),
+tldCallBack, noTldJars);
+if(tldCallBack.scanFoundNoTLDs()){
+log.info(sm.getString(tldConfig.noTldSummary));
+}
// Now add all the listeners we found to the listeners for this context
String list[] = getTldListeners();
@@ -290,19 +293,24 @@ public final class TldConfig implements
}
private class TldJarScannerCallback implements JarScannerCallback {
-
+boolean tldFound = true;
+
@Override
public void scan(JarURLConnection urlConn) throws IOException {
-tldScanJar(urlConn);
+tldFound = tldScanJar(urlConn);
}
@Override
public void scan(File file) {
File metaInf = new File(file, META-INF);
if (metaInf.isDirectory()) {
-tldScanDir(metaInf);
+tldFound = tldScanDir(metaInf);
}
}
+
+private boolean scanFoundNoTLDs() {
+return !tldFound;
+}
}
// Private Methods
@@ -432,8 +440,9 @@ public final class TldConfig implements
*
* Keep in sync with o.a.j.comiler.TldLocationsCache
*/
-private void tldScanDir(File start) {
-
+private boolean tldScanDir(File start) {
+boolean isFound = false;
+
if (log.isTraceEnabled()) {
log.trace(sm.getString(tldConfig.dirScan,
start.getAbsolutePath()));
}
@@ -446,6 +455,7 @@ public final class TldConfig implements
tldScanDir(fileList[i]);
} else if (fileList[i].getAbsolutePath().endsWith(TLD_EXT)) {
InputStream stream = null;
+isFound = true;
try {
stream = new FileInputStream(fileList[i]);
XmlErrorHandler handler
[Bug 57556] getServletContext().getRealPath(/) returns path not ending with /
https://bz.apache.org/bugzilla/show_bug.cgi?id=57556 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #9 from Mark Thomas ma...@apache.org --- Updated fix in trunk and 8.0.x for 8.0.22 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
[Bug 57823] Server hangs if there is a colon on the start of the class path
https://bz.apache.org/bugzilla/show_bug.cgi?id=57823 --- Comment #4 from gregh gregh3...@gmail.com --- Agreed, there would be far too many permutations to check for, but not knowing that the colon causes it to hang is the key. Without debugging tomcat I was stuck as it would not start and nothing in the logs. Maybe add something to the upgrade guide? Cheers Greg -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 23 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 46 mins 5 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150428-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20150428/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150428.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150428-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150428/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat
[Bug 57865] New: session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 Bug ID: 57865 Summary: session.invalidate does not work when during startup war file is deployed Product: Tomcat 7 Version: 7.0.61 Hardware: PC OS: Linux Status: NEW Severity: critical Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: alessandro.tro...@gmail.com We have a webapp using org.apache.catalina.authenticator.SingleSignOn Valve and defining security constraints and Form based authentication. calling session.invalidate doesn't properly destroy the session and Principal remains set only when war file is deployed during tomcat startup. Proceeding with a restart without any war unpacking/deploy works properly. -- 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 57863] New: Can't get the matched pattern in RewriteValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=57863
Bug ID: 57863
Summary: Can't get the matched pattern in RewriteValve
Product: Tomcat 8
Version: trunk
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: t.bessho0...@gmail.com
Created attachment 32692
-- https://bz.apache.org/bugzilla/attachment.cgi?id=32692action=edit
patch against trunk.
Key of RewriteMap does not work correctly.
-
ex) rewrite.config
RewriteCond %{HTTP_USER_AGENT} ^Mozilla.*
RewriteMap hoge com.hoge.HogeRewriteMap
RewriteRule /foo/(.*).html$ /bar/${hoge:$1}
-
$1 does not refer to (.*).
Key is always used a fixed string $1.
As a result, URL after rewriting is /bar/null.
--
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 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Mark Thomas ma...@apache.org --- Define doesn't properly destroy the session. Please also provide the steps to recreate this from a clean install of Tomcat 7.0.61. -- 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 57866] FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 j...@yahoo.com changed: What|Removed |Added CC||j...@yahoo.com -- 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 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 VIN reachme.va...@gmail.com changed: What|Removed |Added Attachment #32639|0 |1 is obsolete|| CC||reachme.va...@gmail.com --- Comment #9 from VIN reachme.va...@gmail.com --- Created attachment 32694 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32694action=edit Fix for TLD scan in Tomcat7.0 This is the first patch to make Tomcat7.0 to make it in line with 8.0 and recent trunks. It has fix for only TLD scans. It does not include fix for context configs. -- 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 57866] New: FlushableGZIPOutputStream only compresses first flush()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57866 Bug ID: 57866 Summary: FlushableGZIPOutputStream only compresses first flush() Product: Tomcat 7 Version: 7.0.54 Hardware: PC OS: Linux Status: NEW Severity: minor Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: j...@yahoo.com Created attachment 32695 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32695action=edit minimum webapp exhibiting issue (change server.xml webapps path and run with maven) Sorry if this bug is against the wrong component. I'm not sure which component includes Coyote filters. I have a servlet that streams its response, and I also need it to be compressed. Looking in wireshark and stepping through FlushableGZIPOutputStream/GZIPOutputStream/Deflater it seems that only the data up to the first flush is being compressed. deflateBytes seems to be called appropriately but after the first flush() the deflated bytes seem to be a binary header followed by uncompressed text. My server environment uses Java 7, but I tried Java 6 in case FlushableGZIPOutputStream interferes with Java 7's Deflater. (Both workaround/fix JDK bugs 4255743 and 4813885.) Java 6 behaves the same as Java 7. -- 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 57864] New: channelSendOptions attribute is not able to be configured in hexadecimal
https://bz.apache.org/bugzilla/show_bug.cgi?id=57864 Bug ID: 57864 Summary: channelSendOptions attribute is not able to be configured in hexadecimal Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: nakamura.kyohei@gmail.com Created attachment 32693 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32693action=edit patch against trunk. The Cluster configuration document have shown that the channelSendOptions attribute of SimpleTcpCluster element can be configured in hexadecimal. http://tomcat.apache.org/tomcat-8.0-doc/config/cluster.html Digester set the value using IntrospectionUtils.setProperty method. SimpleTcpCluster.setChannelSendOptions method takes an int argument. Therefore, setProperty method will be attempted to convert hexadecimal using Constructor of Integer Class (See Integer(String s)). As a result, hexadecimal value will cause a NumberFormatException. So, the channelSendOptions is not able to be configured in hexadecimal. On the other hand, when GroupChannel is used on Tomcat, the channelSendOptions will be set 10 or less (SYNC or ASYNC, ACK or Non-ACK), and it will be not set more than 10. Therefore, the example for hexadecimal (0x000B) can be remove from the configuration document. -- 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 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 --- Comment #1 from Alessandro Trolli alessandro.tro...@gmail.com --- same webapp and configuration is working properly with version 7.0.59 -- 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
