[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-11-10 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

--- Comment #20 from Huxing Zhang  ---
I just renamed  DirContextURLStreamHandlerFactory to
TomcatURLStreamHandlerFactory, which might not be good for backward
compatibility.
I will restore DirContextURLStreamHandlerFactory in my next patch.

-- 
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: r1713285 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/

2015-11-10 Thread Mark Thomas 
On 08/11/2015 20:05, ma...@apache.org wrote:
> Author: markt
> Date: Sun Nov  8 20:05:27 2015
> New Revision: 1713285
> 
> URL: http://svn.apache.org/viewvc?rev=1713285&view=rev
> Log:
> Add the ability to validate client provided session IDs and implement basic 
> validation for the Standard session ID generator.

I've been thinking about this and I'm not convinced this is a good idea.
There are multiple issues:
- jvmRoute isn't validated
- session IDs are only validated using the current context's settings

Given that the whole point of re-using a client provided session is to
have a common ID across multiple webapps, validating a session ID with
the current context's rules doesn't make a whole lot of sense.

Remy pointed me to a different solution he deployed in JBoss off-list.
It looks much more promising.

I intend to revert this and use Remy's approach.

Mark


> 
> Added:
> 
> tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
>(with props)
> Modified:
> tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
> tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
> tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
> tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
> 
> Modified: tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java?rev=1713285&r1=1713284&r2=1713285&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java Sun Nov  8 
> 20:05:27 2015
> @@ -56,4 +56,17 @@ public interface SessionIdGenerator {
>   */
>  public String generateSessionId(String route);
>  
> +/**
> + * Determine, based on implementation specific rules which may be as 
> strict
> + * or as relaxed as the implementor wishes, if the provided session ID is
> + * valid. This may be used when generating sessions with user provided
> + * session IDs to ensure that they are suitable or if a new ID needs to 
> be
> + * generated.
> + *
> + * @param sessionId The proposed session ID to test
> + *
> + * @return {@code true} if the proposed session ID is acceptable, 
> otherwise
> + * {@code false}
> + */
> +public boolean validateSessionId(String sessionId);
>  }
> 
> Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1713285&r1=1713284&r2=1713285&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Sun Nov  8 
> 20:05:27 2015
> @@ -627,7 +627,7 @@ public abstract class ManagerBase extend
>  session.setCreationTime(System.currentTimeMillis());
>  session.setMaxInactiveInterval(this.maxInactiveInterval);
>  String id = sessionId;
> -if (id == null) {
> +if (id == null || !sessionIdGenerator.validateSessionId(id)) {
>  id = generateSessionId();
>  }
>  session.setId(id);
> 
> Modified: 
> tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1713285&r1=1713284&r2=1713285&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
> Sun Nov  8 20:05:27 2015
> @@ -273,6 +273,18 @@ public abstract class SessionIdGenerator
>  }
>  
>  
> +/**
> + * {@inheritDoc}
> + * 
> + * The base implementation performs no validation and treats all proposed
> + * session IDs as valid.
> + */
> +@Override
> +public boolean validateSessionId(String sessionId) {
> +return true;
> +}
> +
> +
>  @Override
>  protected void initInternal() throws LifecycleException {
>  // NO-OP
> 
> Modified: 
> tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java?rev=1713285&r1=1713284&r2=1713285&view=diff
> ==
> --- 
> tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java 
> (original)
> +++ 
> tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java 
> Sun Nov  8 20:05:27 2015
> @@ -16,6 +16,8 @@
>

svn commit: r1713612 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 11:10:44 2015
New Revision: 1713612

URL: http://svn.apache.org/viewvc?rev=1713612&view=rev
Log:
Revert 1713285
A better solution is available

Removed:

tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Modified:
tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java

Modified: tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java?rev=1713612&r1=1713611&r2=1713612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java Tue Nov 10 
11:10:44 2015
@@ -55,18 +55,4 @@ public interface SessionIdGenerator {
  * @param route   node identifier to include in generated id
  */
 public String generateSessionId(String route);
-
-/**
- * Determine, based on implementation specific rules which may be as strict
- * or as relaxed as the implementor wishes, if the provided session ID is
- * valid. This may be used when generating sessions with user provided
- * session IDs to ensure that they are suitable or if a new ID needs to be
- * generated.
- *
- * @param sessionId The proposed session ID to test
- *
- * @return {@code true} if the proposed session ID is acceptable, otherwise
- * {@code false}
- */
-public boolean validateSessionId(String sessionId);
 }

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1713612&r1=1713611&r2=1713612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov 10 
11:10:44 2015
@@ -627,7 +627,7 @@ public abstract class ManagerBase extend
 session.setCreationTime(System.currentTimeMillis());
 session.setMaxInactiveInterval(this.maxInactiveInterval);
 String id = sessionId;
-if (id == null || !sessionIdGenerator.validateSessionId(id)) {
+if (id == null) {
 id = generateSessionId();
 }
 session.setId(id);

Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1713612&r1=1713611&r2=1713612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java Tue 
Nov 10 11:10:44 2015
@@ -273,18 +273,6 @@ public abstract class SessionIdGenerator
 }
 
 
-/**
- * {@inheritDoc}
- * 
- * The base implementation performs no validation and treats all proposed
- * session IDs as valid.
- */
-@Override
-public boolean validateSessionId(String sessionId) {
-return true;
-}
-
-
 @Override
 protected void initInternal() throws LifecycleException {
 // NO-OP

Modified: 
tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java?rev=1713612&r1=1713611&r2=1713612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java 
Tue Nov 10 11:10:44 2015
@@ -16,8 +16,6 @@
  */
 package org.apache.catalina.util;
 
-import org.apache.tomcat.util.buf.HexUtils;
-
 public class StandardSessionIdGenerator extends SessionIdGeneratorBase {
 
 @Override
@@ -62,40 +60,4 @@ public class StandardSessionIdGenerator
 
 return buffer.toString();
 }
-
-/**
- * {@inheritDoc}
- * 
- * This implementation performs the following checks:
- * 
- * The characters up to the first period (if any) are valid hex
- * digits
- * There are at least enough hex digits to represent the specified
- * session ID length
- * Anything after the first period is not validated since that is
- * assumed to be a JVM route and we can't easily determine valid
- * values
- * 
- */
-@Override
-public boolean validateSessionId(String sessionId) {
-if (session

svn commit: r1713613 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/ webapps/docs/

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 11:14:36 2015
New Revision: 1713613

URL: http://svn.apache.org/viewvc?rev=1713613&view=rev
Log:
Revert 1713287
A better solution is available

Removed:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/SessionIdGenerator.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 10 11:14:36 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,1649973,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,1657
 
609,1657682,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,1
 
37,149,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,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896

svn commit: r1713614 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/ webapps/docs/

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 11:15:54 2015
New Revision: 1713614

URL: http://svn.apache.org/viewvc?rev=1713614&view=rev
Log:
Revert 1713288
A better solution is available

Removed:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionIdGenerator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 10 11:15:54 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287
-/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

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-11-10 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

--- Comment #21 from Huxing Zhang  ---
Created attachment 33268
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33268&action=edit
Patch to restore DirContextUrlStreamHandlerFactory

-- 
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: r1713618 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/org/apache/catalina/core/

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 11:55:45 2015
New Revision: 1713618

URL: http://svn.apache.org/viewvc?rev=1713618&view=rev
Log:
Add a new Context option, enabled by default, that enables an additional check 
that a client provided session ID is in use in at least one other web 
application before allowing it to be used as the ID for a new session in the 
current web application.

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/test/org/apache/catalina/core/TesterContext.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1713618&r1=1713617&r2=1713618&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Nov 10 11:55:45 2015
@@ -1680,4 +1680,32 @@ public interface Context extends Contain
  * for this Context.
  */
 public CookieProcessor getCookieProcessor();
+
+/**
+ * When a client provides the ID for a new session, should that ID be
+ * validated? The only use case for using a client provided session ID is 
to
+ * have a common session ID across multiple web applications. Therefore,
+ * any client provided session ID should already exist in another web
+ * application. If this check is enabled, the client provided session ID
+ * will only be used if the session ID exists in at least one other web
+ * application for the current host. Note that the following additional
+ * tests are always applied, irrespective of this setting:
+ * 
+ * The session ID is provided by a cookie
+ * The session cookie has a path of {@code /}
+ * 
+ *
+ * @param validateClientProvidedNewSessionId
+ *  {@code true} if validation should be applied
+ */
+public void setValidateClientProvidedNewSessionId(boolean 
validateClientProvidedNewSessionId);
+
+/**
+ * Will client provided session IDs be validated (see {@link
+ * #setValidateClientProvidedNewSessionId(boolean)}) before use?
+ *
+ * @return {@code true} if validation will be applied. Otherwise, {@code
+ * false}
+ */
+public boolean getValidateClientProvidedNewSessionId();
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1713618&r1=1713617&r2=1713618&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov 10 
11:55:45 2015
@@ -65,6 +65,7 @@ import javax.servlet.http.HttpUpgradeHan
 import javax.servlet.http.Part;
 import javax.servlet.http.PushBuilder;
 
+import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
@@ -2827,16 +2828,49 @@ public class Request implements HttpServ
 sm.getString("coyoteRequest.sessionCreateCommitted"));
 }
 
-// Attempt to reuse session id if one was submitted in a cookie
-// Do not reuse the session id if it is from a URL, to prevent possible
-// phishing attacks
-// Use the SSL session ID if one is present.
-if (("/".equals(context.getSessionCookiePath())
-&& isRequestedSessionIdFromCookie()) || requestedSessionSSL ) {
-session = manager.createSession(getRequestedSessionId());
+// Re-use session IDs provided by the client in very limited
+// circumstances.
+String sessionId = getRequestedSessionId();
+if (requestedSessionSSL) {
+// If the session ID has been obtained from the SSL handshake then
+// use it.
+} else if (("/".equals(context.getSessionCookiePath())
+&& isRequestedSessionIdFromCookie())) {
+/* This is the common(ish) use case: using the same session ID with
+ * multiple web applications on the same host. Typically this is
+ * used by Portlet implementations. It only works if sessions are
+ * tracked via cookies. The cookie must have a path of "/" else it
+ * won't be provided to for requests to all web applications.
+ *
+ * Any session ID provided by the client should be for a session
+ * that already exists somewhere on the host. Check if the context
+ * is configured for this to be confirmed.
+ */
+if (context.getValida

svn commit: r1713621 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/org/apache/catal

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 11:57:23 2015
New Revision: 1713621

URL: http://svn.apache.org/viewvc?rev=1713621&view=rev
Log:
Add a new Context option, enabled by default, that enables an additional check 
that a client provided session ID is in use in at least one other web 
application before allowing it to be used as the ID for a new session in the 
current web application.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 10 11:57:23 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,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,1657
 
609,1657682,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,1
 
37,149,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,16845

svn commit: r1713623 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/org/apache/catal

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 12:03:57 2015
New Revision: 1713623

URL: http://svn.apache.org/viewvc?rev=1713623&view=rev
Log:
Add a new Context option, enabled by default, that enables an additional check 
that a client provided session ID is in use in at least one other web 
application before allowing it to be used as the ID for a new session in the 
current web application.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 10 12:03: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,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613
-/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,13

[jira] [Created] (MTOMCAT-301) Dummy Test Case

2015-11-10 Thread jyotsana mahajan (JIRA) 
jyotsana mahajan created MTOMCAT-301:


 Summary: Dummy Test Case
 Key: MTOMCAT-301
 URL: https://issues.apache.org/jira/browse/MTOMCAT-301
 Project: Apache Tomcat Maven Plugin
  Issue Type: Test
Affects Versions: 2.3
Reporter: jyotsana mahajan


Dummy Sample Test Case 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[jira] [Deleted] (MTOMCAT-301) Dummy Test Case

2015-11-10 Thread Mark Thomas (JIRA) 

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-301?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Mark Thomas deleted MTOMCAT-301:



> Dummy Test Case
> ---
>
> Key: MTOMCAT-301
> URL: https://issues.apache.org/jira/browse/MTOMCAT-301
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Test
>Reporter: jyotsana mahajan
>  Labels: test
>
> Dummy Sample Test Case 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

svn commit: r1713648 - in /tomcat/trunk/java/org/apache/tomcat/util: http/CookieProcessor.java log/SystemLogHandler.java net/URL.java

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 14:38:37 2015
New Revision: 1713648

URL: http://svn.apache.org/viewvc?rev=1713648&view=rev
Log:
Javadoc fixes

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/CookieProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/CookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/CookieProcessor.java?rev=1713648&r1=1713647&r2=1713648&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/CookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/CookieProcessor.java Tue Nov 
10 14:38:37 2015
@@ -45,7 +45,7 @@ public interface CookieProcessor {
  * Obtain the character set that will be used when converting between bytes
  * and characters when parsing and/or generating HTTP headers for cookies.
  *
- * @return The character set used for byte<->character conversions
+ * @return The character set used for byte<->character conversions
  */
 Charset getCharset();
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java?rev=1713648&r1=1713647&r2=1713648&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java Tue Nov 
10 14:38:37 2015
@@ -58,7 +58,7 @@ public class SystemLogHandler extends Pr
 
 
 /**
- * Thread <-> CaptureLog associations.
+ * Thread <-> CaptureLog associations.
  */
 private static final ThreadLocal> logs = new 
ThreadLocal<>();
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1713648&r1=1713647&r2=1713648&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Tue Nov 10 14:38:37 
2015
@@ -651,7 +651,8 @@ public final class URL implements Serial
  *
  * @param c The character to test
  *
- * @return {@code true} if a the character is allowed, otherwise {@false}
+ * @return {@code true} if a the character is allowed, otherwise {code
+ * @false}
  */
 private static boolean isSchemeChar(char c) {
 return Character.isLetterOrDigit(c) ||
@@ -664,7 +665,7 @@ public final class URL implements Serial
  *
  * @param uri The URI to test
  *
- * @return {@code true} if a scheme is present, otherwise {@false}
+ * @return {@code true} if a scheme is present, otherwise {code @false}
  */
 public static boolean hasScheme(CharSequence uri) {
 int len = uri.length();



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

svn commit: r1713721 - in /tomcat/native/trunk/xdocs: index.xml news/2015.xml

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 19:48:30 2015
New Revision: 1713721

URL: http://svn.apache.org/viewvc?rev=1713721&view=rev
Log:
Update the news with the 1.2.2 release

Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/news/2015.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1713721&r1=1713720&r2=1713721&view=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Tue Nov 10 19:48:30 2015
@@ -64,15 +64,16 @@ manual is described in more detail below
 
 
 
-28 Oct 2015 - TC-Native-1.2.0 
released
-The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.2.0 Stable.
-
+9 Nov 2015 - TC-Native-1.2.2 
released
+The Apache Tomcat team is proud to announce the immediate availability of
+Tomcat Native 1.2.2 Stable.
 
- The sources and the binaries for selected platforms are available from the
- Download page.
+The sources and the binaries for selected platforms are available from the
+Download page.
 
 
- Please see the ChangeLog for a 
full list of changes.
+Please see the ChangeLog for a full
+list of changes.
 
 
 

Modified: tomcat/native/trunk/xdocs/news/2015.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2015.xml?rev=1713721&r1=1713720&r2=1713721&view=diff
==
--- tomcat/native/trunk/xdocs/news/2015.xml (original)
+++ tomcat/native/trunk/xdocs/news/2015.xml Tue Nov 10 19:48:30 2015
@@ -29,11 +29,20 @@
 
 
 
+ 
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.2. This is a bug fix release and includes Windows
+  binaries built with OpenSSL 1.0.2d and APR 1.5.1.
+  
+ 
  
   The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.0.
+  of Tomcat Native 1.2.0. This is the first release of the 1.2.x series that
+  provides ALPN, SNI and OpenSSl BIO support. It includes Windows binaries 
built
+  with OpenSSL 1.0.2d and APR 1.5.1.
   
-
+ 
+ 
   The Apache Tomcat team is proud to announce the immediate availability
   of Tomcat Native 1.1.33. This is a bug fixing release and includes Windows
   binaries built with OpenSSL 1.0.1m and APR 1.5.1.



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

svn commit: r1713722 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2015.html

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 19:50:33 2015
New Revision: 1713722

URL: http://svn.apache.org/viewvc?rev=1713722&view=rev
Log:
Update docs for 1.2.2 release

Modified:
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/native-doc/news/2015.html

Modified: tomcat/site/trunk/docs/native-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1713722&r1=1713721&r2=1713722&view=diff
==
--- tomcat/site/trunk/docs/native-doc/index.html (original)
+++ tomcat/site/trunk/docs/native-doc/index.html Tue Nov 10 19:50:33 2015
@@ -32,15 +32,16 @@ manual is described in more detail below
 Headlines
 
 
-28 Oct 2015 - TC-Native-1.2.0 
released
-The Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.2.0 Stable.
-
+9 Nov 2015 - TC-Native-1.2.2 
released
+The Apache Tomcat team is proud to announce the immediate availability of
+Tomcat Native 1.2.2 Stable.
 
- The sources and the binaries for selected platforms are available from the
- Download page.
+The sources and the binaries for selected platforms are available from the
+Download page.
 
 
- Please see the ChangeLog for a 
full list of changes.
+Please see the ChangeLog for a full
+list of changes.
 
 
 
@@ -186,4 +187,4 @@ INFO: Initializing Coyote HTTP/1.1 on ht
 
 
 Copyright © 2008-2015, The Apache Software Foundation
-  
+  
\ No newline at end of file

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1713722&r1=1713721&r2=1713722&view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Tue Nov 10 
19:50:33 2015
@@ -3,7 +3,41 @@
   
   This is the Changelog for Tomcat Native 1.2.
   
-Changes between 1.1 and 
1.2.0
+Changes in 1.2.2
+  
+
+  Fix broken debug and maintainer mode build. (rjung)
+
+
+  Forward port additional fixes to the OpenSSL I/O to align it with
+  non-OpenSSL I/O. (markt)
+
+  
+Changes in 1.2.1
+  
+
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=58566";>58566: 
Enable Tomcat Native 1.2.x to work with Tomcat releases
+  that do not have the necessary Java code to support SNI. (markt)
+
+
+  Minor rework of "buildconf" script. (rjung)
+
+
+  Fix APR dependency version expression in RPM spec file. (rjung)
+
+
+  Fix major library version number in Windows build files, RPM spec file
+  and build description. (rjung)
+
+
+  Remove files "KEYS" and "download_deps.sh" from Windows (zip)
+  source distribution. (rjung)
+
+
+  Fix "unused variable" compiler warning. (rjung)
+
+  
+Changes in 1.2.0
   
 
   Add support for TLS extension ALPN. (markt)
@@ -13,6 +47,9 @@
   (markt)
 
 
+  Add support for OpenSSL BIO. (jfclere)
+
+
   Support wakeable pollsets and add Poll.interrupt() API.
   (mturk)
 

Modified: tomcat/site/trunk/docs/native-doc/news/2015.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2015.html?rev=1713722&r1=1713721&r2=1713722&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2015.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2015.html Tue Nov 10 19:50:33 2015
@@ -1,10 +1,19 @@
 
 The Apache Tomcat Native - News - 2015 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews201520142013201220112010200920082015 News and Status2015 News & Status
+ 9 Nov 2015 - TC-Native-1.2.2 
released
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.2. This is a bug fix release and includes Windows
+  binaries built with OpenSSL 1.0.2d and APR 1.5.1.
+  
+ 
  28 Oct 2015 - TC-Native-1.2.0 
released
   The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.0.
+  of Tomcat Native 1.2.0. This is the first release of the 1.2.x series that
+  provides ALPN, SNI and OpenSSl BIO support. It includes Windows binaries 
built
+  with OpenSSL 1.0.2d and APR 1.5.1.
   
-23 March 2015 - 
TC-Native-1.1.33 released
+ 
+ 23 March 2015 - TC-Native-1.1.33 
released
   The Apache Tomcat team is proud to announce the immediate availability
   of Tomcat Native 1.1.33. This is a bug fixing release and includes Windows
   binaries built with OpenSSL 1.0.1m and APR 1.5.1.



-
T

svn commit: r1713723 - /tomcat/site/trunk/README.txt

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 19:50:48 2015
New Revision: 1713723

URL: http://svn.apache.org/viewvc?rev=1713723&view=rev
Log:
Correct path

Modified:
tomcat/site/trunk/README.txt

Modified: tomcat/site/trunk/README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1713723&r1=1713722&r2=1713723&view=diff
==
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Tue Nov 10 19:50:48 2015
@@ -152,7 +152,7 @@ A)
To switch to current development versions:
 
   svn switch "^/tomcat/jk/trunk/xdocs" jk-xdocs
-  svn switch "^/tomcat/native/xdocs" native-xdocs
+  svn switch "^/tomcat/native/trunk/xdocs" native-xdocs
 
To switch to tags for released versions:
 



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

svn commit: r1713724 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 19:56:51 2015
New Revision: 1713724

URL: http://svn.apache.org/viewvc?rev=1713724&view=rev
Log:
Update site for 1.2.2 release
List 1.2.2 above 1.1.33 since it should be a drop in replacement

Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/download-native.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1713724&r1=1713723&r2=1713724&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Tue Nov 10 19:56:51 2015
@@ -250,7 +250,7 @@
 
   
 
-Tomcat Native Connector - 1.1
+Tomcat Native Connector - 1.2
 
 
 For more information concerning Tomcat Native, see the
@@ -268,14 +268,14 @@
 
 
   
-
-Native 1.1.33 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
+
+Native 1.2.2 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-src.tar.gz.sha1";>SHA1]
   
 
 
@@ -284,14 +284,14 @@
 
 
   
-
-Native 1.1.33 Source Release zip (e.g. Windows)
+
+Native 1.2.2 Source Release zip (e.g. Windows)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/source/tomcat-native-1.2.2-win32-src.zip.sha1";>SHA1]
   
 
 
@@ -306,7 +306,7 @@
 
 You can find binaries release too.
 You may download them from
-  HERE
+  HERE
 
 
 
@@ -325,10 +325,9 @@
   protocol (https://bz.apache.org/bugzilla/show_bug.cgi?id=45392";>45392).
   
   
-Each archive contains tcnative-1.dll for 32-bit,
-  64-bit (x64) and Intel Itanium 64-bit (i64) CPU architectures.
-  You have to use the DLL that matches CPU architecture of JVM that
-  you use to run Tomcat.
+Each archive contains tcnative-1.dll for 32-bit
+  and 64-bit (x64) CPU architectures. You have to use the DLL that
+  matches CPU architecture of JVM that you use to run Tomcat.
 
 
 
@@ -336,14 +335,14 @@
   
 
 
-
-  Native 1.1.33 Windows Binaries zip (recommended)
+
+  Native 1.2.2 Windows Binaries zip (recommended)
   
 
 
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.asc";>PGP],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.md5";>MD5],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.sha1";>SHA1]
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.asc";>PGP],
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.2/binaries/tomcat-native-1.2.2-win32-bin.zip.md5";>MD5],
+  [https://www.apache.org/dist/tomcat/tomcat-c

[ANN] Apache Tomcat Native 1.2.2 released

2015-11-10 Thread Mark Thomas 
The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.2.2 stable.

The key features of this release are:
- ALPN support
- SNI support
- Add access methods for OpenSSL BIO
- Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d
- Itanium binaries no longer provided for Windows

This release is primarily to support the development of omcat 9.0.x but
it is backwards compatible with 1.1.x and can be used with any current
Tomcat version.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/native-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-native.cgi

The Apache Tomcat Native Library provides portable API for features
not found in contemporary JDK's. It uses Apache Portable Runtime as
operating system abstraction layer and OpenSSL for SSL networking and
allows optimal performance in production environments.


Thank you,
-- 
The Apache Tomcat Team

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

svn commit: r1713725 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 20:00:24 2015
New Revision: 1713725

URL: http://svn.apache.org/viewvc?rev=1713725&view=rev
Log:
Fix version number missed in previous commit

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1713725&r1=1713724&r2=1713725&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Nov 10 20:00:24 2015
@@ -250,7 +250,7 @@ Tomcat Native. The notable changes since
 
 
 Download |
-ChangeLog for 1.2.0
+ChangeLog for 1.2.2
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1713725&r1=1713724&r2=1713725&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Nov 10 20:00:24 2015
@@ -51,7 +51,7 @@ Tomcat Native. The notable changes since
 
 
 Download |
-ChangeLog for 1.2.0
+ChangeLog for 1.2.2
 
 
 



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

svn commit: r1713726 - /tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 20:09:26 2015
New Revision: 1713726

URL: http://svn.apache.org/viewvc?rev=1713726&view=rev
Log:
The RFC6265 CookieProcessor is no longer a work in progress.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml?rev=1713726&r1=1713725&r2=1713726&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/cookie-processor.xml Tue Nov 10 
20:09:26 2015
@@ -46,31 +46,20 @@
   implementation will be created automatically.
 
   Note: CookieProcessor is a new
-  configuration element, introduced in Tomcat 8.0.15.
-  This is work in progress.
-  The goal is to review the current implementation of HTTP Cookie headers
-  processing in Tomcat to provide better compliance with RFC6265 specification.
-  The ideas are summarized on a
-  https://wiki.apache.org/tomcat/Cookies";>Wiki page and discussed
-  on http://tomcat.apache.org/lists.html";>mailing lists.
-  Notable points:
-
+  configuration element, introduced in Tomcat 8.0.15.
   
-CookieProcessor element allows to configure cookie
-parsing separately in each web application, or globally in the default
+The CookieProcessor element allows different cookie
+parsing configuration in each web application, or globally in the default
 conf/context.xml file. The legacy cookie parsing algorithm
 supported only limited global configuration via several
 system properties. Those
 system properties are still supported, but are going to be deprecated in
 favor of this new configuration element.
 
-The new RFC6265-compliant (work in progress) implementation
-is a stand-in replacement for the original legacy one. Until the new code
-is stabilized, the legacy implementation remains the default one.
-You can select the implementation by setting className
-attribute on CookieProcessor element.
-This is work in progress. Configuration attributes may change in a
-future release.
+The new RFC6265-compliant implementation is a drop-in replacement for
+the original legacy one. The legacy implementation remains the default. You
+can select the implementation by setting className attribute
+on CookieProcessor element.
   
 
 



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

svn commit: r1713727 - /tomcat/trunk/conf/server.xml

2015-11-10 Thread markt 
Author: markt
Date: Tue Nov 10 20:19:31 2015
New Revision: 1713727

URL: http://svn.apache.org/viewvc?rev=1713727&view=rev
Log:
Encourage use of the full cert chain rather than just the server cert

Modified:
tomcat/trunk/conf/server.xml

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=1713727&r1=1713726&r2=1713727&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Tue Nov 10 20:19:31 2015
@@ -100,7 +100,7 @@
 
 
 
 
 



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

9.0.x, HTTP/2, Windows

2015-11-10 Thread Mark Thomas 
Just a quick update on the issues Violeta reported with 9.0.x, HTTP/2
and Windows.

I can repeat the Chrome + WebSocket == failure result

For ( Chrome | FF ) + stockticker, I see a long pause before any content
appears, then I get about 30 lines, then lines start appearing
individually as expected.

No idea on the WebSocket issue. Stockticker looks like some sort of
buffering / lack of flush issue.

Now 1.2.2 is out, looking at these is next on my list.

Mark

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

svn commit: r1713733 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/up

2015-11-10 Thread remm 
Author: remm
Date: Tue Nov 10 21:46:22 2015
New Revision: 1713733

URL: http://svn.apache.org/viewvc?rev=1713733&view=rev
Log:
- Port instance manager support for upgrade handlers.
- Remove set context CL from websockets (since it is now done for all user 
calls).

Added:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/UpgradeToken.java   (with props)
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/tc8.0.x/trunk/res/checkstyle/org-import-control.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1713733&r1=1713732&r2=1713733&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue 
Nov 10 21:46:22 2015
@@ -80,8 +80,10 @@ import org.apache.catalina.core.AsyncCon
 import org.apache.catalina.mapper.MappingData;
 import org.apache.catalina.util.ParameterMap;
 import org.apache.coyote.ActionCode;
+import org.apache.coyote.UpgradeToken;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -1881,15 +1883,18 @@ public class Request
 @Override
 public  T upgrade(
 Class httpUpgradeHandlerClass) throws java.io.IOException, 
ServletException {
-
 T handler;
+InstanceManager instanceManager = null;
 try {
-handler = (T) 
getContext().getInstanceManager().newInstance(httpUpgradeHandlerClass);
+instanceManager = getContext().getInstanceManager();
+handler = (T) instanceManager.newInstance(httpUpgradeHandlerClass);
 } catch (InstantiationException | IllegalAccessException | 
InvocationTargetException | NamingException e) {
 throw new ServletException(e);
 }
+UpgradeToken upgradeToken = new UpgradeToken(handler,
+getContext().getLoader().getClassLoader(), instanceManager);
 
-coyoteRequest.action(ActionCode.UPGRADE, handler);
+coyoteRequest.action(ActionCode.UPGRADE, upgradeToken);
 
 // Output required by RFC2616. Protocol specific headers should have
 // already been set.

Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1713733&r1=1713732&r2=1713733&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Nov 
10 21:46:22 2015
@@ -19,8 +19,6 @@ package org.apache.coyote;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
-import javax.servlet.http.HttpUpgradeHandler;
-
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
@@ -214,7 +212,7 @@ public abstract class AbstractProcessor<
 public abstract SocketState upgradeDispatch(SocketStatus status) throws 
IOException;
 
 @Override
-public abstract HttpUpgradeHandler getHttpUpgradeHandler();
+public abstract UpgradeToken getUpgradeToken();
 
 
 /**

Modified: tomcat/tc8.0.x/tr

Re: 9.0.x, HTTP/2, Windows

2015-11-10 Thread Rémy Maucherat 
2015-11-10 22:34 GMT+01:00 Mark Thomas :

> Just a quick update on the issues Violeta reported with 9.0.x, HTTP/2
> and Windows.
>
> I can repeat the Chrome + WebSocket == failure result
>

What is the expected test result ? If using ALPN, chrome connects using
HTTP/2, which then has no way to upgrade to something else, including
websockets. Effectively, this means that websockets applications won't
work, but this looks normal to me (and it fails also on Linux).

>
> For ( Chrome | FF ) + stockticker, I see a long pause before any content
> appears, then I get about 30 lines, then lines start appearing
> individually as expected.
>

I didn't notice any issue on stockticker however (also on Linux).

>
> No idea on the WebSocket issue. Stockticker looks like some sort of
> buffering / lack of flush issue.
>
> Now 1.2.2 is out, looking at these is next on my list.
>
> Rémy

Re: 9.0.x, HTTP/2, Windows

2015-11-10 Thread Mark Thomas 
On 10/11/2015 21:54, Rémy Maucherat wrote:
> 2015-11-10 22:34 GMT+01:00 Mark Thomas :
> 
>> Just a quick update on the issues Violeta reported with 9.0.x, HTTP/2
>> and Windows.
>>
>> I can repeat the Chrome + WebSocket == failure result
>>
> 
> What is the expected test result ? If using ALPN, chrome connects using
> HTTP/2, which then has no way to upgrade to something else, including
> websockets. Effectively, this means that websockets applications won't
> work, but this looks normal to me (and it fails also on Linux).

Ah. That would explain it. We'd need to put WebSockets on a connector
without ALPN support then.

>> For ( Chrome | FF ) + stockticker, I see a long pause before any content
>> appears, then I get about 30 lines, then lines start appearing
>> individually as expected.
>>
> 
> I didn't notice any issue on stockticker however (also on Linux).

Yeah, it works on Linux. Not sure what is going on. May be a Windows
network issue. I'll need to fire up Wireshark to check exactly what is
happening when.

Thanks for the additional info.

Mark


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

Header value buffer size

2015-11-10 Thread Harshad Vaishampayan 
Hi,

While creating a web socket connection using WsWebSocketContainer, I
encountered a siguation where I had to add a header more than 5000 bytes.
This resulted in a BufferOverflowException.

On clecking, I found that the following line in WsWebSocketContainer.java
ByteBuffer result = ByteBuffer.allocate(4 * 1024);
limits the header value to be 4KB. However, seems most servers (including
Tomcat) should support headers upto 8KB.

Hence, requesting the line be modified to allow 8KB buffers.
Thanks.

-- 
Harshad Vaishampayan

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.0.x) failed

2015-11-10 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 5 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 36 mins 27 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-2015-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-2015.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-2015-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-2015/bin/op
 enssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/t

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

2015-11-10 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

Violeta Georgieva  changed:

   What|Removed |Added

  Attachment #33230|0   |1
is obsolete||

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