[Bug 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas ma...@apache.org --- Thanks for the report. This has been fixed in trunk (9.0.x), 8.0.x/trunk (for 8.0.22 onwards) and 7.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
[Bug 57860] New: use mina with apr/tomcat native and it crashs
https://bz.apache.org/bugzilla/show_bug.cgi?id=57860
Bug ID: 57860
Summary: use mina with apr/tomcat native and it crashs
Product: Tomcat Native
Version: 1.1.33
Hardware: PC
OS: Linux
Status: NEW
Severity: critical
Priority: P2
Component: Library
Assignee: dev@tomcat.apache.org
Reporter: zhangwei_e...@163.com
Created attachment 32687
-- https://bz.apache.org/bugzilla/attachment.cgi?id=32687action=edit
java crash log
I use mina with apr socket (AprSocketAcceptor and AprSocketConnector) for
better perfermonce.
the situation is simple:
1000 client connnet to mina server and keep alive connectons(long connection),
and another server tell the mina server to push group messages every one
minitue. After servel group push, the mina server not work and crashs.
i just download and compile apr-1.5.1.tar.gz and tomcat-native-1.1.33, and
modify the mina server code like this:
if(useAPR){
SimpleIoProcessorPoolAprSession pool = new
SimpleIoProcessorPoolAprSession(AprIoProcessor.class);
acceptor = new AprSocketAcceptor(executor, pool);
}else{
SimpleIoProcessorPoolNioSession pool = new
SimpleIoProcessorPoolNioSession(NioProcessor.class);
acceptor = new NioSocketAcceptor(executor, pool);
}
if(TcpServer.useAPR){
connector = new AprSocketConnector();
}else{
connector = new NioSocketConnector();
}
Stack: [0x7f5a8d327000,0x7f5a8d3a8000], sp=0x7f5a8d3a6470, free
space=509k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C [libtcnative-1.so.0.1.33+0x148cf] Java_org_apache_tomcat_jni_Poll_poll+0x7f
Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
J org.apache.tomcat.jni.Poll.poll(JJ[JZ)I
J org.apache.mina.transport.socket.apr.AprIoProcessor.select(J)I
j org.apache.mina.core.polling.AbstractPollingIoProcessor$Processor.run()V+52
j org.apache.mina.util.NamePreservingRunnable.run()V+29
j
java.util.concurrent.ThreadPoolExecutor.runWorker(Ljava/util/concurrent/ThreadPoolExecutor$Worker;)V+95
j java.util.concurrent.ThreadPoolExecutor$Worker.run()V+5
j java.lang.Thread.run()V+11
v ~StubRoutines::call_stub
--- P R O C E S S ---
Use gdb to
[root@iZ25kxtgwarZ push_heartserver]# gdb /opt/jdk1.7.0_45/bin/java
core.17249
GNU gdb (GDB) Red Hat Enterprise Linux (7.2-64.el6_5.2)
Copyright (C) 2010 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type show copying
and show warranty for details.
This GDB was configured as x86_64-redhat-linux-gnu.
For bug reporting instructions, please see:
http://www.gnu.org/software/gdb/bugs/...
Reading symbols from /opt/jdk1.7.0_45/bin/java...Missing separate debuginfo for
/opt/jdk1.7.0_45/bin/java
Try: yum --disablerepo='*' --enablerepo='*-debug*' install
/usr/lib/debug/.build-id/b8/2a586842f6da3df8a61093daadf04180e85c16.debug
(no debugging symbols found)...done.
[New Thread 17292]
[New Thread 17312]
[New Thread 17303]
[New Thread 17294]
[New Thread 17252]
[New Thread 17307]
[New Thread 17313]
[New Thread 17304]
[New Thread 17260]
[New Thread 17255]
[New Thread 17320]
[New Thread 17251]
[New Thread 17277]
[New Thread 17325]
[New Thread 17265]
[New Thread 17249]
[New Thread 17285]
[New Thread 17295]
[New Thread 17344]
[New Thread 17343]
[New Thread 17266]
[New Thread 17256]
[New Thread 17250]
[New Thread 17290]
[New Thread 17349]
[New Thread 17253]
[New Thread 17263]
[New Thread 17262]
[New Thread 17346]
[New Thread 17258]
[New Thread 17254]
[New Thread 17272]
[New Thread 17267]
[New Thread 17347]
[New Thread 17342]
[New Thread 17287]
[New Thread 17268]
[New Thread 17257]
[New Thread 17271]
[New Thread 17286]
[New Thread 17273]
[New Thread 17297]
[New Thread 17278]
[New Thread 17274]
[New Thread 17264]
[New Thread 17348]
[New Thread 17261]
[New Thread 17259]
[New Thread 17288]
[New Thread 17308]
[New Thread 17282]
[New Thread 17345]
Missing separate debuginfo for /opt/jdk1.7.0_45/bin/../lib/amd64/jli/libjli.so
Try: yum --disablerepo='*' --enablerepo='*-debug*' install
/usr/lib/debug/.build-id/34/5b529c72e59f506bf391be9a64cbbf7574211f
Missing separate debuginfo for /opt/jdk1.7.0_45/jre/lib/amd64/server/libjvm.so
Try: yum --disablerepo='*' --enablerepo='*-debug*' install
/usr/lib/debug/.build-id/6f/31a11f5f50e47d14c9871057d41df781aa6ccd
Missing separate debuginfo for /opt/jdk1.7.0_45/jre/lib/amd64/libverify.so
Try: yum --disablerepo='*' --enablerepo='*-debug*' install
/usr/lib/debug/.build-id/20/b03b77b651a0152ab8de47774328f0cef51987
Missing separate debuginfo for /opt/jdk1.7.0_45/jre/lib/amd64/libjava.so
Try: yum --disablerepo='*' --enablerepo='*-debug*' install
[Bug 57860] use mina with apr/tomcat native and it crashs
https://bz.apache.org/bugzilla/show_bug.cgi?id=57860 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas ma...@apache.org --- The APR code is not very forgiving if it is mis-used. The crash you describe looks very much like an error in the Java code calling the APR library. Unless an explanation is provided (ideally with a test case to reproduce the issue but that isn't essential) that describes a bug in the native code the Tomcat team are going to mark reports like this as invalid and suggest that you raise a bug with the authors of code using Tomcat's APR library - in this case Mina. -- 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: r1676232 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/el/Messages.properties java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java webapps/docs/changel
Author: markt Date: Mon Apr 27 09:49:23 2015 New Revision: 1676232 URL: http://svn.apache.org/r1676232 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Explicitly handle the case where a MethodExpression is invoked with null or the wrong number of parameters. Rather than failing with ArrayIndexOutOfBoundsException or NullPointerException throw an IllegalArgumentException with a useful error message. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/el/Messages.properties tomcat/tc8.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 09:49:23 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
svn commit: r1676234 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/Messages.properties java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java webapps/docs/changel
Author: markt Date: Mon Apr 27 09:51:04 2015 New Revision: 1676234 URL: http://svn.apache.org/r1676234 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Explicitly handle the case where a MethodExpression is invoked with null or the wrong number of parameters. Rather than failing with ArrayIndexOutOfBoundsException or NullPointerException throw an IllegalArgumentException with a useful error message. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/Messages.properties tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 09:51:04 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 -/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
[Bug 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 --- Comment #1 from Mark Thomas ma...@apache.org --- I've looked through the EL specification and I don't see the expected behaviour defined for any of these cases. I don't think MethodNotFoundException is the right exception in this case since the method has been found. IllegalArgumentException strikes me as the better fit. 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
[Bug 57859] APIs are inaccessible in SoapUI, after migrating to 8.0.21 from 8.0.14
https://bz.apache.org/bugzilla/show_bug.cgi?id=57859 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |INVALID OS||All Status|NEW |RESOLVED --- Comment #1 from Mark Thomas ma...@apache.org --- There is insufficient information in this report for a Tomcat developer to investigate. Please ask your question on the Apache Tomcat user mailing list and, if that discussion concludes that there is a bug in Tomcat, then re-open this issue and provide the necessary information to recreate the issue from a clean install of the latest 8.0.x release. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676231 - in /tomcat/trunk: java/org/apache/el/Messages.properties java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
Author: markt
Date: Mon Apr 27 09:45:12 2015
New Revision: 1676231
URL: http://svn.apache.org/r1676231
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Explicitly handle the case where a MethodExpression is invoked with null or the
wrong number of parameters. Rather than failing with
ArrayIndexOutOfBoundsException or NullPointerException throw an
IllegalArgumentException with a useful error message.
Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1676231r1=1676230r2=1676231view=diff
==
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Mon Apr 27 09:45:12 2015
@@ -21,6 +21,8 @@ error.unreachable.base=Target Unreachabl
error.unreachable.property=Target Unreachable, ''{0}'' returned null
error.resolver.unhandled=ELResolver did not handle type: {0} with property of
''{1}''
error.resolver.unhandled.null=ELResolver cannot handle a null base Object with
identifier ''{0}''
+error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s)
when it expected [{2}]
+error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s)
when it expected at least [{2}]
# ValueExpressionLiteral
error.value.literal.write=ValueExpression is a literal and not writable: {0}
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=1676231r1=1676230r2=1676231view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 09:45:12
2015
@@ -237,7 +237,7 @@ public final class AstValue extends Simp
}
m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, values);
-// Handle varArgs and any co-ercion required
+// Handle varArgs and any coercion required
values = convertArgs(ctx, values, m);
Object result = null;
@@ -268,6 +268,24 @@ public final class AstValue extends Simp
int paramCount = types.length;
+if (paramCount 0 src == null ||
+m.isVarArgs() src.length paramCount ||
+!m.isVarArgs() src.length != paramCount) {
+String inputParamCount = null;
+if (src != null) {
+inputParamCount = Integer.toString(src.length);
+}
+String msg;
+if (m.isVarArgs()) {
+msg = MessageFactory.get(error.invoke.tooFewParams,
+m.getName(), inputParamCount,
Integer.toString(paramCount));
+} else {
+msg = MessageFactory.get(error.invoke.wrongParams,
+m.getName(), inputParamCount,
Integer.toString(paramCount));
+}
+throw new IllegalArgumentException(msg);
+}
+
Object[] dest = new Object[paramCount];
for (int i = 0; i paramCount - 1; i++) {
Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1676231r1=1676230r2=1676231view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Apr 27
09:45:12 2015
@@ -482,4 +482,20 @@ public class TestMethodExpressionImpl {
Object r = me.invoke(context, null);
assertEquals(AA2Hello World!, r.toString());
}
+
+
+@Test(expected=IllegalArgumentException.class)
+public void testBug57855a() {
+MethodExpression me = factory.createMethodExpression(context,
+${beanAA.echo2}, null , new Class[]{String.class});
+me.invoke(context, new Object[0]);
+}
+
+
+@Test(expected=IllegalArgumentException.class)
+public void testBug57855b() {
+MethodExpression me = factory.createMethodExpression(context,
+${beanAA.echo2}, null , new Class[]{String.class});
+me.invoke(context, null);
+}
}
-
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-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1154 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] 1676364 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: r1676382 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
Author: markt Date: Mon Apr 27 21:44:23 2015 New Revision: 1676382 URL: http://svn.apache.org/r1676382 Log: Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Follow-up to r1676232 Handle case where null is passed to a method with a single varargs parameter Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java tomcat/tc8.0.x/trunk/test/org/apache/el/TesterBeanB.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 21:44:23 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
svn commit: r1676385 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Author: markt
Date: Mon Apr 27 21:51:54 2015
New Revision: 1676385
URL: http://svn.apache.org/r1676385
Log:
Follow-up to r1676372
Slightly different set-up needed to unit test in 7.0.x
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1676385r1=1676384r2=1676385view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Mon Apr 27 21:51:54 2015
@@ -151,7 +151,7 @@ public class TestRemoteIpFilter extends
public Context getContext() {
// Lazt init
if (super.getContext() == null) {
-getMappingData().context = new TesterContext();
+super.setContext(new TesterContext());
}
return super.getContext();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676386 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
Author: markt Date: Mon Apr 27 21:59:42 2015 New Revision: 1676386 URL: http://svn.apache.org/r1676386 Log: Fix IDE warning Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java?rev=1676386r1=1676385r2=1676386view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java Mon Apr 27 21:59:42 2015 @@ -482,7 +482,6 @@ public class TestExpiresFilter extends T Assert.assertNotNull(actualMaxAgeInSeconds); -@SuppressWarnings(null) int deltaInSeconds = Math.abs(actualMaxAgeInSeconds.intValue() - expectedMaxAgeInSeconds.intValue()); Assert.assertTrue(actualMaxAgeInSeconds: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57856] RemoteIpFilter does not replace Request within Response
https://bz.apache.org/bugzilla/show_bug.cgi?id=57856 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas ma...@apache.org --- I found a reasonably simple way to fix this. It isn't as clean as I would like but it should work with any app server and didn't require a large duplication of code or equivalent refactoring. The fix has been applied to trunk (for 9.0.x), 8.0.x/trunk (for 8.0.22 onwards) and 7.0.x (for 7.0.62 onwards). Thanks for the report and enjoy the fix. -- 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: r1676371 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/connector/TesterResponse.java
Author: markt Date: Mon Apr 27 20:29:58 2015 New Revision: 1676371 URL: http://svn.apache.org/r1676371 Log: Implement a few more methods (will be required by some new tests for the RemoteIpFilter) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TesterResponse.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:29:58 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 -/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 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 --- Comment #8 from Mark Thomas ma...@apache.org --- The spec is unclear exactly what the required behaviour here is so (ignoring Konstantin's issue one above) I'm happy that this is an improvement. IAE with a decent error message is much better than AIOOB or NPE. What the 'right' behaviour is is TBD. I have created https://java.net/jira/browse/EL_SPEC-24 to track this. Do add any comments you have for the EL expert group to that Jira ticket. If you haven't already, I'd strongly recommend you raise a bug against PrimeFaces. Until there is some clarification from the EL EG, I'm happy (once issue 1 is fixed) with throwing an IAE in this 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: r1676364 - in /tomcat/trunk: java/org/apache/catalina/filters/ test/org/apache/catalina/connector/ test/org/apache/catalina/filters/
Author: markt
Date: Mon Apr 27 20:13:05 2015
New Revision: 1676364
URL: http://svn.apache.org/r1676364
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57856
Ensure that any scheme/port changes implemented by the RemoteIpFilter also
affect HttpServletResponse.sendRedirect()
Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java
tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1676364r1=1676363r2=1676364view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties Mon
Apr 27 20:13:05 2015
@@ -40,3 +40,4 @@ expiresFilter.filterInitialized=Filter i
expiresFilter.expirationHeaderAlreadyDefined=Request {0} with response
status {1} content-type {2}, expiration header already defined
expiresFilter.skippedStatusCode=Request {0} with response status {1}
content-type {1}, skip expiration header generation for given status
+remoteIpFilter.invalidLocation=Failed to modify the rewrite location [{0}] to
use scheme [{1}] and port [{2}]
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1676364r1=1676363r2=1676364view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Apr
27 20:13:05 2015
@@ -17,6 +17,8 @@
package org.apache.catalina.filters;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@@ -40,11 +42,13 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* p
@@ -617,6 +621,49 @@ public class RemoteIpFilter implements F
}
}
+public static class XForwardedResponse extends HttpServletResponseWrapper {
+
+private final String scheme;
+private final int port;
+
+public XForwardedResponse(HttpServletResponse response, String scheme,
int port) {
+super(response);
+this.scheme = scheme;
+if (http.equals(scheme) port == 80 || https.equals(scheme)
port == 443) {
+this.port = -1;
+} else {
+this.port = port;
+}
+}
+
+@Override
+public void sendRedirect(String location) throws IOException {
+/*
+ * This isn't particularly pretty but, given that:
+ * a) there is no setRequest() method on ServletResponse (even if
+ *there were the response could still access this information
+ *via some internal structure for speed); and
+ * b) that this is meant to work on any Servlet container;
+ * this was the cleanest way I could come up with for doing this.
+ */
+super.sendRedirect(location);
+String redirect = getHeader(location);
+URI newRedirectURI;
+try {
+URI redirectURI = new URI(redirect);
+newRedirectURI = new URI(scheme, redirectURI.getUserInfo(),
+redirectURI.getHost(), port, redirectURI.getPath(),
+redirectURI.getQuery(), redirectURI.getFragment());
+} catch (URISyntaxException e) {
+log.warn(sm.getString(remoteIpFilter.invalidLocation,
+location, scheme, Integer.toString(port)));
+return;
+}
+reset();
+super.sendRedirect(newRedirectURI.toString());
+}
+}
+
/**
* {@link Pattern} for a comma delimited string that support whitespace
characters
*/
@@ -632,6 +679,7 @@ public class RemoteIpFilter implements F
* Logger
*/
private static final Log log = LogFactory.getLog(RemoteIpFilter.class);
+private static final StringManager sm =
svn commit: r1676370 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java
Author: markt Date: Mon Apr 27 20:29:07 2015 New Revision: 1676370 URL: http://svn.apache.org/r1676370 Log: Use getter to access coyoteResponse to make it easier to sub-class. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:29:07 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 -/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
svn commit: r1676383 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
Author: markt Date: Mon Apr 27 21:45:08 2015 New Revision: 1676383 URL: http://svn.apache.org/r1676383 Log: Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Follow-up to r1676234 Handle case where null is passed to a method with a single varargs parameter Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java tomcat/tc7.0.x/trunk/test/org/apache/el/TesterBeanB.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 21:45:08 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 -/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
[Bug 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #9 from Mark Thomas ma...@apache.org --- Issue 1 fixed in the same set of versions as comment #2 -- 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: r1676369 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/ test/org/apache/catalina/connector/ test/org/apache/catalina/filters/ webapps/docs/
Author: markt Date: Mon Apr 27 20:26:55 2015 New Revision: 1676369 URL: http://svn.apache.org/r1676369 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57856 Ensure that any scheme/port changes implemented by the RemoteIpFilter also affect HttpServletResponse.sendRedirect() Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TesterResponse.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:26:55 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
svn commit: r1676381 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
Author: markt
Date: Mon Apr 27 21:43:22 2015
New Revision: 1676381
URL: http://svn.apache.org/r1676381
Log:
Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Follow-up to r1676231
Handle case where null is passed to a method with a single varargs parameter
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/trunk/test/org/apache/el/TesterBeanB.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=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 21:43:22
2015
@@ -268,9 +268,9 @@ public final class AstValue extends Simp
int paramCount = types.length;
-if (paramCount 0 src == null ||
-m.isVarArgs() src.length paramCount ||
-!m.isVarArgs() src.length != paramCount) {
+if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
+!m.isVarArgs() (paramCount 0 src == null ||
+src != null src.length != paramCount)) {
String inputParamCount = null;
if (src != null) {
inputParamCount = Integer.toString(src.length);
@@ -286,6 +286,10 @@ public final class AstValue extends Simp
throw new IllegalArgumentException(msg);
}
+if (src == null) {
+return new Object[1];
+}
+
Object[] dest = new Object[paramCount];
for (int i = 0; i paramCount - 1; i++) {
Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Apr 27
21:43:22 2015
@@ -498,4 +498,28 @@ public class TestMethodExpressionImpl {
${beanAA.echo2}, null , new Class[]{String.class});
me.invoke(context, null);
}
+
+@Test
+public void testBug57855c() {
+MethodExpression me = factory.createMethodExpression(context,
+${beanB.echo}, null , new Class[]{String.class});
+me.invoke(context, null);
+}
+
+
+@Test
+public void testBug57855d() {
+MethodExpression me = factory.createMethodExpression(context,
+${beanB.echo}, null , new Class[]{String.class});
+Object r = me.invoke(context, new String[] { aaa });
+assertEquals(aaa, r.toString());
+}
+@Test
+public void testBug57855e() {
+MethodExpression me = factory.createMethodExpression(context,
+${beanB.echo}, null , new Class[]{String.class});
+Object r = me.invoke(context, new String[] { aaa, bbb });
+assertEquals(aaa, bbb, r.toString());
+}
+
}
Modified: tomcat/trunk/test/org/apache/el/TesterBeanB.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterBeanB.java?rev=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/test/org/apache/el/TesterBeanB.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterBeanB.java Mon Apr 27 21:43:22 2015
@@ -35,4 +35,19 @@ public class TesterBeanB {
public String sayHello(String to) {
return Hello + to + from + name;
}
+
+public String echo(String...strings) {
+if (strings == null) {
+return null;
+}
+
+StringBuilder sb = new StringBuilder();
+for (int i = 0; i strings.length; i++) {
+if (i 0) {
+sb.append(, );
+}
+sb.append(strings[i]);
+}
+return sb.toString();
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676367 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java
Author: markt Date: Mon Apr 27 20:23:37 2015 New Revision: 1676367 URL: http://svn.apache.org/r1676367 Log: Use getter to access coyoteResponse to make it easier to sub-class. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:23: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 +/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
svn commit: r1676368 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/connector/TesterResponse.java
Author: markt Date: Mon Apr 27 20:24:08 2015 New Revision: 1676368 URL: http://svn.apache.org/r1676368 Log: Implement a few more methods (will be required by some new tests for the RemoteIpFilter) Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TesterResponse.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:24:08 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 +/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
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/222 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] 1676369 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
svn commit: r1676372 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/ test/org/apache/catalina/connector/ test/org/apache/catalina/filters/ webapps/docs/
Author: markt Date: Mon Apr 27 20:31:54 2015 New Revision: 1676372 URL: http://svn.apache.org/r1676372 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57856 Ensure that any scheme/port changes implemented by the RemoteIpFilter also affect HttpServletResponse.sendRedirect() Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TesterResponse.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 20:31:54 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-1676368 -/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
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/633 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] 1676372 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|FIXED |---
--- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com ---
Reviewing r1676234
Apparently null src is equivalent to no argument or a zero-length array.
[1]
1) When null is passed it should support both varargs and non-varargs cases.
E.g. calling Foo.main().
From the code of AstValue.hava I think that paramCount 0 src == null
condition fails when the only argument is varargs and src is null.
2) It looks that the message in AstValue.java prints The method [{0}] was
called with [null] parameters when null is passed as src. Wouldn't it better
to print 0 instead of null ?
[1]
http://docs.oracle.com/javaee/7/api/javax/el/MethodExpression.html#invoke%28javax.el.ELContext,%20java.lang.Object[]%29
--
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: r1676251 - /tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java
Author: markt
Date: Mon Apr 27 13:11:41 2015
New Revision: 1676251
URL: http://svn.apache.org/r1676251
Log:
Implement a few more methods (will be required by some new tests for the
RemoteIpFilter)
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java?rev=1676251r1=1676250r2=1676251view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TesterResponse.java Mon Apr
27 13:11:41 2015
@@ -37,4 +37,27 @@ public class TesterResponse extends Resp
message + \));
*/
}
+
+@Override
+public void resetBuffer(boolean resetWriterStreamFlags) {
+// NO-OP by default.
+// There is no buffer created for this test object since no test
depends
+// on one being present or on this method resetting it.
+}
+
+@Override
+public org.apache.coyote.Response getCoyoteResponse() {
+// Lazy init
+if (super.getCoyoteResponse() == null) {
+this.coyoteResponse = new org.apache.coyote.Response();
+}
+return super.getCoyoteResponse();
+}
+
+@Override
+public void setSuspended(boolean suspended) {
+// NO-OP by default.
+// There is no buffer created for this test object since no test
depends
+// on one being present or on this method suspending it.
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
--- Comment #4 from Mark Thomas ma...@apache.org ---
(In reply to Konstantin Kolinko from comment #3)
Reviewing r1676234
Apparently null src is equivalent to no argument or a zero-length array.
[1]
1) When null is passed it should support both varargs and non-varargs cases.
E.g. calling Foo.main().
ACK. I'll add a test case for that.
From the code of AstValue.hava I think that paramCount 0 src == null
condition fails when the only argument is varargs and src is null.
2) It looks that the message in AstValue.java prints The method [{0}] was
called with [null] parameters when null is passed as src. Wouldn't it
better to print 0 instead of null ?
I'll like to be able to differentiate between a zero length array and null.
[1]
http://docs.oracle.com/javaee/7/api/javax/el/MethodExpression.
html#invoke%28javax.el.ELContext,%20java.lang.Object[]%29
--
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 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- I think MethodExpression.invoke() shall wrap IllegalArgumentException into an ELException. It is documented that java.lang.reflect.Method.invoke() throws IllegalArgumentException when if the number of actual and formal parameters differ [2]. I think that our code should work as if that exception were thrown by Method.invoke(). From MethodExpression.invoke() [1] I think that an exception that is received from a Method.invoke() has to be wrapped with an ELException. Essentially this means to move values = convertArgs(values, m); call into try/catch block that is around result = m.invoke(t.base, values); call. (lines 274 278 of AstValue.java of Tomcat 7 r1676234). [1] http://docs.oracle.com/javaee/7/api/javax/el/MethodExpression.html#invoke%28javax.el.ELContext,%20java.lang.Object[]%29 [2] http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html#invoke-java.lang.Object-java.lang.Object...- -- 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/632 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] 1676234 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: r1676250 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java
Author: markt
Date: Mon Apr 27 13:10:36 2015
New Revision: 1676250
URL: http://svn.apache.org/r1676250
Log:
Use getter to access coyoteResponse to make it easier to sub-class.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1676250r1=1676249r2=1676250view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Apr 27
13:10:36 2015
@@ -320,7 +320,7 @@ public class Response
// Ignore - the client has probably closed the connection
}
}
-return coyoteResponse.getBytesWritten(flush);
+return getCoyoteResponse().getBytesWritten(flush);
}
/**
@@ -457,7 +457,7 @@ public class Response
* Return the content length that was set or calculated for this Response.
*/
public int getContentLength() {
-return coyoteResponse.getContentLength();
+return getCoyoteResponse().getContentLength();
}
@@ -467,7 +467,7 @@ public class Response
*/
@Override
public String getContentType() {
-return coyoteResponse.getContentType();
+return getCoyoteResponse().getContentType();
}
@@ -524,7 +524,7 @@ public class Response
*/
@Override
public String getCharacterEncoding() {
-return (coyoteResponse.getCharacterEncoding());
+return (getCoyoteResponse().getCharacterEncoding());
}
@@ -558,7 +558,7 @@ public class Response
*/
@Override
public Locale getLocale() {
-return (coyoteResponse.getLocale());
+return (getCoyoteResponse().getLocale());
}
@@ -608,7 +608,7 @@ public class Response
*/
@Override
public boolean isCommitted() {
-return coyoteResponse.isCommitted();
+return getCoyoteResponse().isCommitted();
}
@@ -625,7 +625,7 @@ public class Response
return;
}
-coyoteResponse.reset();
+getCoyoteResponse().reset();
outputBuffer.reset();
usingOutputStream = false;
usingWriter = false;
@@ -722,7 +722,7 @@ public class Response
return;
}
-coyoteResponse.setContentLength(length);
+getCoyoteResponse().setContentLength(length);
}
@@ -745,7 +745,7 @@ public class Response
}
if (type == null) {
-coyoteResponse.setContentType(null);
+getCoyoteResponse().setContentType(null);
return;
}
@@ -753,16 +753,16 @@ public class Response
if (m == null) {
// Invalid - Assume no charset and just pass through whatever
// the user provided.
-coyoteResponse.setContentTypeNoCharset(type);
+getCoyoteResponse().setContentTypeNoCharset(type);
return;
}
-coyoteResponse.setContentTypeNoCharset(m[0]);
+getCoyoteResponse().setContentTypeNoCharset(m[0]);
if (m[1] != null) {
// Ignore charset if getWriter() has already been called
if (!usingWriter) {
-coyoteResponse.setCharacterEncoding(m[1]);
+getCoyoteResponse().setCharacterEncoding(m[1]);
isCharacterEncodingSet = true;
}
}
@@ -794,7 +794,7 @@ public class Response
return;
}
-coyoteResponse.setCharacterEncoding(charset);
+getCoyoteResponse().setCharacterEncoding(charset);
isCharacterEncodingSet = true;
}
@@ -817,7 +817,7 @@ public class Response
return;
}
-coyoteResponse.setLocale(locale);
+getCoyoteResponse().setLocale(locale);
// Ignore any call made after the getWriter has been invoked.
// The default should be used
@@ -831,7 +831,7 @@ public class Response
String charset = getContext().getCharset(locale);
if (charset != null) {
-coyoteResponse.setCharacterEncoding(charset);
+getCoyoteResponse().setCharacterEncoding(charset);
}
}
@@ -841,14 +841,14 @@ public class Response
@Override
public String getHeader(String name) {
-return coyoteResponse.getMimeHeaders().getHeader(name);
+return getCoyoteResponse().getMimeHeaders().getHeader(name);
}
@Override
public CollectionString getHeaderNames() {
-MimeHeaders headers = coyoteResponse.getMimeHeaders();
+MimeHeaders headers = getCoyoteResponse().getMimeHeaders();
int n = headers.size();
ListString result = new ArrayList(n);
for (int i = 0; i n; i++) {
@@ -863,7 +863,7 @@ public class
[Bug 57856] RemoteIpFilter does not replace Request within Response
https://bz.apache.org/bugzilla/show_bug.cgi?id=57856 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Looking at the code, there will be a similar problem for ports. There doesn't appear to be an easy/obvious way to fix this as the current sendRedirect() implementation makes extensive use of Tomcat internals. I'm currently looking at various options. -- 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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://bz.apache.org/bugzilla/show_bug.cgi?id=57556 --- Comment #7 from Chuck Caldarale chuck.caldar...@unisys.com --- (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. -- 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 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
--- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to Mark Thomas from comment #4)
(In reply to Konstantin Kolinko from comment #3)
Reviewing r1676234
2) It looks that the message in AstValue.java prints The method [{0}] was
called with [null] parameters when null is passed as src. Wouldn't it
better to print 0 instead of null ?
I'll like to be able to differentiate between a zero length array and null.
E.g. end user may call the method without any arguments, but some higher API
that translates that into a call to MethodExpression is allowed to optimize
that to pass null instead of allocating a zero-length array of arguments.
Printing a message that says null may be confusing for the end user.
--
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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://bz.apache.org/bugzilla/show_bug.cgi?id=57556 --- Comment #6 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Matt from comment #5) Tomcat 6 only returned a path with an ending slash when asking for /, any other directory path does not end in a slash. So this is actually breaking backwards compatibility. In my opinion, what makes the most sense would be for it to return an ending slash only if the path requested ends in a slash, but being consistent with previous behavior is a good idea too. I tend to agree that slashes shouldn't be added to anything. But my position is that this method should unconditionally return 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 57855] Invoke MethodExpression with wrong pram count results in ArrayIndexOutOfBoundsException
https://bz.apache.org/bugzilla/show_bug.cgi?id=57855 --- Comment #7 from Christian Strebel christian.stre...@ivyteam.ch --- (In reply to Konstantin Kolinko from comment #5) I think MethodExpression.invoke() shall wrap IllegalArgumentException into an ELException. It is documented that java.lang.reflect.Method.invoke() throws IllegalArgumentException when if the number of actual and formal parameters differ [2]. I think that our code should work as if that exception were thrown by Method.invoke(). From MethodExpression.invoke() [1] I think that an exception that is received from a Method.invoke() has to be wrapped with an ELException. Essentially this means to move values = convertArgs(values, m); call into try/catch block that is around result = m.invoke(t.base, values); call. (lines 274 278 of AstValue.java of Tomcat 7 r1676234). The problem is, the bad PrimeFaces AjaxBehaviorListenerImpl implementation is then broken again. Also I do not like wrapping a specific RuntimeException into an unspecific RuntimeExcpetion without additional information. But on the other hand you are right there is already a wrapping if an IllegalAccessException or an IllegalArgumentException is thrown by Method.invoke(). I also do not really like this wrapping. The Sun/Glassfish implementation does not wrap the runtime exceptions thrown by Method.invoke() 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
Re: svn commit: r1676381 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
2015-04-28 0:43 GMT+03:00 ma...@apache.org:
Author: markt
Date: Mon Apr 27 21:43:22 2015
New Revision: 1676381
URL: http://svn.apache.org/r1676381
Log:
Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Follow-up to r1676231
Handle case where null is passed to a method with a single varargs parameter
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/trunk/test/org/apache/el/TesterBeanB.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=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 21:43:22
2015
@@ -268,9 +268,9 @@ public final class AstValue extends Simp
int paramCount = types.length;
-if (paramCount 0 src == null ||
-m.isVarArgs() src.length paramCount ||
-!m.isVarArgs() src.length != paramCount) {
+if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
+!m.isVarArgs() (paramCount 0 src == null ||
+src != null src.length != paramCount)) {
String inputParamCount = null;
if (src != null) {
inputParamCount = Integer.toString(src.length);
@@ -286,6 +286,10 @@ public final class AstValue extends Simp
throw new IllegalArgumentException(msg);
}
+if (src == null) {
+return new Object[1];
Did you mean new Object[0] here?
Javadoc for Method.invoke() (as linked from comment 5 in BZ) says that
If the number of formal parameters required by the underlying method
is 0, the supplied args array may be of length 0 or null.
It may be that you need the array if the method is a varargs one (I
have not tested), but if it is not a varargs one then allocating the
array should not be necessary, I guess.
+}
+
Object[] dest = new Object[paramCount];
for (int i = 0; i paramCount - 1; i++) {
Best regards,
Konstantin Kolinko
-
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/224 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] 1676394 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
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/635 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] 1676386 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
Re: svn commit: r1676381 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
Konstantin,
On 4/27/15 6:06 PM, Konstantin Kolinko wrote:
2015-04-28 0:43 GMT+03:00 ma...@apache.org:
Author: markt
Date: Mon Apr 27 21:43:22 2015
New Revision: 1676381
URL: http://svn.apache.org/r1676381
Log:
Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Follow-up to r1676231
Handle case where null is passed to a method with a single varargs parameter
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/trunk/test/org/apache/el/TesterBeanB.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=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27 21:43:22
2015
@@ -268,9 +268,9 @@ public final class AstValue extends Simp
int paramCount = types.length;
-if (paramCount 0 src == null ||
-m.isVarArgs() src.length paramCount ||
-!m.isVarArgs() src.length != paramCount) {
+if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
+!m.isVarArgs() (paramCount 0 src == null ||
+src != null src.length != paramCount)) {
String inputParamCount = null;
if (src != null) {
inputParamCount = Integer.toString(src.length);
@@ -286,6 +286,10 @@ public final class AstValue extends Simp
throw new IllegalArgumentException(msg);
}
+if (src == null) {
+return new Object[1];
Did you mean new Object[0] here?
Javadoc for Method.invoke() (as linked from comment 5 in BZ) says that
If the number of formal parameters required by the underlying method
is 0, the supplied args array may be of length 0 or null.
It may be that you need the array if the method is a varargs one (I
have not tested), but if it is not a varargs one then allocating the
array should not be necessary, I guess.
... and if it can be new Object[0] then you can re-use the same
zero-length array for all such calls if you want to avoid an object
allocation.
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1676393 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
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;
}
Object[] dest = new Object[paramCount];
Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1676393r1=1676392r2=1676393view=diff
==
--- tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Apr 27
23:01:16 2015
@@ -467,6 +467,15 @@ public class TestMethodExpressionImpl {
@Test
+public void testBug53792d() {
+MethodExpression me = factory.createMethodExpression(context,
+#{beanB.sayHello().length()}, null, new Class?[] {});
+Integer result = (Integer) me.invoke(context, new Object[] { foo });
+assertEquals(beanB.sayHello().length(), result.intValue());
+}
+
+
+@Test
public void testBug56797a() {
MethodExpression me = factory.createMethodExpression(context,
${beanAA.echo1('Hello World!')}, null , null);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676394 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
Author: markt Date: Mon Apr 27 23:01:47 2015 New Revision: 1676394 URL: http://svn.apache.org/r1676394 Log: Add some comments to clarify behaviour. Review by schultz re object allocation Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 23:01:47 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
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/636 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] 1676395 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 57830] Add support for ProxyProtocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57830 --- Comment #7 from Bill Barker billbar...@apache.org --- (In reply to Christopher Schultz from comment #6) (In reply to Bill Barker from comment #5) Ok, so I miss read the spec. After reading the spec again, I have lost all interest in this issue. I'm curious: does this simply not interest you, or do you actively think this is a bad idea, in general, or a bad idea to implement in Tomcat? It just doesn't interest me to support such low-grade proxy servers. Other then that they are popular on a certain well-known hosting site, it doesn't seem worth my effort. If I thought it was a bad idea then I would have expressed a vote. But if this is an itch that somebody wants to scratch, by all means scratch away :). I haven't been able to see how to theoretically break this if it is implemented properly according to the spec, as long as you also have a competent network admin (which presumably applies to the above-mentioned well-known hosting site). If I can sit as man-in-the-middle before the proxy and inject my own PROXY ... line, then Tomcat gets two such lines (assuming the proxy is working properly) and mine is rejected just like Tomcat does now. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 37 mins 24 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/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-1.0.2/dest-20150428/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
[Bug 57830] Add support for ProxyProtocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57830 --- Comment #6 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Bill Barker from comment #5) Ok, so I miss read the spec. After reading the spec again, I have lost all interest in this issue. I'm curious: does this simply not interest you, or do you actively think this is a bad idea, in general, or a bad idea to implement in Tomcat? -- 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: r1676395 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java
Author: markt Date: Mon Apr 27 23:03:37 2015 New Revision: 1676395 URL: http://svn.apache.org/r1676395 Log: Add some comments to clarify behaviour. Review by schultz re object allocation Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 27 23:03:37 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 -/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
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/223 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] 1676382 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 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 #3 from Christopher Schultz ch...@christopherschultz.net --- (In reply to gregh from comment #2) This was the entry in the /etc/rc.d/init.d script that I have used for many years, 5,6,7. This only happens in 8. CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar ie the CLASSPATH value in /etc/profile.d had been commented out. Still, I think it should have some sanity check that it does not scan the root folder. Your script can easily check to see if $CLASSPATH is empty and then ignore it. Tomcat doesn't do any scanning of the CLASSPATH itself (meaning, no textual scanning of the actual string representing the system classpath) and so there's not really any appropriate place to do this checking, other than adding some new sanity check for this. I agree with Mark's reticence to add a check for this; there are an infinite number of insane CLASSPATH entries, and we can't check for all of them. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1676381 - in /tomcat/trunk: java/org/apache/el/parser/AstValue.java test/org/apache/el/TestMethodExpressionImpl.java test/org/apache/el/TesterBeanB.java
On 27/04/2015 23:10, Christopher Schultz wrote:
Konstantin,
On 4/27/15 6:06 PM, Konstantin Kolinko wrote:
2015-04-28 0:43 GMT+03:00 ma...@apache.org:
Author: markt
Date: Mon Apr 27 21:43:22 2015
New Revision: 1676381
URL: http://svn.apache.org/r1676381
Log:
Further fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57855
Follow-up to r1676231
Handle case where null is passed to a method with a single varargs parameter
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/trunk/test/org/apache/el/TesterBeanB.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=1676381r1=1676380r2=1676381view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Mon Apr 27
21:43:22 2015
@@ -268,9 +268,9 @@ public final class AstValue extends Simp
int paramCount = types.length;
-if (paramCount 0 src == null ||
-m.isVarArgs() src.length paramCount ||
-!m.isVarArgs() src.length != paramCount) {
+if (m.isVarArgs() paramCount 1 (src == null || paramCount
src.length) ||
+!m.isVarArgs() (paramCount 0 src == null ||
+src != null src.length != paramCount)) {
String inputParamCount = null;
if (src != null) {
inputParamCount = Integer.toString(src.length);
@@ -286,6 +286,10 @@ public final class AstValue extends Simp
throw new IllegalArgumentException(msg);
}
+if (src == null) {
+return new Object[1];
Did you mean new Object[0] here?
No. It needs to be Object[1] since it must be a varags method with a
single parameter and the size of the array has to match the number of
formal parameters.
Javadoc for Method.invoke() (as linked from comment 5 in BZ) says that
If the number of formal parameters required by the underlying method
is 0, the supplied args array may be of length 0 or null.
It may be that you need the array if the method is a varargs one (I
have not tested), but if it is not a varargs one then allocating the
array should not be necessary, I guess.
If the method isn't varargs and src == null it will never reach this point.
... and if it can be new Object[0] then you can re-use the same
zero-length array for all such calls if you want to avoid an object
allocation.
There are a couple of places where I could add that. Thanks for the
review. Commit to follow shortly.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
