[Bug 58433] RemoteIpValve not activated on redirect from mapping

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58433

Remy Maucherat  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #2 from Remy Maucherat  ---
Not convinced personally, this adds overhead.

-- 
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 58411] CoyoteWriter throws StringIndexOutOfBoundsException when concurrently printing lines

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58411

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|REOPENED|RESOLVED

--- Comment #16 from Mark Thomas  ---
The performance impact of adding the syncs is small but measurable (around 0.4%
based on my not very scientific testing) using a servlet that made 50x 1k
writes.

I've opened an issue with the EG to clarify the expected behaviour:
https://java.net/jira/browse/SERVLET_SPEC-140

I'm going to close this as INVALID for now. It can always be re-opened if the
clarification from the EG is that it should be thread safe.

-- 
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 58436] New: Data Race in class org/apache/juli/ClassLoaderLogManager

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58436

Bug ID: 58436
   Summary: Data Race in class
org/apache/juli/ClassLoaderLogManager
   Product: Tomcat 8
   Version: 8.0.26
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Util
  Assignee: dev@tomcat.apache.org
  Reporter: krieger.tho...@gmx.de

Using http://vmlens.com to find data races I found the following data race:
In ClassLoaderLogManager the method addLogger access the classLoaderLoggers
hashmap synchronized but the method shutdown does not use any synchronization.

Here are example stacktraces:
localhost-startStop-1 (16)
java/util/concurrent/ThreadPoolExecutor$Worker.run 
java/util/concurrent/ThreadPoolExecutor.runWorker 
java/util/concurrent/FutureTask.run 
java/util/concurrent/Executors$RunnableAdapter.call
org/apache/catalina/startup/HostConfig$DeployWar.run
org/apache/catalina/startup/HostConfig.deployWAR
org/apache/catalina/core/StandardHost.addChild
org/apache/catalina/core/ContainerBase.addChild
org/apache/catalina/core/ContainerBase.addChildInternal
org/apache/catalina/util/LifecycleBase.start
org/apache/catalina/core/StandardContext.startInternal
org/apache/catalina/core/ContainerBase.getLogger
org/apache/juli/logging/LogFactory.getLog
org/apache/juli/logging/LogFactory.getInstance
org/apache/juli/logging/DirectJDKLog.getInstance
org/apache/juli/logging/DirectJDKLog.
java/util/logging/Logger.getLogger
java/util/logging/Logger.demandLogger
java/util/logging/LogManager.demandLogger
org/apache/juli/ClassLoaderLogManager.getLogger
org/apache/juli/ClassLoaderLogManager.getClassLoaderInfo
org/apache/juli/ClassLoaderLogManager$2.run
org/apache/juli/ClassLoaderLogManager$2.run
org/apache/juli/ClassLoaderLogManager.readConfiguration
java/util/WeakHashMap.put 

Thread-1 (12)
java/util/concurrent/ThreadPoolExecutor$Worker.run
org/apache/juli/ClassLoaderLogManager$Cleaner.run
org/apache/juli/ClassLoaderLogManager.shutdown
java/util/WeakHashMap$HashIterator.nextEntry

-- 
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: r1704251 - /tomcat/trunk/bin/catalina.sh

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 10:04:43 2015
New Revision: 1704251

URL: http://svn.apache.org/viewvc?rev=1704251&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58416
Correctly detect when a forced stop fails to stop Tomcat because the Tomcat 
process is waiting on some system call or is UNINTERRUPTIBLE.

Modified:
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1704251&r1=1704250&r2=1704251&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Sep 21 10:04:43 2015
@@ -512,8 +512,6 @@ elif [ "$1" = "stop" ] ; then
 echo "The PID file could not be removed."
 fi
 fi
-# Set this to zero else a warning will be issued about the 
process still running
-KILL_SLEEP_INTERVAL=0
 echo "The Tomcat process has been killed."
 break
 fi
@@ -522,7 +520,7 @@ elif [ "$1" = "stop" ] ; then
 fi
 KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 `
 done
-if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then
+if [ $KILL_SLEEP_INTERVAL -lt 0 ]; then
 echo "Tomcat has not been killed completely yet. The process might 
be waiting on some system call or might be UNINTERRUPTIBLE."
 fi
   fi



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704253 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 10:08:16 2015
New Revision: 1704253

URL: http://svn.apache.org/viewvc?rev=1704253&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58416
Correctly detect when a forced stop fails to stop Tomcat because the Tomcat 
process is waiting on some system call or is UNINTERRUPTIBLE.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/bin/catalina.sh
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 10:08:16 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,169429

svn commit: r1704254 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 10:09:30 2015
New Revision: 1704254

URL: http://svn.apache.org/viewvc?rev=1704254&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58416
Correctly detect when a forced stop fails to stop Tomcat because the Tomcat 
process is waiting on some system call or is UNINTERRUPTIBLE.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 10:09:30 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1703949
-/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,1345

[Bug 58416] Possibly wrong check condition in catalina.sh

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58416

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for the report and and suggested fix. I ended up applying a slightly
broader patch that remove a couple of unnecessary lines as well.

This has been fixed in trun, 8.0.x (for 8.0.27 onwards) and 7.0.x (for 7.0.65
onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704261 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 10:48:18 2015
New Revision: 1704261

URL: http://svn.apache.org/viewvc?rev=1704261&view=rev
Log:
Code clean-up
Remove deprecated code.
Fix Javadoc warnings.
No functional change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java?rev=1704261&r1=1704260&r2=1704261&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java Mon Sep 21 
10:48:18 2015
@@ -14,25 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.tomcat.util.digester;
 
-
 import org.xml.sax.Attributes;
 
-
 /**
  * Concrete implementations of this class implement actions to be taken when
  * a corresponding nested pattern of XML elements has been matched.
  */
-
 public abstract class Rule {
 
-
 // --- Constructors
 
-
 /**
  * Base constructor.
  * Now the digester will be set when the rule is added.
@@ -57,32 +50,35 @@ public abstract class Rule {
 
 // - Properties
 
-
 /**
- * Return the Digester with which this Rule is associated.
+ * Identify the Digester with which this Rule is associated.
+ *
+ * @return the Digester with which this Rule is associated.
  */
 public Digester getDigester() {
-
-return (this.digester);
-
+return digester;
 }
 
+
 /**
- * Set the Digester with which this Rule is 
associated.
+ * Set the Digester with which this Rule is
+ * associated.
+ *
+ * @param digester The digester with which to associate this rule
  */
 public void setDigester(Digester digester) {
-
 this.digester = digester;
-
 }
 
+
 /**
  * Return the namespace URI for which this Rule is relevant, if any.
+ *
+ * @return The namespace URI for which this rule is relevant or
+ * null if none.
  */
 public String getNamespaceURI() {
-
-return (this.namespaceURI);
-
+return namespaceURI;
 }
 
 
@@ -93,134 +89,73 @@ public abstract class Rule {
  *  or null to match independent of namespace.
  */
 public void setNamespaceURI(String namespaceURI) {
-
 this.namespaceURI = namespaceURI;
-
 }
 
 
 // - Public Methods
 
-
-/**
- * This method is called when the beginning of a matching XML element
- * is encountered.
- *
- * @param attributes The attribute list of this element
- * @deprecated Use the {@link #begin(String,String,Attributes) begin}
- *   method with namespace and name
- *   parameters instead.
- */
-@Deprecated
-public void begin(Attributes attributes) throws Exception {
-// The default implementation does nothing
-}
-
-
 /**
  * This method is called when the beginning of a matching XML element
- * is encountered. The default implementation delegates to the deprecated
- * method {@link #begin(Attributes) begin} without the
- * namespace and name parameters, to retain
- * backwards compatibility.
+ * is encountered. The default implementation is a NO-OP.
  *
  * @param namespace the namespace URI of the matching element, or an
- *   empty string if the parser is not namespace aware or the element has
- *   no namespace
+ *  empty string if the parser is not namespace aware or 
the
+ *  element has no namespace
  * @param name the local name if the parser is namespace aware, or just
- *   the element name otherwise
+ * the element name otherwise
  * @param attributes The attribute list of this element
- * @since Digester 1.4
- */
-public void begin(String namespace, String name, Attributes attributes)
-throws Exception {
-
-begin(attributes);
-
-}
-
-
-/**
- * This method is called when the body of a matching XML element
- * is encountered.  If the element has no body, this method is
- * not called at all.
  *
- * @param text The text of the body of this element
- * @deprecated Use the {@link #body(String,String,String) body} method
- *   with namespace and name parameters
- *   instead.
- */
-@Deprecated
-public void body(String text) throws Exception {
-// The default implementation does nothing
+ * @throws Exception if an error occurs while processing the event
+ */
+public void begin(String namespace, String name, Attributes attributes) 
thr

buildbot exception in ASF Buildbot on tomcat-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/318

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1704261
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704278 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/tld/ test/org/apache/tomcat/util/descriptor/tld/ test/tld/

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:05:29 2015
New Revision: 1704278

URL: http://svn.apache.org/viewvc?rev=1704278&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58427
Enforce the spec defined limitations of which elements are allowed in an 
implicit.tld file

Added:

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties 
  (with props)

tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
   (with props)
tomcat/trunk/test/tld/implicit-bad.tld   (with props)
tomcat/trunk/test/tld/implicit-good.tld   (with props)
Modified:

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java?rev=1704278&r1=1704277&r2=1704278&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java 
Mon Sep 21 12:05:29 2015
@@ -19,6 +19,7 @@ package org.apache.tomcat.util.descripto
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomcat.util.digester.Rule;
 import org.apache.tomcat.util.digester.RuleSetBase;
+import org.apache.tomcat.util.res.StringManager;
 import org.xml.sax.Attributes;
 
 /**
@@ -27,7 +28,15 @@ import org.xml.sax.Attributes;
  * Only version information used and short names are allowed.
  */
 public class ImplicitTldRuleSet extends RuleSetBase {
+
+private static final StringManager sm = 
StringManager.getManager(ImplicitTldRuleSet.class);
+
 private static final String PREFIX = "taglib";
+private static final String VALIDATOR_PREFIX = PREFIX + "/validator";
+private static final String TAG_PREFIX = PREFIX + "/tag";
+private static final String TAGFILE_PREFIX = PREFIX + "/tag-file";
+private static final String FUNCTION_PREFIX = PREFIX + "/function";
+
 
 @Override
 public void addRuleInstances(Digester digester) {
@@ -47,5 +56,24 @@ public class ImplicitTldRuleSet extends
 digester.addCallMethod(PREFIX + "/shortname", "setShortName", 0);
 digester.addCallMethod(PREFIX + "/short-name", "setShortName", 0);
 
+// Elements not permitted
+digester.addRule(PREFIX + "/uri", new ElementNotAllowedRule());
+digester.addRule(PREFIX + "/info", new ElementNotAllowedRule());
+digester.addRule(PREFIX + "/description", new ElementNotAllowedRule());
+digester.addRule(PREFIX + "/listener/listener-class", new 
ElementNotAllowedRule());
+
+digester.addRule(VALIDATOR_PREFIX, new ElementNotAllowedRule());
+digester.addRule(TAG_PREFIX, new ElementNotAllowedRule());
+digester.addRule(TAGFILE_PREFIX, new ElementNotAllowedRule());
+digester.addRule(FUNCTION_PREFIX, new ElementNotAllowedRule());
+}
+
+
+private static class ElementNotAllowedRule extends Rule {
+@Override
+public void begin(String namespace, String name, Attributes 
attributes) throws Exception {
+throw new IllegalArgumentException(
+sm.getString("implicitTldRule.elementNotAllowed", name));
+}
 }
 }

Added: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties?rev=1704278&view=auto
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties 
Mon Sep 21 12:05:29 2015
@@ -0,0 +1,16 @@
+# 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.
+
+implicitTldRule.elementNotAllowed=The element [{0}] is not permitted in an 
implicit.tld file
\ No newline at end of file

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties

svn commit: r1704280 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/descriptor/tld/ test/org/apache/tomcat/util/descriptor/tld/ test/tld/ webapps/docs/

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:08:10 2015
New Revision: 1704280

URL: http://svn.apache.org/viewvc?rev=1704280&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58427
Enforce the spec defined limitations of which elements are allowed in an 
implicit.tld file

Added:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties
  - copied unchanged from r1704278, 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
  - copied unchanged from r1704278, 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
tomcat/tc8.0.x/trunk/test/tld/implicit-bad.tld
  - copied unchanged from r1704278, tomcat/trunk/test/tld/implicit-bad.tld
tomcat/tc8.0.x/trunk/test/tld/implicit-good.tld
  - copied unchanged from r1704278, tomcat/trunk/test/tld/implicit-good.tld
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 12:08:10 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,16787

buildbot failure in ASF Buildbot on tomcat-8-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/148

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1704280
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58427] JSP spec out - additional elements in implicit.tld

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58427

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

Fixed in trunk and 8.0.x for 8.0.27 onwards.

A review of the code in 7.0.x suggests that this is already implemented there
and that this was a regression intorduced when the XML parsing was refactored
for 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

buildbot failure in ASF Buildbot on tomcat-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/319

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1704278
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704283 - in /tomcat/trunk/webapps/docs/config: ajp.xml http.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:25:59 2015
New Revision: 1704283

URL: http://svn.apache.org/viewvc?rev=1704283&view=rev
Log:
Clean-up inspired by bug 58430

Modified:
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1704283&r1=1704282&r2=1704283&view=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Mon Sep 21 12:25:59 2015
@@ -740,7 +740,7 @@
 
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
 
   
@@ -775,19 +775,19 @@
   
   
 Read Request Headers
-Sim Blocking
+Blocking
 Blocking
 Blocking
   
   
 Read Request Body
-Sim Blocking
+Blocking
 Blocking
 Blocking
   
   
 Write Response
-Sim Blocking
+Blocking
 Blocking
 Blocking
   

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1704283&r1=1704282&r2=1704283&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Sep 21 12:25:59 2015
@@ -1632,7 +1632,7 @@
 
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
 
   
@@ -1669,18 +1669,18 @@
 Read HTTP Request
 Non Blocking
 Non Blocking
-Blocking
+Non Blocking
   
   
 Read HTTP Body
-Sim Blocking
-Sim Blocking
+Blocking
+Blocking
 Blocking
   
   
 Write HTTP Response
-Sim Blocking
-Sim Blocking
+Blocking
+Blocking
 Blocking
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704284 - in /tomcat/tc8.0.x/trunk/webapps/docs/config: ajp.xml http.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:27:51 2015
New Revision: 1704284

URL: http://svn.apache.org/viewvc?rev=1704284&view=rev
Log:
Clean-up inspired by bug 58430

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml?rev=1704284&r1=1704283&r2=1704284&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml Mon Sep 21 12:27:51 2015
@@ -801,21 +801,21 @@
   
 Read Request Headers
 Blocking
-Sim Blocking
+Blocking
 Blocking
 Blocking
   
   
 Read Request Body
 Blocking
-Sim Blocking
+Blocking
 Blocking
 Blocking
   
   
 Write Response
 Blocking
-Sim Blocking
+Blocking
 Blocking
 Blocking
   

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml?rev=1704284&r1=1704283&r2=1704284&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Mon Sep 21 12:27:51 2015
@@ -1501,14 +1501,14 @@
   
 Read HTTP Body
 Blocking
-Sim Blocking
+Blocking
 Blocking
 Blocking
   
   
 Write HTTP Response
 Blocking
-Sim Blocking
+Blocking
 Blocking
 Blocking
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704286 - in /tomcat/tc8.0.x/trunk/webapps/docs/config: ajp.xml http.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:29:58 2015
New Revision: 1704286

URL: http://svn.apache.org/viewvc?rev=1704286&view=rev
Log:
Fix language

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml?rev=1704286&r1=1704285&r2=1704286&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml Mon Sep 21 12:29:58 2015
@@ -760,7 +760,7 @@
 
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
 
   

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml?rev=1704286&r1=1704285&r2=1704286&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Mon Sep 21 12:29:58 2015
@@ -1453,7 +1453,7 @@
   
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704287 - in /tomcat/tc7.0.x/trunk/webapps/docs/config: ajp.xml http.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:30:11 2015
New Revision: 1704287

URL: http://svn.apache.org/viewvc?rev=1704287&view=rev
Log:
Clean-up inspired by bug 58430

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml?rev=1704287&r1=1704286&r2=1704287&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml Mon Sep 21 12:30:11 2015
@@ -689,7 +689,7 @@
 
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
Java Blocking Connector   Java Nio Blocking Connector   
APR/native Connector
  BIO NIO   
APR
@@ -697,9 +697,9 @@
 Tomcat Version   3.x onwards 7.x onwards   
   5.5.x onwards
 Support Polling  NO  YES   
YES
 Polling Size N/A   maxConnections  
   maxConnections
-Read Request Headers  Blocking  Sim Blocking   
Blocking
-Read Request Body Blocking  Sim Blocking   
Blocking
-Write ResponseBlocking  Sim Blocking   
Blocking
+Read Request Headers  BlockingBlocking 
  Blocking
+Read Request Body BlockingBlocking 
  Blocking
+Write ResponseBlockingBlocking 
  Blocking
 Wait for next Request Blocking  Non Blocking   
Non Blocking
 Max ConnectionsmaxConnections  maxConnections  
   maxConnections
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1704287&r1=1704286&r2=1704287&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 21 12:30:11 2015
@@ -1316,7 +1316,7 @@
   
   
 
-Below is a small chart that shows how the connectors differentiate.
+Below is a small chart that shows how the connectors differ.
 
Java Blocking Connector   Java Non Blocking Connector   
APR/native Connector
  BIO NIO   
APR
@@ -1324,9 +1324,9 @@
 Tomcat Version   3.x onwards 6.x onwards   
   5.5.x onwards
 Support Polling  NO  YES   
YES
 Polling Size N/A   maxConnections  
   maxConnections
-Read HTTP Request Blocking  Non Blocking   
  Blocking
-Read HTTP BodyBlocking  Sim Blocking   
  Blocking
-Write HTTP Response   Blocking  Sim Blocking   
  Blocking
+Read HTTP Request BlockingBlocking 
  Blocking
+Read HTTP BodyBlockingBlocking 
  Blocking
+Write HTTP Response   BlockingBlocking 
  Blocking
 Wait for next Request Blocking  Non Blocking   
Non Blocking
 SSL Support   Java SSLJava SSL 
  OpenSSL
 SSL Handshake Blocking  Non blocking   
  Blocking



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58430] The meaning and reason of "Sim blocking" is not documented

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58430

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

All the connectors (apart from BIO) could be considered to be simulating
blocking in one way or another so I don't think that that really adds very
much. It certainly makes no measureable performance impact.

I've simply removed all references to simulated and fixed the language a bit.

The fix has been applied to trunk, 8.0.x (for 8.0.27 onwards) and 7.0.x (for
7.0.65 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot exception in ASF Buildbot on tomcat-7-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/85

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1704287
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704289 - /tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:54:52 2015
New Revision: 1704289

URL: http://svn.apache.org/viewvc?rev=1704289&view=rev
Log:
Ensure all access to the classloader<->Loggers Map is thread-safe

Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1704289&r1=1704288&r2=1704289&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Mon Sep 21 
12:54:52 2015
@@ -86,7 +86,7 @@ public class ClassLoaderLogManager exten
  * application redeployment.
  */
 protected final Map classLoaderLoggers =
-new WeakHashMap<>();
+new WeakHashMap<>(); // Guarded by this
 
 
 /**
@@ -273,7 +273,7 @@ public class ClassLoaderLogManager exten
 }
 
 
-private String findProperty(String name) {
+private synchronized String findProperty(String name) {
 ClassLoader classLoader = Thread.currentThread()
 .getContextClassLoader();
 ClassLoaderLogInfo info = getClassLoaderInfo(classLoader);
@@ -343,7 +343,7 @@ public class ClassLoaderLogManager exten
 /**
  * Shuts down the logging system.
  */
-public void shutdown() {
+public synchronized void shutdown() {
 // The JVM is being shutdown. Make sure all loggers for all class
 // loaders are shutdown
 for (ClassLoaderLogInfo clLogInfo : classLoaderLoggers.values()) {
@@ -387,7 +387,7 @@ public class ClassLoaderLogManager exten
  * @param classLoader The classloader for which we will retrieve or build 
the
  *configuration
  */
-protected ClassLoaderLogInfo getClassLoaderInfo(ClassLoader classLoader) {
+protected synchronized ClassLoaderLogInfo getClassLoaderInfo(ClassLoader 
classLoader) {
 
 if (classLoader == null) {
 classLoader = ClassLoader.getSystemClassLoader();
@@ -418,7 +418,7 @@ public class ClassLoaderLogManager exten
  * @param classLoader
  * @throws IOException Error
  */
-protected void readConfiguration(ClassLoader classLoader)
+protected synchronized void readConfiguration(ClassLoader classLoader)
 throws IOException {
 
 InputStream is = null;
@@ -516,7 +516,7 @@ public class ClassLoaderLogManager exten
  * @param classLoader for which the configuration will be loaded
  * @throws IOException If something wrong happens during loading
  */
-protected void readConfiguration(InputStream is, ClassLoader classLoader)
+protected synchronized void readConfiguration(InputStream is, ClassLoader 
classLoader)
 throws IOException {
 
 ClassLoaderLogInfo info = classLoaderLoggers.get(classLoader);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704291 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/juli/ClassLoaderLogManager.java webapps/docs/changelog.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:57:20 2015
New Revision: 1704291

URL: http://svn.apache.org/viewvc?rev=1704291&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58436
Ensure all access to the classloader<->Loggers Map is thread-safe

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 12:57:20 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788

svn commit: r1704293 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 12:58:36 2015
New Revision: 1704293

URL: http://svn.apache.org/viewvc?rev=1704293&view=rev
Log:
Fix back-port

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java?rev=1704293&r1=1704292&r2=1704293&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
 Mon Sep 21 12:58:36 2015
@@ -29,7 +29,8 @@ import org.xml.sax.Attributes;
  */
 public class ImplicitTldRuleSet extends RuleSetBase {
 
-private static final StringManager sm = 
StringManager.getManager(ImplicitTldRuleSet.class);
+private static final StringManager sm = StringManager.getManager(
+ImplicitTldRuleSet.class.getPackage().getName());
 
 private static final String PREFIX = "taglib";
 private static final String VALIDATOR_PREFIX = PREFIX + "/validator";



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704294 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/ClassLoaderLogManager.java test/tld/ webapps/docs/changelog.xml

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 13:00:57 2015
New Revision: 1704294

URL: http://svn.apache.org/viewvc?rev=1704294&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58436
Ensure all access to the classloader<->Loggers Map is thread-safe

Added:
tomcat/tc7.0.x/trunk/test/tld/
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 13:00:57 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253
-/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-134

[Bug 58436] Data Race in class org/apache/juli/ClassLoaderLogManager

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58436

Mark Thomas  changed:

   What|Removed |Added

 OS||All
 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for the report. Fixed in trunk, 8.0.x (for 8.0.27 onwards) and 7.0.x
(for 7.0.65 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot exception in ASF Buildbot on tomcat-8-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/150

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1704293
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-7-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/86

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1704294
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1702244 - in /tomcat/trunk: java/org/apache/jasper/compiler/ test/org/apache/el/ test/org/apache/jasper/compiler/ test/webapp/ test/webapp/bug45nnn/

2015-09-21 Thread Mark Thomas 
On 10/09/2015 14:20, Mark Thomas wrote:
> On 10/09/2015 14:18, ma...@apache.org wrote:
>> Author: markt
>> Date: Thu Sep 10 13:18:02 2015
>> New Revision: 1702244
>>
>> URL: http://svn.apache.org/r1702244
> 
> Reviews particularly welcome for this commit since it changes a number
> of EL in JSP edge cases.
> 
> The intention is to better adhere to the specs.
> 
> I'll give it a couple of days before back-porting this to give folks a
> chance to look at it and comment.

Ping (in case this got drowned in the flood of data race fixes).

My current plan is to back-port this to 8.0.x in time for the next
release. I'll leave this until last to give folks as much opportunity to
review the patch. If there are objections, I'm happy to delay the
back-port while we discuss the objections.

Mark


> 
> Mark
> 
> 
>> Log:
>> For EL expressions used within attribute values:
>> a) attribute escaping (e.g. for quotes) DOES NOT apply inside the EL 
>> expression
>> b) EL expressions can not be used with scriptlets (<%= ... %>)
>>
>> For EL expressions in JSP
>> c) '\$' is an escape for '$' rather than '\${' being an escape for '${'
>> d) '\#' is an escape for '#' rather than '\#{' being an escape for '#{'
>>
>> The implications of this include:
>> 1. Due to a) 
>>
>>is treated as valid (previously the double quote had to be escaped)
>>
>> 2. Due to c) (and similarly for d))
>>04-\$500
>>will now render as
>>04-$500
>>whereas previously it rendered unchanged
>>
>> 3. Due to a)
>>
>>will now trigger an error
>>
>> Modified:
>> tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
>> tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
>> tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
>> tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
>> tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
>> tomcat/trunk/test/org/apache/el/TestELInJsp.java
>> tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
>> tomcat/trunk/test/org/apache/jasper/compiler/TestELParser.java
>> tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
>> tomcat/trunk/test/webapp/bug45nnn/bug45427.jsp
>> tomcat/trunk/test/webapp/bug45nnn/bug45451.jspf
>> tomcat/trunk/test/webapp/bug45nnn/bug45451a.jsp
>> tomcat/trunk/test/webapp/el-method.jsp
>> tomcat/trunk/test/webapp/el-misc.jsp
>>
>> Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1702244&r1=1702243&r2=1702244&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Thu 
>> Sep 10 13:18:02 2015
>> @@ -202,11 +202,11 @@ public class AttributeParser {
>>  }
>>  
>>  /*
>> - * For EL need to unquote everything but no need to convert anything. 
>> The
>> - * EL is terminated by '}'. The only other valid location for '}' is 
>> inside
>> - * a StringLiteral. The literals are delimited by '\'' or '\"'. The only
>> - * other valid location for '\'' or '\"' is also inside a 
>> StringLiteral. A
>> - * quote character inside a StringLiteral must be escaped if the same 
>> quote
>> + * Once inside EL, no need to unquote or convert anything. The EL is
>> + * terminated by '}'. The only other valid location for '}' is inside a
>> + * StringLiteral. The literals are delimited by '\'' or '\"'. The only 
>> other
>> + * valid location for '\'' or '\"' is also inside a StringLiteral. A 
>> quote
>> + * character inside a StringLiteral must be escaped if the same quote
>>   * character is used to delimit the StringLiteral.
>>   */
>>  private void parseEL() {
>> @@ -214,7 +214,7 @@ public class AttributeParser {
>>  boolean insideLiteral = false;
>>  char literalQuote = 0;
>>  while (i < size && !endEL) {
>> -char ch = nextChar();
>> +char ch = input.charAt(i++);
>>  if (ch == '\'' || ch == '\"') {
>>  if (insideLiteral) {
>>  if (literalQuote == ch) {
>> @@ -228,7 +228,7 @@ public class AttributeParser {
>>  } else if (ch == '\\') {
>>  result.append(ch);
>>  if (insideLiteral && size < i) {
>> -ch = nextChar();
>> +ch = input.charAt(i++);
>>  result.append(ch);
>>  }
>>  } else if (ch == '}') {
>>
>> Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1702244&r1=1702243&r2=1702244&view=diff
>>

svn commit: r1704302 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:28:11 2015
New Revision: 1704302

URL: http://svn.apache.org/viewvc?rev=1704302&view=rev
Log:
Remove some completed TODOs
Tidy up the Javadoc

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1704302&r1=1704301&r2=1704302&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Sep 
21 14:28:11 2015
@@ -457,16 +457,16 @@ public class SecureNioChannel extends Ni
 }
 
 /**
- * Sends a SSL close message, will not physically close the connection 
here.
- * To close the connection, you could do something like
+ * Sends a SSL close message, will not physically close the connection 
here.
+ * To close the connection, you could do something like
  * 
  *   close();
  *   while (isOpen() && !myTimeoutFunction()) Thread.sleep(25);
  *   if ( isOpen() ) close(true); //forces a close if you timed out
  * 
  * @throws IOException if an I/O error occurs
- * @throws IOException if there is data on the outgoing network buffer and 
we are unable to flush it
- * TODO Implement this java.io.Closeable method
+ * @throws IOException if there is data on the outgoing network buffer and
+ * we are unable to flush it
  */
 @Override
 public void close() throws IOException {
@@ -512,10 +512,11 @@ public class SecureNioChannel extends Ni
  * Reads a sequence of bytes from this channel into the given buffer.
  *
  * @param dst The buffer into which bytes are to be transferred
- * @return The number of bytes read, possibly zero, or -1 if the 
channel has reached end-of-stream
+ * @return The number of bytes read, possibly zero, or -1 if the
+ * channel has reached end-of-stream
  * @throws IOException If some other I/O error occurs
- * @throws IllegalArgumentException if the destination buffer is different 
than bufHandler.getReadBuffer()
- * TODO Implement this java.nio.channels.ReadableByteChannel method
+ * @throws IllegalArgumentException if the destination buffer is different
+ *  than bufHandler.getReadBuffer()
  */
 @Override
 public int read(ByteBuffer dst) throws IOException {
@@ -572,7 +573,6 @@ public class SecureNioChannel extends Ni
  * @param src The buffer from which bytes are to be retrieved
  * @return The number of bytes written, possibly zero
  * @throws IOException If some other I/O error occurs
- * TODO Implement this java.nio.channels.WritableByteChannel method
  */
 @Override
 public int write(ByteBuffer src) throws IOException {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704303 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:29:08 2015
New Revision: 1704303

URL: http://svn.apache.org/viewvc?rev=1704303&view=rev
Log:
Remove some completed TODOs
Tidy up the Javadoc

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 14:29:08 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,

svn commit: r1704304 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:30:48 2015
New Revision: 1704304

URL: http://svn.apache.org/viewvc?rev=1704304&view=rev
Log:
Possible fix for 57265. A closed socket will no longer be available for sendFile

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1704304&r1=1704303&r2=1704304&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
Mon Sep 21 14:30:48 2015
@@ -494,10 +494,10 @@ public class SecureNioChannel extends Ni
 int written = sc.write(src);
 return written;
 } else {
-//make sure we can handle expand, and that we only use one buffer
-if ( (!this.isSendFile()) && (src != bufHandler.getWriteBuffer()) 
) throw new 
IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
 //are we closing or closed?
 if ( closing || closed) throw new 
IOException(sm.getString("channel.nio.ssl.closing"));
+//make sure we can handle expand, and that we only use one buffer
+if ( (!this.isSendFile()) && (src != bufHandler.getWriteBuffer()) 
) throw new 
IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
 
 //the number of bytes written
 int written = 0;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704305 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:32:09 2015
New Revision: 1704305

URL: http://svn.apache.org/viewvc?rev=1704305&view=rev
Log:
clean-up

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1704305&r1=1704304&r2=1704305&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Sep 
21 14:32:09 2015
@@ -577,34 +577,33 @@ public class SecureNioChannel extends Ni
 @Override
 public int write(ByteBuffer src) throws IOException {
 checkInterruptStatus();
-if ( src == this.netOutBuffer ) {
+if (src == this.netOutBuffer) {
 //we can get here through a recursive call
 //by using the NioBlockingSelector
 int written = sc.write(src);
 return written;
 } else {
-//are we closing or closed?
-if ( closing || closed) throw new 
IOException(sm.getString("channel.nio.ssl.closing"));
-//make sure we can handle expand, and that we only use one buffer
+// Are we closing or closed?
+if ( closing || closed) {
+throw new IOException(sm.getString("channel.nio.ssl.closing"));
+}
+
+// Make sure we can handle expand, and that we only use one buffer
 if (!this.isSendFile() && src != bufHandler.getWriteBuffer()) {
 throw new 
IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
 }
 
-//the number of bytes written
-int written = 0;
-
 if (!flush(netOutBuffer)) {
-//we haven't emptied out the buffer yet
-return written;
+// We haven't emptied out the buffer yet
+return 0;
 }
 
-/*
- * The data buffer is empty, we can reuse the entire buffer.
- */
+// The data buffer is empty, we can reuse the entire buffer.
 netOutBuffer.clear();
 
 SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
-written = result.bytesConsumed();
+// The number of bytes written
+int written = result.bytesConsumed();
 netOutBuffer.flip();
 
 if (result.getStatus() == Status.OK) {
@@ -613,7 +612,7 @@ public class SecureNioChannel extends Ni
 throw new IOException(sm.getString("channel.nio.ssl.wrapFail", 
result.getStatus()));
 }
 
-//force a flush
+// Force a flush
 flush(netOutBuffer);
 
 return written;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704307 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:33:12 2015
New Revision: 1704307

URL: http://svn.apache.org/viewvc?rev=1704307&view=rev
Log:
Trivial clean-up

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1704307&r1=1704306&r2=1704307&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Sep 
21 14:33:12 2015
@@ -584,7 +584,7 @@ public class SecureNioChannel extends Ni
 return written;
 } else {
 // Are we closing or closed?
-if ( closing || closed) {
+if (closing || closed) {
 throw new IOException(sm.getString("channel.nio.ssl.closing"));
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704306 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:32:51 2015
New Revision: 1704306

URL: http://svn.apache.org/viewvc?rev=1704306&view=rev
Log:
Clean-up

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 14:32:51 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1700607,1700870

svn commit: r1704308 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 14:34:16 2015
New Revision: 1704308

URL: http://svn.apache.org/viewvc?rev=1704308&view=rev
Log:
Trivial clean-up

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 14:34:16 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1700607

Re: svn commit: r1704304 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread Rémy Maucherat 
2015-09-21 16:30 GMT+02:00 :

> Author: markt
> Date: Mon Sep 21 14:30:48 2015
> New Revision: 1704304
>
> URL: http://svn.apache.org/viewvc?rev=1704304&view=rev
> Log:
> Possible fix for 57265. A closed socket will no longer be available for
> sendFile
>
> Jean-Frédéric will run his testing to confirm it (or not), at the moment I
don't really know.

Rémy

[Bug 57265] Tomcat 8 hiden behind NGINX fails to send file when using NIO connector

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57265

--- Comment #14 from Mark Thomas  ---
I've back-ported one on Remy's fixes to 8.0.x. Please could you try the
8.0.27-dev build available from
http://people.apache.org/~markt/dev/v8.0.27-dev/ and let us know if that fixes
the issues or not.

Note: This is a dev / snapshot build for testing only. It is NOT an official
release.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1704304 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread Mark Thomas 
On 21/09/2015 15:38, Rémy Maucherat wrote:
> 2015-09-21 16:30 GMT+02:00 :
> 
>> Author: markt
>> Date: Mon Sep 21 14:30:48 2015
>> New Revision: 1704304
>>
>> URL: http://svn.apache.org/viewvc?rev=1704304&view=rev
>> Log:
>> Possible fix for 57265. A closed socket will no longer be available for
>> sendFile
>>
> Jean-Frédéric will run his testing to confirm it (or not), at the moment I
> don't really know.

If Jean-Frédéric could share a test that reproduced the problem that
would be extremely helpful.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57265] Tomcat 8 hiden behind NGINX fails to send file when using NIO connector

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57265

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|NEEDINFO

--- Comment #15 from Mark Thomas  ---
We really need a test case that reproduces this otherwise we aren't doing much
more than guesing what the problem might be.

-- 
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: r1704318 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaSession.java java/org/apache/catalina/session/StandardSession.java test/org/apache/catalina/session/TestStandardSessio

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:23:18 2015
New Revision: 1704318

URL: http://svn.apache.org/viewvc?rev=1704318&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58284
Correctly implement session serialization so non-serializable attributes are 
skipped with a warning.
Patch provided by Andrew Shore.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1704318&r1=1704317&r2=1704318&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Mon Sep 
21 15:23:18 2015
@@ -24,6 +24,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.WriteAbortedException;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -771,9 +772,16 @@ public class DeltaSession extends Standa
 isValid = true;
 for (int i = 0; i < n; i++) {
 String name = (String) stream.readObject();
-Object value = stream.readObject();
-if ( (value instanceof String) && (value.equals(NOT_SERIALIZED)))
-continue;
+final Object value;
+try {
+value = stream.readObject();
+} catch (WriteAbortedException wae) {
+if (wae.getCause() instanceof NotSerializableException) {
+// Skip non serializable attributes
+continue;
+}
+throw wae;
+}
 attributes.put(name, value);
 }
 isValid = isValidSave;
@@ -871,9 +879,7 @@ public class DeltaSession extends Standa
 try {
 stream.writeObject(saveValues.get(i));
 } catch (NotSerializableException e) {
-
log.error(sm.getString("standardSession.notSerializable",saveNames.get(i), id), 
e);
-stream.writeObject(NOT_SERIALIZED);
-log.error("  storing attribute '" + saveNames.get(i)+ "' with 
value NOT_SERIALIZED");
+log.error(sm.getString("standardSession.notSerializable", 
saveNames.get(i), id), e);
 }
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1704318&r1=1704317&r2=1704318&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Sep 
21 15:23:18 2015
@@ -22,6 +22,7 @@ import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.WriteAbortedException;
 import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedAction;
@@ -141,14 +142,6 @@ public class StandardSession implements
 
 
 /**
- * The dummy attribute value serialized when a NotSerializableException is
- * encountered in writeObject().
- */
-protected static final String NOT_SERIALIZED =
-"___NOT_SERIALIZABLE_EXCEPTION___";
-
-
-/**
  * The collection of user data attributes associated with this Session.
  */
 protected Map attributes = new ConcurrentHashMap<>();
@@ -1631,9 +1624,16 @@ public class StandardSession implements
 isValid = true;
 for (int i = 0; i < n; i++) {
 String name = (String) stream.readObject();
-Object value = stream.readObject();
-if ((value instanceof String) && (value.equals(NOT_SERIALIZED)))
-continue;
+final Object value;
+try {
+value = stream.readObject();
+} catch (WriteAbortedException wae) {
+if (wae.getCause() instanceof NotSerializableException) {
+// Skip non serializable attributes
+continue;
+}
+throw wae;
+}
 if (manager.getContext().getLogger().isDebugEnabled())
 manager.getContext().getLogger().debug("  loading attribute '" 
+ name +
 "' with value '" + value + "'");
@@ -1709,18 +1709,11 @@ public class StandardSession implements
 try {
 stream.writeObject(saveValues.get(i));

Re: svn commit: r1704304 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2015-09-21 Thread Rémy Maucherat 
2015-09-21 17:05 GMT+02:00 Mark Thomas :

> If Jean-Frédéric could share a test that reproduced the problem that
> would be extremely helpful.
>
> It involves running ab on overpowered systems as part of the testing of
OpenSSL, and so now waiting to get the lab back for further testing (the
direct BB "leak" with NIO is confirmed fixed, that was a more serious
issue). It's rather likely there's something slightly wrong since in this
kind of tests there's not supposed to be some unexpected disconnects.

Rémy

svn commit: r1704321 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/session/TestStandardSession.java test/org/apache/catalina/session/TestStandardSessionIntegration.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:28:17 2015
New Revision: 1704321

URL: http://svn.apache.org/viewvc?rev=1704321&view=rev
Log:
Rename to make way for a genuine unit test

Added:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
  - copied unchanged from r1698212, 
tomcat/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
Removed:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:28:17 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,169274

svn commit: r1704322 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/session/TestStandardSession.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:29:44 2015
New Revision: 1704322

URL: http://svn.apache.org/viewvc?rev=1704322&view=rev
Log:
Add unit tests for session serialization

Added:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
  - copied unchanged from r1698220, 
tomcat/trunk/test/org/apache/catalina/session/TestStandardSession.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:29:44 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,169

svn commit: r1704325 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ha/session/DeltaSession.java java/org/apache/catalina/session/StandardSession.java test/org/apache/catalina/session/TestSta

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:31:59 2015
New Revision: 1704325

URL: http://svn.apache.org/viewvc?rev=1704325&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58284
Correctly implement session serialization so non-serializable attributes are 
skipped with a warning.
Patch provided by Andrew Shore.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:31:59 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,16

svn commit: r1704326 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/session/TestStandardSession.java test/org/apache/catalina/session/TestStandardSessionIntegration.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:36:43 2015
New Revision: 1704326

URL: http://svn.apache.org/viewvc?rev=1704326&view=rev
Log:
Rename to make way for a genuine unit test

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
  - copied unchanged from r1704321, 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
Removed:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:36:43 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291
-/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,1344

svn commit: r1704327 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/session/TestStandardSession.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:37:00 2015
New Revision: 1704327

URL: http://svn.apache.org/viewvc?rev=1704327&view=rev
Log:
Add unit tests for session serialization

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
  - copied unchanged from r1704322, 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:37:00 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291,1704321
-/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,

[Bug 58284] StandardSession attempts to silently write NonSerializable objects

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58284

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #13 from Mark Thomas  ---
Many thanks for the patch and the updated test case.

I have applied it (with some very minor cosmetic changes) to trunk, 8.0.x (for
8.0.27 onwards) and 7.0.x (for 7.0.65 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704328 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/DeltaSession.java java/org/apache/catalina/session/StandardSession.java test/org/apache/catalina/session/TestSta

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:38:57 2015
New Revision: 1704328

URL: http://svn.apache.org/viewvc?rev=1704328&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58284
Correctly implement session serialization so non-serializable attributes are 
skipped with a warning.
Patch provided by Andrew Shore.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/TestStandardSession.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:38:57 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291,1704321-1704322
-/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

buildbot failure in ASF Buildbot on tomcat-8-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/151

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1704308
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot exception in ASF Buildbot on tomcat-8-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/152

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1704325
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704331 - /tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:47:33 2015
New Revision: 1704331

URL: http://svn.apache.org/viewvc?rev=1704331&view=rev
Log:
Whoops. Add the expected failure.

Modified:

tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java?rev=1704331&r1=1704330&r2=1704331&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java
 Mon Sep 21 15:47:33 2015
@@ -24,6 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 public class TestImplicitTldParser {
 private TldParser parser;
@@ -41,7 +42,7 @@ public class TestImplicitTldParser {
 Assert.assertEquals("Ignored", xml.getShortName());
 }
 
-@Test
+@Test(expected=SAXParseException.class)
 public void testImpicitTldBad() throws Exception {
 TaglibXml xml = parse("test/tld/implicit-bad.tld");
 Assert.assertEquals("1.0", xml.getTlibVersion());



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704332 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 15:48:33 2015
New Revision: 1704332

URL: http://svn.apache.org/viewvc?rev=1704332&view=rev
Log:
Whoops. Add the expected failure

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/tld/TestImplicitTldParser.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 21 15:48:33 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
 
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1
 
49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
 
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,169637

buildbot exception in ASF Buildbot on tomcat-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/324

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1704331
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704339 - /tomcat/tc6.0.x/trunk/STATUS.txt

2015-09-21 Thread remm 
Author: remm
Date: Mon Sep 21 16:02:51 2015
New Revision: 1704339

URL: http://svn.apache.org/viewvc?rev=1704339&view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1704339&r1=1704338&r2=1704339&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 21 16:02:51 2015
@@ -64,7 +64,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/r1700872
   http://svn.apache.org/r1701095
   Not required for async but still required because of Comet
-  +1: markt
+  +1: markt, remm
   -1:
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1704341 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 16:03:19 2015
New Revision: 1704341

URL: http://svn.apache.org/viewvc?rev=1704341&view=rev
Log:
Fix possible incorrect test failure that depends on the ordering of server side 
threads.

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java?rev=1704341&r1=1704340&r2=1704341&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java Mon Sep 
21 16:03:19 2015
@@ -243,17 +243,27 @@ public class TestHttp2Section_6_9 extend
 // Now use a settings frame to restore the size of the flow control
 // window.
 sendSettings(0, false, new SettingValue(4, 64 * 1024 - 1));
-// Ack
-parser.readFrame(true);
-Assert.assertEquals("0-Settings-Ack\n", output.getTrace());
-output.clearTrace();
 
-// Stream remainder of stream 3 body
+// Settings ack and stream 3 body are written from different threads.
+// Order depends on server side timing. Handle both possibilities.
 parser.readFrame(true);
-Assert.assertEquals(
-"3-Body-4096\n" +
-"3-EndOfStream\n", output.getTrace());
-output.clearTrace();
+String trace = output.getTrace();
+String settingsAck = "0-Settings-Ack\n";
+String endOfStreamThree = "3-Body-4096\n3-EndOfStream\n";
+
+if (settingsAck.equals(trace)) {
+// Ack the end of stream 3
+output.clearTrace();
+parser.readFrame(true);
+Assert.assertEquals(endOfStreamThree, output.getTrace());
+} else {
+// End of stream 3 thenack
+Assert.assertEquals(endOfStreamThree, output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
+Assert.assertEquals(settingsAck, output.getTrace());
+}
+output.clearTrace();
 }
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58284] StandardSession attempts to silently write NonSerializable objects

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58284

--- Comment #14 from Andrew Shore  ---
Fantastic. Thanks!

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-8-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/153

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1704332
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in ASF Buildbot on tomcat-trunk

2015-09-21 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/325

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1704341
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Bug #57505 - Integration tests for JspC

2015-09-21 Thread Dinesh Joshi 
Hi all,

I'm looking to contribute to Tomcat development. I am planning to take a crack 
at this bug - https://bz.apache.org/bugzilla/show_bug.cgi?id=57505 Anybody 
working on it? Can someone give me some pointers on how I should proceed with 
it?

Thanks.

Dinesh

svn commit: r1704388 - in /tomcat/trunk/java/org/apache/tomcat/util/net: LocalStrings.properties SSLHostConfig.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 19:11:38 2015
New Revision: 1704388

URL: http://svn.apache.org/viewvc?rev=1704388&view=rev
Log:
Add missing error handling

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1704388&r1=1704387&r2=1704388&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon 
Sep 21 19:11:38 2015
@@ -118,5 +118,6 @@ socket.apr.write.error=Unexpected error
 socket.apr.closed=The socket [{0}] associated with this connection has been 
closed.
 
 sslHostConfig.certificateVerificationInvalid=The certificate verification 
value [{0}] is not recognised
+sslHostConfig.certificate.notype=Multiple certificates were specified and at 
least one is missing the required attribute type
 sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named 
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used 
with a connector of type [{3}]
 sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of 
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1704388&r1=1704387&r2=1704388&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon Sep 21 
19:11:38 2015
@@ -169,6 +169,7 @@ public class SSLHostConfig {
 certificates.iterator().next().getType() == 
SSLHostConfigCertificate.Type.UNDEFINED ||
 certificate.getType() == 
SSLHostConfigCertificate.Type.UNDEFINED) {
 // Invalid config
+throw new 
IllegalArgumentException(sm.getString("sslHostConfig.certificate.notype"));
 }
 
 certificates.add(certificate);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58244] two way SSL loses client certificate after a few requests

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58244

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #3 from Christopher Schultz  ---
If you use Wireshark or a similar packet-capture rig, can you see
whether the browser is changing the way it sends its data?

With Wireshark, you can install the server's private key and then you
can read all the encrypted traffic. Wireshark will disassemble all the
packets and even give you rich information at the protocol-level about
what's in there. You can probably tell the difference between what
Firefox or Chrome sends to the server both before and after the "loss"
of the certificate.

I'd like to confirm whether the browser or Tomcat is causing this problem... my
suspicion is that it's the browser.

-- 
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 58433] RemoteIpValve not activated on redirect from mapping

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58433

--- Comment #3 from Fred Simon  ---
(In reply to Remy Maucherat from comment #2)
> Not convinced personally, this adds overhead.

I totally agree.
The main issue is proxyName and proxyPort are way too limiting. RemoteIpValve
and RemoteIpFilter are doing the job correctly.
Frankly I think that proxy configuration should be feature of the Adapter.
There are way too many ways to change the protocol, server name, port that are
activated at different stages in the pipeline stack.
When Tomcat is behind a load balancer, all requests should be modified
correctly.

-- 
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: r1704428 - /tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

2015-09-21 Thread markt 
Author: markt
Date: Mon Sep 21 21:36:45 2015
New Revision: 1704428

URL: http://svn.apache.org/viewvc?rev=1704428&view=rev
Log:
Add some basic Servlet 3.0 async support to HTTP/2.
The async examples (excluding the stock ticker) work with this commit.
I'm looking into why the stock ticker example doesn't work.
Async timeouts are also TODO.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1704428&r1=1704427&r2=1704428&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Sep 21 
21:36:45 2015
@@ -25,6 +25,9 @@ import javax.servlet.http.HttpUpgradeHan
 import org.apache.coyote.AbstractProcessor;
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Adapter;
+import org.apache.coyote.AsyncContextCallback;
+import org.apache.coyote.AsyncStateMachine;
+import org.apache.coyote.ContainerThreadMarker;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
@@ -39,6 +42,7 @@ public class StreamProcessor extends Abs
 private static final StringManager sm = 
StringManager.getManager(StreamProcessor.class);
 
 private final Stream stream;
+private final AsyncStateMachine asyncStateMachine;
 
 private volatile SSLSupport sslSupport;
 
@@ -46,6 +50,7 @@ public class StreamProcessor extends Abs
 public StreamProcessor(Stream stream, Adapter adapter, 
SocketWrapperBase socketWrapper) {
 super(stream.getCoyoteRequest(), stream.getCoyoteResponse());
 this.stream = stream;
+asyncStateMachine = new AsyncStateMachine(this);
 setAdapter(adapter);
 setSocketWrapper(socketWrapper);
 }
@@ -53,13 +58,28 @@ public class StreamProcessor extends Abs
 
 @Override
 public void run() {
+// HTTP/2 equivalent of AbstractConnectionHandler#process()
+ContainerThreadMarker.set();
+SocketState state = SocketState.CLOSED;
 try {
-adapter.service(request, response);
-// Ensure the response is complete
-response.action(ActionCode.CLOSE, null);
+do {
+if (asyncStateMachine.isAsync()) {
+adapter.asyncDispatch(request, response, 
SocketStatus.OPEN_READ);
+} else {
+adapter.service(request, response);
+}
+
+if (asyncStateMachine.isAsync()) {
+state = asyncStateMachine.asyncPostProcess();
+} else {
+response.action(ActionCode.CLOSE, null);
+}
+} while (state == SocketState.ASYNC_END);
 } catch (Exception e) {
 // TODO
 e.printStackTrace();
+} finally {
+ContainerThreadMarker.clear();
 }
 }
 
@@ -95,6 +115,69 @@ public class StreamProcessor extends Abs
 break;
 }
 
+// Servlet 3.0 asynchronous support
+case ASYNC_START: {
+asyncStateMachine.asyncStart((AsyncContextCallback) param);
+break;
+}
+case ASYNC_COMPLETE: {
+if (asyncStateMachine.asyncComplete()) {
+socketWrapper.getEndpoint().getExecutor().execute(this);
+}
+break;
+}
+case ASYNC_DISPATCH: {
+if (asyncStateMachine.asyncDispatch()) {
+socketWrapper.getEndpoint().getExecutor().execute(this);
+}
+break;
+}
+case ASYNC_DISPATCHED: {
+asyncStateMachine.asyncDispatched();
+break;
+}
+case ASYNC_ERROR: {
+asyncStateMachine.asyncError();
+break;
+}
+case ASYNC_IS_ASYNC: {
+((AtomicBoolean) param).set(asyncStateMachine.isAsync());
+break;
+}
+case ASYNC_IS_COMPLETING: {
+((AtomicBoolean) param).set(asyncStateMachine.isCompleting());
+break;
+}
+case ASYNC_IS_DISPATCHING: {
+((AtomicBoolean) 
param).set(asyncStateMachine.isAsyncDispatching());
+break;
+}
+case ASYNC_IS_ERROR: {
+((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
+break;
+}
+case ASYNC_IS_STARTED: {
+((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarted());
+break;
+}
+case ASYNC_IS_TIMINGOUT: {
+((AtomicBoolean) param).set(asyncStateMachine.isAsyncTimingOut());
+break;
+}
+case ASYNC_RUN: {
+asyncSta

[Bug 58434] Make Fails Against LibreSSL

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58434

--- Comment #1 from Christopher Schultz  ---
For the record, I don't think LibreSSL is currently supported.

That said, I for one think LibreSSL should *definitely* be supported.

Can you give us some details about the build environment? Specifically, what
version of LibreSSL?

-- 
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 58434] Make Fails Against LibreSSL

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58434

--- Comment #2 from Christopher Schultz  ---
This looks like an easy enough bug to fix. I'd like to know what we're losing
by not setting that particular check. Does anyone know off the top of their
head what that flag does?

If not, I'll research it.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58434] Make Fails Against LibreSSL

2015-09-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58434

--- Comment #3 from Antonio Malcolm  ---
Thanks for looking into this, Christopher.

I'm building this on Void GNU/Linux x86_64, with LibreSSL version 2.2.3
I'm building this against APR version 1.5.2 (which built without issue and
works as expected with HTTPD).

Here are my configure options for tomcat-native:

./configure --prefix=/usr/local/server/lib/tomcat-native/v1.1.33 \
--sysconfdir=/etc/local/server/lib/tomcat-native/v1.1.33 \
--localstatedir=/var/local/server/lib/tomcat-native/v1.1.33/state/local \
--sharedstatedir=/var/local/server/lib/tomcat-native/v1.1.33/state/shared \
--with-apr=/usr/local/server/lib/apr/v1.5.2 \
--with-java-home=$JAVA_HOME \
--with-ssl=/usr

I also tried --with-ssl=/usr/include, but the end result was the same (not that
I thought it would make a difference- Apache products have been historically
quite good at finding dependencies).

Thanks again!

-- 
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