svn commit: r1653817 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationDispatcher.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 22 11:58:32 2015
New Revision: 1653817
URL: http://svn.apache.org/r1653817
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57476
As per section 9.4 of the Servlet spec, ensure that the response body has been
completely written before exiting the forward method.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 11:58:32 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797
+/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,1653816
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1653817r1=1653816r2=1653817view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Thu Jan 22 11:58:32 2015
@@ -402,6 +402,7 @@ final class ApplicationDispatcher implem
wrapper.getLogger().debug( Disabling the response for futher
output);
if (response instanceof ResponseFacade) {
+response.flushBuffer();
((ResponseFacade) response).finish();
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1653817r1=1653816r2=1653817view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22
svn commit: r1653843 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationDispatcher.java java/org/apache/catalina/core/StandardHostValve.java webapps/docs/changelog.xml
Author: markt Date: Thu Jan 22 13:12:33 2015 New Revision: 1653843 URL: http://svn.apache.org/r1653843 Log: Better fix for BZ 57476 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 13:12:33 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817 -/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: r1653858 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ java/org/apache/jasper/runtime/ test/org/apache/el/ test/webapp/bug5nnnn/ webapps
Author: markt
Date: Thu Jan 22 13:56:05 2015
New Revision: 1653858
URL: http://svn.apache.org/r1653858
Log:
Fix error when defining functions using lambda expressions in JSPs.
Added:
tomcat/tc8.0.x/trunk/test/webapp/bug5/bug57441.jsp
- copied unchanged from r1653857,
tomcat/trunk/test/webapp/bug5/bug57441.jsp
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 13:56:05 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
+/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
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1653858r1=1653857r2=1653858view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Thu Jan 22 13:56:05 2015
@@ -220,40 +220,46 @@ public class ELFunctionMapper {
ELNode.Function f = functions.get(i);
FunctionInfo funcInfo = f.getFunctionInfo();
String key = f.getPrefix()+ : +
[Bug 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #10 from Mark Thomas ma...@apache.org --- Reprodcued every time. Many thanks. Looking for the root cause at the moment... -- 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 47307] AJP connector: When IPV6 is disabled, Tomcat 6.0.20 couldn't start
https://issues.apache.org/bugzilla/show_bug.cgi?id=47307 Patrick, Yeh wen...@gmail.com changed: What|Removed |Added Resolution|INVALID |WORKSFORME --- Comment #6 from Patrick, Yeh wen...@gmail.com --- I found a solution for this issue. Please recompile your apr library in ./configure --disable-ipv6 to disable using ipv6 in apr runtime while the runtime environment has disabled ipv6. Please read apr configuration configure --help. -Patrick, Yeh -- 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 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #12 from Konstantin Kolinko knst.koli...@gmail.com --- Thank you! Reproduced based on recipe from Comment 8. My example: 1) webapps/examples2/numberwriter2.jsp: [[[ Forward to numberwriter.txt jsp:forward page=numberwriter.txt / ]]] 2) webapps/examples2/numberwriter.txt: Copied output of numberwriter example (1 lines with numbers from 0001 up to 0001, 21 bytes total (EOL = LF)) I request /examples2/numberwriter2.jsp with wget. I observe the following pairs of requests in access log file: 127.0.0.1 - - [22/Jan/2015:14:32:00 +0300] GET /examples2/numberwriter2.jsp HTTP/1.0 200 204800 127.0.0.1 - - [22/Jan/2015:14:32:20 +0300] GET /examples2/numberwriter2.jsp HTTP/1.0 206 5200 That is the first GET request hangs after transferring 204800 bytes. After waiting for 20 seconds wget aborts connection. It repeats request asking for a range of bytes, and receives remaining 5200 bytes of the file. This happens in the same way for all connectors that I tested (those mentioned in Comment 7). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57441] EL Lambda expression in a JSP fails with The function incr must be used with a prefix when a default namespace is not specified
https://issues.apache.org/bugzilla/show_bug.cgi?id=57441 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas ma...@apache.org --- Fixed by whitelisting function names without a namespace. I have a query in the the JSP maintenance lead in case an alternative approach is decided. -- 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: r1653816 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Author: markt
Date: Thu Jan 22 11:54:49 2015
New Revision: 1653816
URL: http://svn.apache.org/r1653816
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57476
As per section 9.4 of the Servlet spec, ensure that the response body has been
completely written before exiting the forward method.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1653816r1=1653815r2=1653816view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Thu
Jan 22 11:54:49 2015
@@ -402,6 +402,7 @@ final class ApplicationDispatcher implem
wrapper.getLogger().debug( Disabling the response for futher
output);
if (response instanceof ResponseFacade) {
+response.flushBuffer();
((ResponseFacade) response).finish();
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653824 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: violetagg
Date: Thu Jan 22 12:15:42 2015
New Revision: 1653824
URL: http://svn.apache.org/r1653824
Log:
Merged revision 1653815 from tomcat/trunk:
When closing the stream for the host's web.xml if an exception occur then
hostTimeStamp must be set to -1 and not the globalTimeStamp. Issue reported by
Coverity Scan.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 12:15:42 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,1653816
+/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
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1653824r1=1653823r2=1653824view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Thu Jan 22 12:15:42 2015
@@ -1493,7 +1493,7 @@ public class ContextConfig implements Li
uc.getInputStream().close();
} catch (IOException e) {
ExceptionUtils.handleThrowable(e);
-globalTimeStamp = -1;
+hostTimeStamp = -1;
}
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1653824r1=1653823r2=1653824view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22
svn commit: r1653830 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml
Author: violetagg
Date: Thu Jan 22 12:32:34 2015
New Revision: 1653830
URL: http://svn.apache.org/r1653830
Log:
Merged revision 1653819 from tomcat/trunk:
When generating a list of package and class imports, the processing of classes
was omitted. Issue is reported by Coverity Scan.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 12:32:34 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
+/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
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1653830r1=1653829r2=1653830view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu Jan
22 12:32:34 2015
@@ -586,7 +586,7 @@ class Generator {
out.println(\););
}
}
-if (packages.size() == 0) {
+if (classes.size() == 0) {
out.printin(_jspx_imports_classes = null;);
out.println();
} else {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1653830r1=1653829r2=1653830view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22 12:32:34 2015
@@ -90,6 +90,15 @@
/fix
/changelog
/subsection
+ subsection name=Jasper
+changelog
+ fix
+Ensure that
[Bug 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #11 from Mark Thomas ma...@apache.org --- I've found the root cause. It was triggered by r1643210 but I think all that did was uncover a different bug. It is easier to see if you go back to Tomcat 6 as that is before async was added. If you look at StandardHostValve line 136 [1] you'll see that the response is unsuspended unconditionally although the comment suggests it is being unsuspended for error handling (which may need to write to the response). In r1643210 that code was modified so the response was only unsuspended if there was an error to handle. This triggered the problem because the RequestDispatcher did not flush the response before calling finish(). Calling finish() sets suspended to true. The sequence was: a) page 1 forwards to page 2 b) page 2 writes response leaving some data in buffer c) RD calls finish which suspends response d) StandardHostValve unsuspends response e) normal end handling for page 1 flushes and closes the response r1643210 removed step d) which in turn prevented the flush in step e). Section 9.4 of the Servlet 3.1 spec says: quote Before the forward method of the RequestDispatcher interface returns without exception, the response content must be sent and committed, and closed by the servlet container, unless the request was put into the asynchronous mode. /quote My reading of the spec is that we should be calling response.flushBuffer() before we call finish() in the RequestDispatcher. I am going to apply a patch to that effect to trunk, 8.0.x and 7.0.x shortly. I then intend to start an 8.0.x release. [1] http://svn.eu.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?view=annotate#l136 -- 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: r1653816 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
2015-01-22 12:54 GMT+01:00 ma...@apache.org: Author: markt Date: Thu Jan 22 11:54:49 2015 New Revision: 1653816 URL: http://svn.apache.org/r1653816 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 As per section 9.4 of the Servlet spec, ensure that the response body has been completely written before exiting the forward method. I did suspect r1643210 but couldn't see the problem. However, although the spec language about flushing is there, this could be wrong in the context of Tomcat: no error pages, chunking only, etc. That's why the suspend thing was added: pretend everything is done but leave it there for postprocessing. Rémy
svn commit: r1653827 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: violetagg Date: Thu Jan 22 12:18:16 2015 New Revision: 1653827 URL: http://svn.apache.org/r1653827 Log: Merged revision 1653815 from tomcat/trunk: When closing the stream for the host's web.xml if an exception occur then hostTimeStamp must be set to -1 and not the globalTimeStamp. Issue reported by Coverity Scan. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 12:18:16 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817 -/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: r1653863 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jan 22 14:01:15 2015 New Revision: 1653863 URL: http://svn.apache.org/r1653863 Log: Whitespace police Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1653863r1=1653862r2=1653863view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22 14:01:15 2015 @@ -96,7 +96,7 @@ fix Ensure that classes imported via the page directive are made available to the EL environment via the ImportHandler. Issue is reported by -Coverity Scan. (violetagg) +Coverity Scan. (violetagg) /fix fix bug57441/bug: Do not trigger an error when using functions defined - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653815 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: violetagg
Date: Thu Jan 22 11:47:50 2015
New Revision: 1653815
URL: http://svn.apache.org/r1653815
Log:
When closing the stream for the host's web.xml if an exception occur then
hostTimeStamp must be set to -1 and not the globalTimeStamp. Issue reported by
Coverity Scan.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1653815r1=1653814r2=1653815view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Jan 22
11:47:50 2015
@@ -1493,7 +1493,7 @@ public class ContextConfig implements Li
uc.getInputStream().close();
} catch (IOException e) {
ExceptionUtils.handleThrowable(e);
-globalTimeStamp = -1;
+hostTimeStamp = -1;
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1653816 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
On 22/01/2015 12:07, Rémy Maucherat wrote: 2015-01-22 12:54 GMT+01:00 ma...@apache.org: Author: markt Date: Thu Jan 22 11:54:49 2015 New Revision: 1653816 URL: http://svn.apache.org/r1653816 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 As per section 9.4 of the Servlet spec, ensure that the response body has been completely written before exiting the forward method. I did suspect r1643210 but couldn't see the problem. However, although the spec language about flushing is there, this could be wrong in the context of Tomcat: no error pages, chunking only, etc. That's why the suspend thing was added: pretend everything is done but leave it there for postprocessing. Good points. I also haven't completed a full unit test run yet either and that might highlight further issues along the same lines. I'll see about a better fix. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653857 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ java/org/apache/jasper/runtime/ test/org/apache/el/ test/webapp/bug5nnnn/
Author: markt
Date: Thu Jan 22 13:53:26 2015
New Revision: 1653857
URL: http://svn.apache.org/r1653857
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57441
Fix error when defining functions using lambda expressions in JSPs.
Added:
tomcat/trunk/test/webapp/bug5/bug57441.jsp (with props)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/jasper/runtime/ProtectedFunctionMapper.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1653857r1=1653856r2=1653857view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Jan
22 13:53:26 2015
@@ -220,40 +220,46 @@ public class ELFunctionMapper {
ELNode.Function f = functions.get(i);
FunctionInfo funcInfo = f.getFunctionInfo();
String key = f.getPrefix()+ : + f.getName();
-ds.append(funcMethod + (\ + key + \, +
-getCanonicalName(funcInfo.getFunctionClass()) +
-.class, + '\' + f.getMethodName() + \, +
-new Class[] {);
-String params[] = f.getParameters();
-for (int k = 0; k params.length; k++) {
-if (k != 0) {
-ds.append(, );
-}
-int iArray = params[k].indexOf('[');
-if (iArray 0) {
-ds.append(params[k] + .class);
-}
-else {
-String baseType = params[k].substring(0, iArray);
-ds.append(java.lang.reflect.Array.newInstance();
-ds.append(baseType);
-ds.append(.class,);
+if (funcInfo == null) {
+// Added via Lambda or ImportHandler. EL will expect a
+// function mapper even if one isn't used so just pass null
+ds.append(funcMethod + (null, null, null, null);\n);
+} else {
+ds.append(funcMethod + (\ + key + \, +
+getCanonicalName(funcInfo.getFunctionClass()) +
+.class, + '\' + f.getMethodName() + \, +
+new Class[] {);
+String params[] = f.getParameters();
+for (int k = 0; k params.length; k++) {
+if (k != 0) {
+ds.append(, );
+}
+int iArray = params[k].indexOf('[');
+if (iArray 0) {
+ds.append(params[k] + .class);
+}
+else {
+String baseType = params[k].substring(0, iArray);
+ds.append(java.lang.reflect.Array.newInstance();
+ds.append(baseType);
+ds.append(.class,);
-// Count the number of array dimension
-int aCount = 0;
-for (int jj = iArray; jj params[k].length(); jj++ ) {
-if (params[k].charAt(jj) == '[') {
-aCount++;
+// Count the number of array dimension
+int aCount = 0;
+for (int jj = iArray; jj params[k].length();
jj++ ) {
+if (params[k].charAt(jj) == '[') {
+aCount++;
+}
+}
+if (aCount == 1) {
+ds.append(0).getClass());
+} else {
+ds.append(new int[ + aCount +
]).getClass());
}
-}
-if (aCount == 1) {
-ds.append(0).getClass());
-} else {
-ds.append(new int[ + aCount + ]).getClass());
}
}
+ds.append(});\n);
}
-ds.append(});\n);
Re: Coverity Scan
2015-01-22 10:02 GMT+03:00 Violeta Georgieva violet...@apache.org: Hi, I would like to update the coverity scan report. As the previous one was based on Tomcat 8 (back in the time it was trunk) I think to base the scan again on Tomcat 8. Wdyt? +1 Two notes: 1) A project at coverity is linked to a GitHub repository. Currently it is configured to use https://github.com/apache/tomcat but for Tomcat 8 one needs to use https://github.com/apache/tomcat80 It may be that the URL is only used for summary information to describe the project. In that case it can be left as is. If that URL is actually used for analysis, one would have to change it. (+1 for the change if it is needed). 2) Looking at Upload a Project Build form, it expects a tarball created by Coverity Scan Self-Build tool. I have never tried to create one. YMMV. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57481] New: IllegalStateException for nonblocking/numberwriter example with BIO connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=57481 Bug ID: 57481 Summary: IllegalStateException for nonblocking/numberwriter example with BIO connector Product: Tomcat 8 Version: 8.0.17 Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com Steps to reproduce: 1. Configure Tomcat 8.0.17 to use BIO implementation of HTTP connector, Connector port=8081 address=127.0.0.1 protocol=org.apache.coyote.http11.Http11Protocol connectionTimeout=2 redirectPort=8443 / 2. Start Tomcat 3. Access http://localhost:8081/examples/servlets/nonblocking/numberwriter 4. Result: The page is displayed successfully (as expected), but at the same time an IllegalStateException is logged to the console and into catalina.2015-01-22.log file (an unexpected): [[[ 22-Jan-2015 11:02:03.089 SEVERE [http-bio-127.0.0.1-8081-exec-10] org.apache.catalina.connector.CoyoteAdapter.asyncDispatch Exception while processing an asynchronous request java.lang.IllegalStateException: Calling [asyncComplete()] is not valid for a request with Async state [DISPATCHED] at org.apache.coyote.AsyncStateMachine.asyncComplete(AsyncStateMachine.java:270) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:848) at org.apache.coyote.Request.action(Request.java:377) at org.apache.catalina.core.AsyncContextImpl.complete(AsyncContextImpl.java:86) at nonblocking.NumberWriter$NumberWriterListener.onError(NumberWriter.java:145) at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:304) at org.apache.coyote.http11.AbstractHttp11Processor.asyncDispatch(AbstractHttp11Processor.java:1696) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:650) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:147) at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:279) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) ]]] The NIO and APR connectors are working OK. -- 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 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com --- This still lacks a reproduction recipe. Thus far I tried the following simple tests with 8.0.17, and all of them are working (except a minor issue filed as bug 57481) - static files (Tomcat binaries) - examples webapp (mostly useless, as those pages are small) - simple jsp with a lot of text (200Kb) - jsp with jsp:include with a lot of text (200Kb, 800Kb) - simple jsp with EL (122Kn) - simple jsp with tags (164Kb) I tested HTTP + (bio,nio,apr) + (with Executor or without Executor) HTTPS + (bio,nio) + without Executor I am using JDK 7u72 (32-bit) on Windows 7. No truncations noted. Something else is needed to reproduce this. -- 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: r1653797 - in /tomcat/trunk: java/org/apache/catalina/filters/CorsFilter.java test/org/apache/catalina/filters/TestCorsFilter.java test/org/apache/catalina/filters/TesterFilterConfigs.java
Author: markt
Date: Thu Jan 22 10:00:53 2015
New Revision: 1653797
URL: http://svn.apache.org/r1653797
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57178
Origin values of null should be included if * is allowed.
This closes #16
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1653797r1=1653796r2=1653797view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Thu Jan 22
10:00:53 2015
@@ -800,6 +800,7 @@ public final class CorsFilter implements
* Checks if a given origin is valid or not. Criteria:
* ul
* liIf an encoded character is present in origin, it's not valid./li
+ * liIf origin is null, it's valid./li
* liOrigin should be a valid {@link URI}/li
* /ul
*
@@ -812,6 +813,11 @@ public final class CorsFilter implements
return false;
}
+// null is a valid origin
+if (null.equals(origin)) {
+return true;
+}
+
URI originURI;
try {
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java?rev=1653797r1=1653796r2=1653797view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCorsFilter.java Thu Jan
22 10:00:53 2015
@@ -497,10 +497,10 @@ public class TestCorsFilter {
}
/*
- * Negative test, when a CORS request arrives, with a null origin.
+ * Negative test, when a CORS request arrives, with no origin header.
*/
@Test
-public void testDoFilterNullOrigin() throws IOException, ServletException {
+public void testDoFilterNoOrigin() throws IOException, ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setMethod(POST);
@@ -536,6 +536,58 @@ public class TestCorsFilter {
response.getStatus());
}
+/*
+ * A CORS request arrives with a null origin which is allowed by default.
+ */
+@Test
+public void testDoFilterNullOriginAllowedByDefault() throws IOException,
+ServletException {
+TesterHttpServletRequest request = new TesterHttpServletRequest();
+
+request.setMethod(POST);
+request.setContentType(text/plain);
+request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, null);
+TesterHttpServletResponse response = new TesterHttpServletResponse();
+
+CorsFilter corsFilter = new CorsFilter();
+corsFilter.init(TesterFilterConfigs.getDefaultFilterConfig());
+CorsFilter.CORSRequestType requestType =
+corsFilter.checkRequestType(request);
+Assert.assertEquals(CorsFilter.CORSRequestType.SIMPLE, requestType);
+
+corsFilter.doFilter(request, response, filterChain);
+
+Assert.assertTrue(((Boolean) request.getAttribute(
+
CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST)).booleanValue());
+}
+
+/*
+ * A CORS request arrives with a null origin which is explicitly allowed
+ * by configuration.
+ */
+@Test
+public void testDoFilterNullOriginAllowedByConfiguration() throws
+IOException, ServletException {
+TesterHttpServletRequest request = new TesterHttpServletRequest();
+
+request.setMethod(POST);
+request.setContentType(text/plain);
+request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, null);
+TesterHttpServletResponse response = new TesterHttpServletResponse();
+
+CorsFilter corsFilter = new CorsFilter();
+corsFilter.init(
+
TesterFilterConfigs.getFilterConfigSpecificOriginNullAllowed());
+CorsFilter.CORSRequestType requestType =
+corsFilter.checkRequestType(request);
+Assert.assertEquals(CorsFilter.CORSRequestType.SIMPLE, requestType);
+
+corsFilter.doFilter(request, response, filterChain);
+
+Assert.assertTrue(((Boolean) request.getAttribute(
+
CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST)).booleanValue());
+}
+
@Test(expected = ServletException.class)
public void testDoFilterNullRequestNullResponse() throws IOException,
ServletException {
@@ -1034,6 +1086,24 @@ public class TestCorsFilter {
corsFilter.doFilter(request,
[GitHub] tomcat pull request: #57178: Allow CORS requests with Origin heade...
Github user asfgit closed the pull request at: https://github.com/apache/tomcat/pull/16 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653798 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java test/org/apache/catalina/filters/TestCorsFilter.java test/org/apache/catalina/filters/TesterFilterC
Author: markt
Date: Thu Jan 22 10:03:32 2015
New Revision: 1653798
URL: http://svn.apache.org/r1653798
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57178
Origin values of null should be included if * is allowed.
Patch provided by Gregor Zurowski
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 10:03:32 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574
+/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
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1653798r1=1653797r2=1653798view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java Thu
Jan 22 10:03:32 2015
@@ -800,6 +800,7 @@ public final class CorsFilter implements
* Checks if a given origin is valid or not. Criteria:
* ul
* liIf an encoded character is present in origin, it's not valid./li
+ * liIf origin is null, it's valid./li
* liOrigin should be a valid {@link URI}/li
* /ul
*
@@ -812,6 +813,11 @@ public final class CorsFilter implements
return false;
}
+// null is a valid origin
+if (null.equals(origin)) {
+return true;
+}
+
URI originURI;
try {
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java
URL:
svn commit: r1653799 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java test/org/apache/catalina/filters/TestCorsFilter.java test/org/apache/catalina/filters/TesterFilterC
Author: markt Date: Thu Jan 22 10:10:11 2015 New Revision: 1653799 URL: http://svn.apache.org/r1653799 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57178 Origin values of null should be included if * is allowed. Patch provided by Gregor Zurowski Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCorsFilter.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 10:10:11 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973 -/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 57178] Add CorsFilter configuration option to allow requests with Origin null
https://issues.apache.org/bugzilla/show_bug.cgi?id=57178 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Severity|enhancement |normal --- Comment #8 from Mark Thomas ma...@apache.org --- Thanks for the updated patch. The fix has been applied to trunk, 8.0.x (for 8.0.18 onwards) and 7.0.x (for 7.0.58 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Coverity Scan
2015-01-22 9:02 GMT+02:00 Violeta Georgieva violet...@apache.org: Hi, I would like to update the coverity scan report. As the previous one was based on Tomcat 8 (back in the time it was trunk) I think to base the scan again on Tomcat 8. Wdyt? Scan updated. Regards, Violeta
Re: Coverity Scan
2015-01-22 10:48 GMT+02:00 Konstantin Kolinko knst.koli...@gmail.com: 2015-01-22 10:02 GMT+03:00 Violeta Georgieva violet...@apache.org: Hi, I would like to update the coverity scan report. As the previous one was based on Tomcat 8 (back in the time it was trunk) I think to base the scan again on Tomcat 8. Wdyt? +1 Two notes: 1) A project at coverity is linked to a GitHub repository. Currently it is configured to use https://github.com/apache/tomcat but for Tomcat 8 one needs to use https://github.com/apache/tomcat80 It may be that the URL is only used for summary information to describe the project. In that case it can be left as is. If that URL is actually used for analysis, one would have to change it. (+1 for the change if it is needed). Ok I'll check that 2) Looking at Upload a Project Build form, it expects a tarball created by Coverity Scan Self-Build tool. I have never tried to create one. YMMV. I've done this before for other projects. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Using non-blocking Future instead of blocking Future.get
On 21/01/2015 22:42, Yu Lin wrote: Dear developers, I opened a discussion about the use of blocking Future.get() in Tomcat 8 code on Bugzillar: https://issues.apache.org/bugzilla/show_bug.cgi?id=57478 I was suggested to post it in this list. What's your opinion on this issue? There is no issue. The code is fine. Mark Do you have better suggestions to address this issue? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Coverity Scan
On 22/01/2015 07:02, Violeta Georgieva wrote: Hi, I would like to update the coverity scan report. As the previous one was based on Tomcat 8 (back in the time it was trunk) I think to base the scan again on Tomcat 8. Wdyt? +1. Is it worth having separate scans for 8.0.x and trunk? I know there will be a large amount of overlap but they are starting to diverge. Just a thought... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653794 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Thu Jan 22 09:56:37 2015
New Revision: 1653794
URL: http://svn.apache.org/r1653794
Log:
Correct log message all endpoints are disconnected to
no usable connection found, will create a new one.
Tone done from info log level to debug for the
common case.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1653794r1=1653793r2=1653794view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Thu Jan 22 09:56:37 2015
@@ -1687,16 +1687,22 @@ static int ajp_send_request(jk_endpoint_
*/
if (!IS_VALID_SOCKET(ae-sd)) {
/* Could not steal any connection from an endpoint - backend
- * is disconnected
+ * is disconnected or all connections are in use
*/
if (err_conn + err_cping + err_send 0)
-jk_log(l, JK_LOG_INFO,
- (%s) all endpoints are disconnected,
- detected by connect check (%d), cping (%d), send (%d),
- ae-worker-name, err_conn, err_cping, err_send);
+if (err_cping + err_send 0)
+jk_log(l, JK_LOG_INFO,
+ (%s) no usable connection found, will create a new
one,
+ detected by connect check (%d), cping (%d), send
(%d).,
+ ae-worker-name, err_conn, err_cping, err_send);
+else
+jk_log(l, JK_LOG_DEBUG,
+ (%s) no usable connection found, will create a new
one,
+ detected by connect check (%d), cping (%d), send
(%d).,
+ ae-worker-name, err_conn, err_cping, err_send);
else if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- (%s) all endpoints are disconnected.,
+ (%s) no usable connection found, will create a new one.,
ae-worker-name);
/* Connect to the backend.
*/
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1653794r1=1653793r2=1653794view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Jan 22 09:56:37 2015
@@ -205,6 +205,11 @@
allowed for a worker (attribute busy_limit). Original patch
contributed by zealot0630 at gmail dot com. (rjung)
/fix
+ fix
+Correct log message all endpoints are disconnected to
+no usable connection found, will create a new one. Tone done
+from info log level to debug for the common case. (rjung)
+ /fix
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #8 from reibitto reibi...@gmail.com --- Okay, after some debugging, I think I found how to duplicate this rather easily. The original project where this was happening for me was a Spring MVC project. I wasn't able to duplicate it in a non-Spring MVC project at first, so I went back to my original project and followed the path from beginning to end to get more clues as to what was happening. I found that the bug seems to only occur when requests are forwarded. After realizing that, I was able to create a minimal example that shows the problem: 1. Download a fresh stock 8.0.17 build 2. Drop in two JSP files in webapps/ROOT (the Tomcat welcome screen project is perfectly fine). For example: page1.jsp and page2.jsp 3. Put % request.getRequestDispatcher(page2.jsp).forward(request, response); % in page1.jsp 4. Put a bunch of plain text (you don't need dynamic content) in page2.jsp so that the response will be over 16 KB. 5. Now visit localhost:8080/page1.jsp in your browser, and notice the content being truncated. Also, note that going to localhost:8080/page2.jsp directly does NOT truncate the data because there is no forwarding happen there. I was able to duplicate this on 2 separate machines (Mac and Windows). -- 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 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 --- Comment #9 from Mark Thomas ma...@apache.org --- Thanks for the extra info. I (and I suspect a few other committers as well) am looking at this 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
svn commit: r1653818 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationDispatcher.java webapps/docs/changelog.xml
Author: markt Date: Thu Jan 22 12:01:13 2015 New Revision: 1653818 URL: http://svn.apache.org/r1653818 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 As per section 9.4 of the Servlet spec, ensure that the response body has been completely written before exiting the forward method. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 12:01:13 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798 -/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 57470] Occaisionally NPE in org.apache.catalina.connector.Response.addSessionCookieInternal()
https://issues.apache.org/bugzilla/show_bug.cgi?id=57470 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas ma...@apache.org --- All the indications are that this is an application bug. Please follow-up on the users mailing list. You can always re-open this issue if a Tomcat bug is found to be at the root of this. -- 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: r1653888 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TesterTldListener.java
Author: kkolinko
Date: Thu Jan 22 14:46:35 2015
New Revision: 1653888
URL: http://svn.apache.org/r1653888
Log:
Trivial followup to r1652938 (BZ 57446 fix). No change in functionality.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1653888r1=1653887r2=1653888view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 22
14:46:35 2015
@@ -214,7 +214,6 @@ public class StandardContext extends Con
* The set of application listeners that are required to have limited
access
* to ServletContext methods. See Servlet 3.1 section 4.4.
*/
-
private final SetObject noPluggabilityListeners = new HashSet();
/**
Modified: tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java?rev=1653888r1=1653887r2=1653888view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TesterTldListener.java Thu Jan
22 14:46:35 2015
@@ -34,10 +34,10 @@ public class TesterTldListener implement
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
+servletContext = sc;
// Try and use one of the Servlet 3.0 methods that should be blocked
try {
-servletContext = sce.getServletContext();
sc.getEffectiveMajorVersion();
log.append(FAIL-01);
} catch (UnsupportedOperationException uoe) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57438] Infinite redirect loop when maximum upload size exceeded
https://issues.apache.org/bugzilla/show_bug.cgi?id=57438 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas ma...@apache.org --- Tomcat will always use a 302 for a redirect. Spring MVC will always use a 302 unless the application specifically over-rides it. I'd recommend checking exactly what is on the wire with something like wireshark (you should see 302 redirects rather than 307) and then take a closer look at your client and/or your app to see why the POST is being resent. -- 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 57481] IllegalStateException for nonblocking/numberwriter example with BIO connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=57481 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in 8.0.x for 8.0.18 onwards. Confirmed this only affects BIO on 8.0.x. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 34 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 28 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150123.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150123.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150123.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150123.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2581 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/tomcat/util/buf/TestUEncoder.java:26: Wrong order for 'org.junit.Test' import. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:510: Got 1 errors and 0 warnings. Total time: 28 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015012310, vmgump.apache.org:vmgump:2015012310 Gump E-mail Identifier (unique within run) #5. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : 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-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 37 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150123.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150123.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150123.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150123.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2938 files [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/tomcat/util/buf/UEncoder.java:73: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/java/org/apache/tomcat/util/buf/UEncoder.java:81: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/tomcat/util/buf/TestUEncoder.java:26: Wrong order for 'org.junit.Test' import. [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/changelog.xml:98: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:544: Got 4 errors and 0 warnings. Total time: 36 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015012310, vmgump.apache.org:vmgump:2015012310 Gump E-mail Identifier (unique within run) #6. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 35 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 35 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150123.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150123.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150123.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150123.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2893 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/buf/UEncoder.java:73: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/buf/UEncoder.java:81: Line matches the illegal pattern '\s+$'. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java:26: Wrong order for 'org.junit.Test' import. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:544: Got 3 errors and 0 warnings. Total time: 34 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015012310, vmgump.apache.org:vmgump:2015012310 Gump E-mail Identifier (unique within run) #7. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57485] New: mod_jk passed the incomplete chunked transferred request body to tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=57485
Bug ID: 57485
Summary: mod_jk passed the incomplete chunked transferred
request body to tomcat
Product: Tomcat Connectors
Version: 1.2.40
Hardware: PC
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: mod_jk
Assignee: dev@tomcat.apache.org
Reporter: charleschung...@gmail.com
Created attachment 32392
-- https://issues.apache.org/bugzilla/attachment.cgi?id=32392action=edit
packet capture
I'm using mod_jk to connect apache to tomcat,
When I send the following tcp packets(to simulate incomplete chunked body) and
close the socket,strangely my servlet did received the partial body as
complete,packet capture shows that mod_jk decoded the chunked body and passed
the incomplete body just as complete to tomcat.
Please see the packet capture file for details.
1.tcp packet I sent
pre
POST /TestServlet/helloworld HTTP/1.1
Host: 192.168.1.58
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5)
Gecko/20091102 Firefox/3.5.5 (.NET CLR 3.5.30729)
Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
Accept-Language: en-us,en;q=0.5
Accept-Encoding: gzip,deflate
Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
Keep-Alive: 300
Connection: keep-alive
Pragma: no-cache
Cache-Control: no-cache
Content-Type: application/x-www-form-urlencoded; charset=UTF-8
Transfer-Encoding: chunked
5
k=12EOF
/pre
2.servlet code
pre
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
System.out.println(doPost start);
Enumeration pem = req.getParameterNames();
while (pem.hasMoreElements()) {
String k = pem.nextElement().toString();
String v = req.getParameter(k);
System.out.println(k + = + v);
}
System.out.println(doPost end);
}
/pre
3.the current result
the servlet outputs the following
pre
doPost start
k=12
doPost end
/pre
4.the result I expected
pre
doPost start
doPost end
/pre
Please
--
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 57485] mod_jk passed the incomplete chunked transferred request body to tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=57485 charleschung...@gmail.com changed: What|Removed |Added CC||charleschung...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654123 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/UEncoder.java test/org/apache/tomcat/util/buf/TestUEncoder.java
Author: fschumacher
Date: Fri Jan 23 05:53:27 2015
New Revision: 1654123
URL: http://svn.apache.org/r1654123
Log:
Try to make checkstyle happy by removing spaces and ordering import statements
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1654123r1=1654122r2=1654123view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Fri Jan 23
05:53:27 2015
@@ -70,7 +70,7 @@ public final class UEncoder {
* Calls to {@link UEncoder#addSafeCharacter(char) addSafeCharacter(char)}
* on instances created by this constructor will throw an
* {@link IllegalStateException}.
- *
+ *
* @param safeCharsSet
*safe characters for this encoder
*/
@@ -78,7 +78,7 @@ public final class UEncoder {
this.safeChars = safeCharsSet.getSafeChars();
readOnlySafeChars = true;
}
-
+
public void addSafeCharacter( char c ) {
if (readOnlySafeChars) {
throw new IllegalStateException(UEncoders safeChararacters are
read only);
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java?rev=1654123r1=1654122r2=1654123view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java Fri Jan 23
05:53:27 2015
@@ -22,9 +22,10 @@ import java.io.IOException;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
import org.junit.Test;
+import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
+
/**
* Test cases for {@link UEncoder}.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654124 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/UEncoder.java test/org/apache/tomcat/util/buf/TestUEncoder.java webapps/docs/changelog.xml
Author: fschumacher
Date: Fri Jan 23 06:03:11 2015
New Revision: 1654124
URL: http://svn.apache.org/r1654124
Log:
Try to make checkstyle happy by removing spaces and ordering import statements
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 23 06:03:11 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,1654013,1654030,1654050
+/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,1654013,1654030,1654050,1654123
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1654124r1=1654123r2=1654124view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Fri Jan
23 06:03:11 2015
@@ -70,7 +70,7 @@ public final class UEncoder {
* Calls to {@link UEncoder#addSafeCharacter(char) addSafeCharacter(char)}
* on instances created by this constructor will throw an
* {@link IllegalStateException}.
- *
+ *
* @param safeCharsSet
*safe characters for this encoder
*/
@@ -78,7 +78,7 @@ public final class UEncoder {
this.safeChars = safeCharsSet.getSafeChars();
readOnlySafeChars = true;
}
-
+
public void addSafeCharacter( char c ) {
if (readOnlySafeChars) {
throw new IllegalStateException(UEncoders safeChararacters are
read only);
Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
URL:
Re: svn commit: r1654064 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/DirContextURLConnection.java webapps/docs/changelog.xml
Am 22.01.2015 um 21:54 schrieb fschumac...@apache.org:
Author: fschumacher
Date: Thu Jan 22 20:54:47 2015
New Revision: 1654064
URL: http://svn.apache.org/r1654064
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57420
Make UEncoder a local variable in DirContextURLConnection to make it threadsafe.
Based on ideas from kkolinko and violetagg.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=1654064r1=1654063r2=1654064view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
Thu Jan 22 20:54:47 2015
@@ -42,6 +42,7 @@ import javax.naming.directory.DirContext
import org.apache.naming.JndiPermission;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.buf.UEncoder;
+import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
After enabling the checkstyle validation (being reminded by gump), I now
see, that this import is not allowed by checkstyle. But I don't know why
it is illegal.
Can anyone enlighten me on this?
Thanks
Felix
import org.apache.tomcat.util.http.FastHttpDateFormat;
/**
@@ -57,11 +58,6 @@ import org.apache.tomcat.util.http.FastH
public class DirContextURLConnection extends URLConnection {
private static final UDecoder URL_DECODER = new UDecoder();
-private static final UEncoder URL_ENCODER = new UEncoder();
-
-static{
-URL_ENCODER.addSafeCharacter('/');
-}
// --- Constructors
@@ -436,11 +432,12 @@ public class DirContextURLConnection ext
try {
NamingEnumerationNameClassPair enumeration =
collection.list(/);
+UEncoder urlEncoder = new UEncoder(SafeCharsSet.WITH_SLASH);
while (enumeration.hasMoreElements()) {
NameClassPair ncp = enumeration.nextElement();
String s = ncp.getName();
result.addElement(
-URL_ENCODER.encodeURL(s, 0,
s.length()).toString());
+urlEncoder.encodeURL(s, 0, s.length()).toString());
}
} catch (NamingException e) {
// Unexpected exception
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1654064r1=1654063r2=1654064view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22 20:54:47 2015
@@ -184,6 +184,11 @@
(markt)
/fix
fix
+bug57420/bug: Make UEncoder a local variable in
+DirContextURLConnection to make it threadsafe. Based on ideas from
+kkolinko and violetagg. (fschumacher)
+ /fix
+ fix
bug57425/bug: Don't add attributes with null value or name to the
replicated context. (fschumacher)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654013 - in /tomcat/trunk: java/org/apache/catalina/connector/Response.java java/org/apache/tomcat/util/buf/UEncoder.java test/org/apache/tomcat/util/buf/TestUEncoder.java
Author: fschumacher
Date: Thu Jan 22 19:16:33 2015
New Revision: 1654013
URL: http://svn.apache.org/r1654013
Log:
Enable UEncoder instances to share safeChars BitSet while ensuring that the
shared BitSet is immutable to be threadsafe.
Change Response to use UEncoder instances with shared safeChars.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.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=1654013r1=1654012r2=1654013view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jan 22
19:16:33 2015
@@ -50,6 +50,7 @@ import org.apache.catalina.util.SessionC
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
+import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.MediaTypeCache;
@@ -89,7 +90,6 @@ public class Response
}
public Response() {
-urlEncoder.addSafeCharacter('/');
}
@@ -241,7 +241,7 @@ public class Response
/**
* URL encoder.
*/
-protected final UEncoder urlEncoder = new UEncoder();
+protected final UEncoder urlEncoder = new
UEncoder(SafeCharsSet.WITH_SLASH);
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1654013r1=1654012r2=1654013view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Thu Jan 22
19:16:33 2015
@@ -32,6 +32,22 @@ import java.util.BitSet;
*/
public final class UEncoder {
+public enum SafeCharsSet {
+WITH_SLASH(/), DEFAULT();
+private final BitSet safeChars;
+
+private BitSet getSafeChars() {
+return this.safeChars;
+}
+
+private SafeCharsSet(String additionalSafeChars) {
+safeChars = initialSafeChars();
+for (char c : additionalSafeChars.toCharArray()) {
+safeChars.set(c);
+}
+}
+}
+
// Not static - the set may differ ( it's better than adding
// an extra check for /, +, etc
private BitSet safeChars=null;
@@ -39,14 +55,34 @@ public final class UEncoder {
private ByteChunk bb=null;
private CharChunk cb=null;
private CharChunk output=null;
+private final boolean readOnlySafeChars;
private final String ENCODING = UTF8;
public UEncoder() {
-initSafeChars();
+this.safeChars = initialSafeChars();
+readOnlySafeChars = false;
}
+/**
+ * Create a UEncoder with an unmodifiable safe character set.
+ * p
+ * Calls to {@link UEncoder#addSafeCharacter(char) addSafeCharacter(char)}
+ * on instances created by this constructor will throw an
+ * {@link IllegalStateException}.
+ *
+ * @param safeCharsSet
+ *safe characters for this encoder
+ */
+public UEncoder(SafeCharsSet safeCharsSet) {
+this.safeChars = safeCharsSet.getSafeChars();
+readOnlySafeChars = true;
+}
+
public void addSafeCharacter( char c ) {
+if (readOnlySafeChars) {
+throw new IllegalStateException(UEncoders safeChararacters are
read only);
+}
safeChars.set( c );
}
@@ -116,33 +152,34 @@ public final class UEncoder {
// Internal implementation
-private void initSafeChars() {
-safeChars=new BitSet(128);
+private static BitSet initialSafeChars() {
+BitSet initialSafeChars=new BitSet(128);
int i;
for (i = 'a'; i = 'z'; i++) {
-safeChars.set(i);
+initialSafeChars.set(i);
}
for (i = 'A'; i = 'Z'; i++) {
-safeChars.set(i);
+initialSafeChars.set(i);
}
for (i = '0'; i = '9'; i++) {
-safeChars.set(i);
+initialSafeChars.set(i);
}
//safe
-safeChars.set('$');
-safeChars.set('-');
-safeChars.set('_');
-safeChars.set('.');
+initialSafeChars.set('$');
+initialSafeChars.set('-');
+initialSafeChars.set('_');
+initialSafeChars.set('.');
// Dangerous: someone may treat this as
// RFC1738 does
svn commit: r1654030 - in /tomcat/trunk/test: org/apache/catalina/webresources/TestResourceJars.java webresources/non-static-resources.jar
Author: markt
Date: Thu Jan 22 19:48:32 2015
New Revision: 1654030
URL: http://svn.apache.org/r1654030
Log:
Add currently failing test for issue that came up via Servlet EG /
Stackoverflow.
Added:
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
(with props)
tomcat/trunk/test/webresources/non-static-resources.jar (with props)
Added: tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java?rev=1654030view=auto
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
Thu Jan 22 19:48:32 2015
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.webresources;
+
+import java.io.File;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.apache.catalina.WebResource;
+import org.apache.catalina.WebResourceSet;
+
+public class TestResourceJars {
+
+@Ignore // This test currenty fails. A fix is in hand...
+@Test
+public void testNonStaticResources() {
+File empty = new File(test/webresources/dir3);
+File jar = new File(test/webresources/non-static-resources.jar);
+
+TesterWebResourceRoot root = new TesterWebResourceRoot();
+
+// Use empty dir for root of web app.
+WebResourceSet webResourceSet = new DirResourceSet(root, /,
empty.getAbsolutePath(), /);
+root.setMainResources(webResourceSet);
+
+// If this JAR was in a web application, this is equivalent to how it
+// would be added
+JarResourceSet test =
+new JarResourceSet(root, /, jar.getAbsolutePath(),
/META-INF/resources);
+root.addJarResources(test);
+
+WebResource resource =
root.getClassLoaderResource(/org/apache/tomcat/unittest/foo.txt);
+
+Assert.assertFalse(resource.exists());
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
--
svn:eol-style = native
Added: tomcat/trunk/test/webresources/non-static-resources.jar
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webresources/non-static-resources.jar?rev=1654030view=auto
==
Binary file - no diff available.
Propchange: tomcat/trunk/test/webresources/non-static-resources.jar
--
svn:mime-type = application/java-archive
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654031 - /tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
Author: markt Date: Thu Jan 22 19:48:47 2015 New Revision: 1654031 URL: http://svn.apache.org/r1654031 Log: Javadoc Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1654031r1=1654030r2=1654031view=diff == --- tomcat/trunk/java/org/apache/catalina/WebResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Thu Jan 22 19:48:47 2015 @@ -107,6 +107,8 @@ public interface WebResourceSet extends * Obtain the base URL for this set of resources. One of the uses of this is * to grant read permissions to the resources when running under a security * manager. + * + * @return The base URL for this set of resources */ URL getBaseUrl(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654050 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/
Author: markt
Date: Thu Jan 22 20:44:18 2015
New Revision: 1654050
URL: http://svn.apache.org/r1654050
Log:
Resource JARs should only be used for static resources. Block class loader
resources.
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1654050r1=1654049r2=1654050view=diff
==
--- tomcat/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Thu Jan 22
20:44:18 2015
@@ -92,18 +92,33 @@ public interface WebResourceSet extends
void setRoot(WebResourceRoot root);
/**
- * Are resources provided by this resource set only intended for use by
- * calls to {@link WebResourceRoot#getClassLoaderResource(String)}.
+ * Should resources returned by this resource set only be included in any
+ * results when the lookup is explicitly looking for class loader
resources.
+ * i.e. should these resources be excluded from look ups that are
explicitly
+ * looking for static (non-class loader) resources.
*
* @return codetrue/code if these resources should only be used for
- * calls to {@link WebResourceRoot#getClassLoaderResource(String)},
- * otherwise codefalse/code
+ * class loader resource lookups, otherwise codefalse/code
*/
boolean getClassLoaderOnly();
void setClassLoaderOnly(boolean classLoaderOnly);
/**
+ * Should resources returned by this resource set only be included in any
+ * results when the lookup is explicitly looking for static (non-class
+ * loader) resources. i.e. should these resources be excluded from look ups
+ * that are explicitly looking for class loader resources.
+ *
+ * @return codetrue/code if these resources should only be used for
+ * static (non-class loader) resource lookups, otherwise
+ * codefalse/code
+ */
+boolean getStaticOnly();
+
+void setStaticOnly(boolean staticOnly);
+
+/**
* Obtain the base URL for this set of resources. One of the uses of this
is
* to grant read permissions to the resources when running under a security
* manager.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1654050r1=1654049r2=1654050view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Thu Jan 22 20:44:18 2015
@@ -31,6 +31,7 @@ public abstract class AbstractResourceSe
private String internalPath = ;
private String webAppMount;
private boolean classLoaderOnly;
+private boolean staticOnly;
protected static final StringManager sm =
@@ -100,6 +101,16 @@ public abstract class AbstractResourceSe
this.classLoaderOnly = classLoaderOnly;
}
+@Override
+public boolean getStaticOnly() {
+return staticOnly;
+}
+
+@Override
+public void setStaticOnly(boolean staticOnly) {
+this.staticOnly = staticOnly;
+}
+
// Lifecycle
methods
@Override
protected final void startInternal() throws LifecycleException {
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java?rev=1654050r1=1654049r2=1654050view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
Thu Jan 22 20:44:18 2015
@@ -40,6 +40,7 @@ public class EmptyResourceSet extends Li
private WebResourceRoot root;
private boolean classLoaderOnly;
+private boolean staticOnly;
public EmptyResourceSet(WebResourceRoot root) {
this.root = root;
@@ -110,6 +111,16 @@ public class EmptyResourceSet extends Li
this.classLoaderOnly = classLoaderOnly;
}
+@Override
+public boolean getStaticOnly() {
+return staticOnly;
+}
+
+@Override
+public void
svn commit: r1654064 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/DirContextURLConnection.java webapps/docs/changelog.xml
Author: fschumacher
Date: Thu Jan 22 20:54:47 2015
New Revision: 1654064
URL: http://svn.apache.org/r1654064
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57420
Make UEncoder a local variable in DirContextURLConnection to make it threadsafe.
Based on ideas from kkolinko and violetagg.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=1654064r1=1654063r2=1654064view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
Thu Jan 22 20:54:47 2015
@@ -42,6 +42,7 @@ import javax.naming.directory.DirContext
import org.apache.naming.JndiPermission;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.buf.UEncoder;
+import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
import org.apache.tomcat.util.http.FastHttpDateFormat;
/**
@@ -57,11 +58,6 @@ import org.apache.tomcat.util.http.FastH
public class DirContextURLConnection extends URLConnection {
private static final UDecoder URL_DECODER = new UDecoder();
-private static final UEncoder URL_ENCODER = new UEncoder();
-
-static{
-URL_ENCODER.addSafeCharacter('/');
-}
// --- Constructors
@@ -436,11 +432,12 @@ public class DirContextURLConnection ext
try {
NamingEnumerationNameClassPair enumeration =
collection.list(/);
+UEncoder urlEncoder = new UEncoder(SafeCharsSet.WITH_SLASH);
while (enumeration.hasMoreElements()) {
NameClassPair ncp = enumeration.nextElement();
String s = ncp.getName();
result.addElement(
-URL_ENCODER.encodeURL(s, 0,
s.length()).toString());
+urlEncoder.encodeURL(s, 0, s.length()).toString());
}
} catch (NamingException e) {
// Unexpected exception
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1654064r1=1654063r2=1654064view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22 20:54:47 2015
@@ -184,6 +184,11 @@
(markt)
/fix
fix
+bug57420/bug: Make UEncoder a local variable in
+DirContextURLConnection to make it threadsafe. Based on ideas from
+kkolinko and violetagg. (fschumacher)
+ /fix
+ fix
bug57425/bug: Don't add attributes with null value or name to the
replicated context. (fschumacher)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654044 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java java/org/apache/tomcat/util/buf/UEncoder.java test/org/apache/tomcat/util/buf/TestUEncoder.java web
Author: fschumacher Date: Thu Jan 22 20:40:39 2015 New Revision: 1654044 URL: http://svn.apache.org/r1654044 Log: Enable UEncoder instances to share safeChars BitSet while ensuring that the shared BitSet is immutable to be threadsafe. Change Response to use UEncoder instances with shared safeChars. Merge 1654042 from /tomcat/tc8.0.x/trunk (merge 1654013 from /tomcat/trunk) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 22 20:40:39 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841 -/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 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 Shaun Morton sh...@legalfiles.com changed: What|Removed |Added CC||sh...@legalfiles.com --- Comment #13 from Shaun Morton sh...@legalfiles.com --- Created attachment 32391 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32391action=edit Buffer test .war as requested by Mark Mark, Just in case you still need a test .jsp for this issue. rowsToPrint in index.jsp is set to break right 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
svn commit: r1653974 - /tomcat/trunk/webapps/docs/changelog.xml
Author: fschumacher Date: Thu Jan 22 17:55:09 2015 New Revision: 1653974 URL: http://svn.apache.org/r1653974 Log: Don't add bugfixes until after the first release Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1653974r1=1653973r2=1653974view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 22 17:55:09 2015 @@ -60,18 +60,6 @@ /update /changelog /subsection - subsection name=Catalina -changelog - fix -bug57425/bug: Don't add attributes with null value or name to the -replicated context. (fschumacher) - /fix - add -bug57431/bug: Enable usage of custom class for context creation -when using embedded tomcat. (fschumacher) - /add -/changelog - /subsection subsection name=Coyote changelog update - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1653972 - /tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Author: kkolinko
Date: Thu Jan 22 17:49:10 2015
New Revision: 1653972
URL: http://svn.apache.org/r1653972
Log:
Simplify. No change in functionality. (Reviewing r1653857)
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1653972r1=1653971r2=1653972view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Jan
22 17:49:10 2015
@@ -21,6 +21,9 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import javax.servlet.jsp.tagext.FunctionInfo;
@@ -166,14 +169,12 @@ public class ELFunctionMapper {
// Only care about functions in ELNode's
class Fvisitor extends ELNode.Visitor {
-private final ArrayListELNode.Function funcs =
-new ArrayList();
-private final HashMapString, String keyMap = new HashMap();
+private final ListELNode.Function funcs = new ArrayList();
+private final SetString keySet = new HashSet();
@Override
public void visit(ELNode.Function n) throws JasperException {
String key = n.getPrefix() + : + n.getName();
-if (! keyMap.containsKey(key)) {
-keyMap.put(key,);
+if (keySet.add(key)) {
funcs.add(n);
}
}
@@ -186,7 +187,7 @@ public class ELFunctionMapper {
// First locate all unique functions in this EL
Fvisitor fv = new Fvisitor();
el.visit(fv);
-ArrayListELNode.Function functions = fv.funcs;
+ListELNode.Function functions = fv.funcs;
if (functions.size() == 0) {
return;
@@ -219,13 +220,13 @@ public class ELFunctionMapper {
for (int i = 0; i functions.size(); i++) {
ELNode.Function f = functions.get(i);
FunctionInfo funcInfo = f.getFunctionInfo();
-String key = f.getPrefix()+ : + f.getName();
+String fnQName = f.getPrefix() + : + f.getName();
if (funcInfo == null) {
// Added via Lambda or ImportHandler. EL will expect a
// function mapper even if one isn't used so just pass null
ds.append(funcMethod + (null, null, null, null);\n);
} else {
-ds.append(funcMethod + (\ + key + \, +
+ds.append(funcMethod + (\ + fnQName + \, +
getCanonicalName(funcInfo.getFunctionClass()) +
.class, + '\' + f.getMethodName() + \, +
new Class[] {);
@@ -261,8 +262,7 @@ public class ELFunctionMapper {
ds.append(});\n);
}
// Put the current name in the global function map
-gMap.put(f.getPrefix() + ':' + f.getName() + ':' + f.getUri(),
- decName);
+gMap.put(fnQName + ':' + f.getUri(), decName);
}
el.setMapName(decName);
}
@@ -270,16 +270,15 @@ public class ELFunctionMapper {
/**
* Find the name of the function mapper for an EL. Reuse a
* previously generated one if possible.
- * @param functions An ArrayList of ELNode.Function instances that
+ * @param functions A List of ELNode.Function instances that
* represents the functions in an EL
* @return A previous generated function mapper name that can be used
* by this EL; null if none found.
*/
-private String matchMap(ArrayListELNode.Function functions) {
+private String matchMap(ListELNode.Function functions) {
String mapName = null;
-for (int i = 0; i functions.size(); i++) {
-ELNode.Function f = functions.get(i);
+for (ELNode.Function f : functions) {
String temName = gMap.get(f.getPrefix() + ':' + f.getName() +
':' + f.getUri());
if (temName == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654070 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/ test/webresources/ webapps/docs/
Author: markt
Date: Thu Jan 22 20:59:08 2015
New Revision: 1654070
URL: http://svn.apache.org/r1654070
Log:
Resource JARs should only be used for static resources. Block class loader
resources.
Added:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
- copied, changed from r1654030,
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
tomcat/tc8.0.x/trunk/test/webresources/non-static-resources.jar
- copied unchanged from r1654030,
tomcat/trunk/test/webresources/non-static-resources.jar
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 20:59: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,1654013
+/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,1654013,1654030,1654050
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1654070r1=1654069r2=1654070view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java Thu Jan
22 20:59:08 2015
@@ -92,18 +92,33 @@ public interface WebResourceSet extends
void setRoot(WebResourceRoot root);
/**
- * Are resources provided by this resource set only intended for use by
- * calls to {@link
[Bug 57420] Wrong class names generated since URL_ENCODER in DirContextURLConnection is not thread safe
https://issues.apache.org/bugzilla/show_bug.cgi?id=57420 Felix Schumacher felix.schumac...@internetallee.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from Felix Schumacher felix.schumac...@internetallee.de --- This fix has been applied to tomcat7.0.x (for 7.0.58 and onwards) Thanks for the nice debugging work. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57476] Incomplete html pages
https://issues.apache.org/bugzilla/show_bug.cgi?id=57476 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #14 from Mark Thomas ma...@apache.org --- This has been fixed in trunk, 8.0.x (for 8.0.18 onwards) and in 7.0.x. Note that the fix that introduced this regression has not been included in a 7.0.x release so no 7.0.x release is affected by this bug. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 33 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150123.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150123.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150123.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150123.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2581 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/tomcat/util/buf/TestUEncoder.java:26: Wrong order for 'org.junit.Test' import. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:510: Got 1 errors and 0 warnings. Total time: 32 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150123060005, vmgump.apache.org:vmgump:20150123060005 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1654129 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/UEncoder.java test/org/apache/tomcat/util/buf/TestUEncoder.java
Author: violetagg Date: Fri Jan 23 07:24:01 2015 New Revision: 1654129 URL: http://svn.apache.org/r1654129 Log: Merged revision 1654123 from tomcat/trunk: Try to make checkstyle happy by removing spaces and ordering import statements Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 23 07:24:01 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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042 -/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
