svn commit: r1710072 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/LocalStrings.properties

2015-10-22 Thread violetagg 
Author: violetagg
Date: Thu Oct 22 18:20:24 2015
New Revision: 1710072

URL: http://svn.apache.org/viewvc?rev=1710072=rev
Log:
Merged revision 1710070 from tomcat/trunk:
Spotted problems in the text messages while debugging bug 58490

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 22 18:20:24 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
-/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

svn commit: r1710074 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 18:48:35 2015
New Revision: 1710074

URL: http://svn.apache.org/viewvc?rev=1710074=rev
Log:
Improve debug logging for connection settings (include the connection ID)

Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java?rev=1710074=1710073=1710074=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java Thu 
Oct 22 18:48:35 2015
@@ -28,6 +28,8 @@ public abstract class ConnectionSettings
 private final Log log = LogFactory.getLog(ConnectionSettingsBase.class);
 private final StringManager sm = 
StringManager.getManager(ConnectionSettingsBase.class);
 
+private final String connectionId;
+
 // Limits
 protected static final int MAX_WINDOW_SIZE = (1 << 31) - 1;
 protected static final int MIN_MAX_FRAME_SIZE = 1 << 14;
@@ -46,7 +48,8 @@ public abstract class ConnectionSettings
 protected Map pending = new HashMap<>();
 
 
-public ConnectionSettingsBase() {
+public ConnectionSettingsBase(String connectionId) {
+this.connectionId = connectionId;
 // Set up the defaults
 current.put(Setting.HEADER_TABLE_SIZE,  
Long.valueOf(DEFAULT_HEADER_TABLE_SIZE));
 current.put(Setting.ENABLE_PUSH,
Long.valueOf(DEFAULT_ENABLE_PUSH ? 1 : 0));
@@ -59,7 +62,8 @@ public abstract class ConnectionSettings
 
 public void set(Setting setting, long value) throws T {
 if (log.isDebugEnabled()) {
-log.debug(sm.getString("connectionSettings.debug", setting, 
Long.toString(value)));
+log.debug(sm.getString("connectionSettings.debug",
+connectionId, setting, Long.toString(value)));
 }
 
 switch(setting) {
@@ -83,7 +87,8 @@ public abstract class ConnectionSettings
 break;
 case UNKNOWN:
 // Unrecognised. Ignore it.
-log.warn(sm.getString("connectionSettings.unknown", setting, 
Long.toString(value)));
+log.warn(sm.getString("connectionSettings.unknown",
+connectionId, setting, Long.toString(value)));
 return;
 }
 
@@ -173,7 +178,7 @@ public abstract class ConnectionSettings
 // Need to put a sensible limit on this. Start with 16k (default is 4k)
 if (headerTableSize > (16 * 1024)) {
 String msg = 
sm.getString("connectionSettings.headerTableSizeLimit",
-Long.toString(headerTableSize));
+connectionId, Long.toString(headerTableSize));
 throwException(msg, Http2Error.PROTOCOL_ERROR);
 }
 }
@@ -184,7 +189,7 @@ public abstract class ConnectionSettings
 // will never be negative
 if (enablePush > 1) {
 String msg = sm.getString("connectionSettings.enablePushInvalid",
-Long.toString(enablePush));
+connectionId, Long.toString(enablePush));
 throwException(msg, Http2Error.PROTOCOL_ERROR);
 }
 }
@@ -193,7 +198,7 @@ public abstract class ConnectionSettings
 private void validateInitialWindowSize(long initialWindowSize) throws T {
 if (initialWindowSize > MAX_WINDOW_SIZE) {
 String msg = sm.getString("connectionSettings.windowSizeTooBig",
-Long.toString(initialWindowSize), 
Long.toString(MAX_WINDOW_SIZE));
+connectionId, Long.toString(initialWindowSize), 
Long.toString(MAX_WINDOW_SIZE));
 throwException(msg, Http2Error.FLOW_CONTROL_ERROR);
 }
 }
@@ -202,7 +207,7 @@ public abstract class ConnectionSettings
 private void validateMaxFrameSize(long maxFrameSize) throws T {
 if (maxFrameSize < MIN_MAX_FRAME_SIZE || maxFrameSize > 
MAX_MAX_FRAME_SIZE) {
 String msg = sm.getString("connectionSettings.maxFrameSizeInvalid",
-Long.toString(maxFrameSize), 
Integer.toString(MIN_MAX_FRAME_SIZE),
+connectionId, Long.toString(maxFrameSize), 
Integer.toString(MIN_MAX_FRAME_SIZE),
 Integer.toString(MAX_MAX_FRAME_SIZE));
 throwException(msg, Http2Error.PROTOCOL_ERROR);
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
URL:

[Bug 58518] New: SSL connection failed (Time out)

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

Bug ID: 58518
   Summary: SSL connection failed (Time out)
   Product: Tomcat 8
   Version: 8.0.28
  Hardware: PC
Status: NEW
  Severity: critical
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: han...@mitac.com.tw

After upgrade to Tomcat 8.0.28, the SSL connection failed (Time out).
When downgrade back to Tomcat 8.0.27, the SSL connection back to normal.
Any other variables are not changed (OS, JVM, configurations). Only change the
Tomcat version.

I guess this problem is caused by 8.0.28 changed the rule of reading/parsing
the path of configuration resources (keystore locations of SSL).
e.g. using the format of C:/ or / will cause reading configuration resources
fail in the Tomcat 8.0.28 but 8.0.27 works well.

Here is my server.xml of Connector part. Other parts of server.xml are the same
with  default version.



Note: This bug may related to Bug 56777
https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

-- 
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: [GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2015-10-22 Thread Violeta Georgieva 
2015-10-22 6:25 GMT+03:00 Bill Barker <billbar...@apache.org>:
>
> To whom it may engage...
>
> This is an automated request, but not an unsolicited one. For
> more information please visit http://gump.apache.org/nagged.html,
> and/or contact the folk at gene...@gump.apache.org.
>
> Project tomcat-trunk-validate has an issue affecting its community
integration.
> This issue affects 1 projects,
>  and has been outstanding for 2 runs.
> The current state of this project is 'Failed', with reason 'Build Failed'.
> For reference only, the following projects are affected by this:
> - tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the
Java Servlet 4.0,
> ...
>
>
> Full details are available at:
>
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html
>
> That said, some information snippets are provided here.
>
> The following annotations (debug/informational/warning/error messages)
were provided:
>  -DEBUG- Dependency on checkstyle exists, no need to add for property
checkstyle.jar.
>  -INFO- Failed with reason build failed
>
>
>
> The following work was performed:
>
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
> Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
> Work ended in a state of : Failed
> Elapsed: 1 min 47 secs
> Command Line: /usr/lib/jvm/java-8-oracle/bin/java
-Djava.awt.headless=true -Dbuild.sysclasspath=only
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar
-Dexecute.validate=true validate
> [Working Directory: /srv/gump/public/workspace/tomcat-trunk]
> CLASSPATH:
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151022.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
>
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151022.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151022.jar:/srv/gump/packages/guava/guava-18.0.jar
> -
> Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml
>
> build-prepare:
>[delete] Deleting directory
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
> [mkdir] Created dir:
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
>
> compile-prepare:
>
> download-validate:
>
> testexist:
>  [echo] Testing  for
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-SNAPSHOT.jar
>
> setproxy:
>
> downloadfile:
>
> validate:
> [mkdir] Created dir:
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
> [checkstyle] Running Checkstyle 6.12-SNAPSHOT on 3067 files
> [checkstyle]
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/filter.xml:368:
error: Line matches the illegal pattern '\s+#39;.
> [checkstyle]
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/filter.xml:411:
error: Line matches the illegal pattern '\s+#39;.
>

That was me ...
I'll fix it in a minute

Regards,
Violeta

> BUILD FAILED
> /srv/gump/public/workspace/tomcat-trunk/build.xml:549: Got 2 errors and 0
warnings.
>
> Total time: 1 minute 46 seconds
> -
>
> To subscribe to this information via syndicated feeds:
> - RSS:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
> - Atom:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml
>
> == Gump Tracking Only ===
> Produced by Apache Gump(TM) version 2.3.
> Gump Run 2015102208, vmgump.apache.org:vmgump:2015102208
> Gump E-mail Identifier (unique within run) #10.
>
> --
> Apache Gump
> http://gump.apache.org/ [Instance: vmgump]
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

[Bug 58519] org.apache.catalina.loader.WebappClassLoaderBase.checkStateForClassLoading throwing java.lang.IllegalStateException: Can't overwrite cause

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

--- Comment #2 from Kaszaq  ---
No need, thanks. Trigger of this was inside hazelcast library.

Hazelcast that loads class for itself called a function on ClassLoader which
was expected to throw ClassNotFoundException in case of any problem. I believe
that if ClassLoader would throw expected ClassNotFoundException the problem
would not occur.

However I am considering to report this to them as well as RuntimeException
from any method should not cause the entire Hazelcast cluster to collapse -
which is exactly what have happened because of the bug reported here and badly
handling of runtime exceptions in Hazelcast.

The problem was caused by deploy of new version of application when the
previous was was not undeployed correctly by Tomcat.

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

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

svn commit: r1710081 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 19:20:13 2015
New Revision: 1710081

URL: http://svn.apache.org/viewvc?rev=1710081=rev
Log:
More quote removal

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1710081=1710080=1710081=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Oct 22 
19:20:13 2015
@@ -539,12 +539,12 @@ public abstract class AbstractProtocol

svn commit: r1710070 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

2015-10-22 Thread violetagg 
Author: violetagg
Date: Thu Oct 22 18:16:48 2015
New Revision: 1710070

URL: http://svn.apache.org/viewvc?rev=1710070=rev
Log:
Spotted problems in the text messages while debugging bug 58490

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1710070=1710069=1710070=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Thu 
Oct 22 18:16:48 2015
@@ -55,13 +55,13 @@ contextConfig.jndiUrlNotDirContextConn=T
 contextConfig.jspFile.error=JSP file {0} must start with a ''/'
 contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in 
Servlet 2.4
 contextConfig.missingRealm=No Realm has been configured to authenticate against
-contextConfig.resourceJarFail=Failed to processes JAR found at URL [{0}] for 
static resources to be included in context with name [{0}]
+contextConfig.resourceJarFail=Failed to process JAR found at URL [{0}] for 
static resources to be included in context with name [{1}]
 contextConfig.role.auth=Security role name {0} used in an  
without being defined in a 
 contextConfig.role.link=Security role name {0} used in a  without 
being defined in a 
 contextConfig.role.runas=Security role name {0} used in a  without 
being defined in a 
 contextConfig.sci.debug=Unable to process ServletContainerInitializer for 
[{0}]. This is most likely due to a class defined in the @HandlesTypes 
annotation being missing
 contextConfig.sci.info=Unable to process ServletContainerInitializer for 
[{0}]. This is most likely due to a class defined in the @HandlesTypes 
annotation being missing. Enable DEBUG level logging for the full stack trace.
-contextConfig.servletContainerInitializerFail=Failed to process JAR found at 
URL [{0}] for ServletContainerInitializers for context with name [{1}]
+contextConfig.servletContainerInitializerFail=Failed to detect 
ServletContainerInitializers for context with name [{0}]
 contextConfig.start=ContextConfig: Processing START
 contextConfig.stop=ContextConfig: Processing STOP
 contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)



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

svn commit: r1710071 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/LocalStrings.properties

2015-10-22 Thread violetagg 
Author: violetagg
Date: Thu Oct 22 18:18:07 2015
New Revision: 1710071

URL: http://svn.apache.org/viewvc?rev=1710071=rev
Log:
Merged revision 1710070 from tomcat/trunk:
Spotted problems in the text messages while debugging bug 58490

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 22 18:18:07 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

svn commit: r1710080 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 19:19:26 2015
New Revision: 1710080

URL: http://svn.apache.org/viewvc?rev=1710080=rev
Log:
Get rid of the " characters in the async timeout thread names

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1710080=1710079=1710080=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Oct 22 
19:19:26 2015
@@ -333,6 +333,11 @@ public abstract class AbstractProtocol

[Bug 58522] New: concurrency problem corrupts WARDirContext.Entry children

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

Bug ID: 58522
   Summary: concurrency problem corrupts WARDirContext.Entry
children
   Product: Tomcat 7
   Version: 7.0.52
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: ryan.f...@workday.com

We discovered a problem where calling ServletContext.getResourcePaths from a
jsp may corrupt WARDirContext.Entry.children. The WARDirContext.list(Entry)
method performs an Arrays.sort(children) call which is not thread-safe. Calling
this from multiple request threads may result in the children array losing some
entries and duplicating others.

When entries representing directories in the war are lost, Tomcat cannot load
resources from there. Static resource requests result in http error code 404
and jsp compliation can throw JasperException when included files are not
found.

We have seen this on CentOS 6.5 (and newer versions) with Tomcat 7.0.52 and
Java 1.7.0_51.

The following are attached in the zip:
* Test case project which demonstrates this corruption. It usually requires
multiple runs.
* A stack trace illustrating the problematic flow.
* A patch file for WARDirContext.java.

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

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

buildbot exception in ASF Buildbot on tomcat-8-trunk

2015-10-22 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/190

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] 1710071
Blamelist: violetagg

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: r1709960 - /tomcat/trunk/webapps/docs/config/filter.xml

2015-10-22 Thread violetagg 
Author: violetagg
Date: Thu Oct 22 08:24:04 2015
New Revision: 1709960

URL: http://svn.apache.org/viewvc?rev=1709960=rev
Log:
Remove extra white spaces

Modified:
tomcat/trunk/webapps/docs/config/filter.xml

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1709960=1709959=1709960=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Thu Oct 22 08:24:04 2015
@@ -365,7 +365,7 @@
   X-CSRF-Token: Fetch
   Cache the returned session id and nonce in order to provide them in
   the subsequent modifying requests to protected resources.
-  Modifying requests can be denied and header 
+  Modifying requests can be denied and header
   X-CSRF-Token: Required will be returned in case of
   invalid or missing nonce, expired session or in case the session
   id is changed by the server.
@@ -408,7 +408,7 @@ HTTP/1.1 200 OK
Request parameters cannot be used to fetch new nonce, only header can be
used to request a new nonce.
 
-

svn commit: r1709999 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 12:03:51 2015
New Revision: 170

URL: http://svn.apache.org/viewvc?rev=170=rev
Log:
Align error handling for being unable to send the preface with the other error 
handling in this method.

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

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=170=1709998=170=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu Oct 
22 12:03:51 2015
@@ -217,7 +217,7 @@ public class Http2UpgradeHandler extends
 socketWrapper.write(true, settings, 0, settings.length);
 socketWrapper.flush(true);
 } catch (IOException ioe) {
-throw new 
IllegalStateException(sm.getString("upgradeHandler.sendPrefaceFail"), ioe);
+throw new 
ProtocolException(sm.getString("upgradeHandler.sendPrefaceFail"), ioe);
 }
 
 // Make sure the client has sent a valid connection preface before we



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

[Bug 58519] org.apache.catalina.loader.WebappClassLoaderBase.checkStateForClassLoading throwing java.lang.IllegalStateException: Can't overwrite cause

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

Kaszaq  changed:

   What|Removed |Added

 CC||kaszaq+bz.apache.org@gmail.
   ||com
 OS||All

-- 
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 58519] New: org.apache.catalina.loader.WebappClassLoaderBase.checkStateForClassLoading throwing java.lang.IllegalStateException: Can't overwrite cause

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

Bug ID: 58519
   Summary: org.apache.catalina.loader.WebappClassLoaderBase.check
StateForClassLoading throwing
java.lang.IllegalStateException: Can't overwrite cause
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: kaszaq+bz.apache@gmail.com

Hi,
Recently I had catalina log grow in few seconds to enormous sizes, partially
due to problems with mentioned method. Instead of creating and declared
ClassNotFoundException it throws "java.lang.IllegalStateException: Can't
overwrite cause".

Looking into the code  I found here:
http://grepcode.com/file/repo1.maven.org/maven2/org.apache.tomcat/tomcat-catalina/8.0.23/org/apache/catalina/loader/WebappClassLoaderBase.java#WebappClassLoaderBase.checkStateForClassLoading%28java.lang.String%29

1309protected void checkStateForClassLoading(String className) throws
ClassNotFoundException {
1310// It is not permitted to load new classes once the web application
has
1311// been stopped.
1312try {
1313checkStateForResourceLoading(className);
1314} catch (IllegalStateException ise) {
1315ClassNotFoundException cnfe = new ClassNotFoundException();
1316cnfe.initCause(ise);
1317throw cnfe;
1318}
1319}

I belive the problem is caused by setting initcause on created class when
constructor
new ClassNotFoundException()

has explicty stated:

71 public ClassNotFoundException() {
72 super((Throwable)null);  // Disallow initCause
73 }

Which during initCause is producing mentioned exception:

454 public synchronized Throwable initCause(Throwable cause) {
455 if (this.cause != this)
456 throw new IllegalStateException("Can't overwrite cause with " +
457 Objects.toString(cause, "a
null"), this);
458 if (cause == this)
459 throw new IllegalArgumentException("Self-causation not
permitted", this);
460 this.cause = cause;
461 return this;
462 }

-- 
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 58519] org.apache.catalina.loader.WebappClassLoaderBase.checkStateForClassLoading throwing java.lang.IllegalStateException: Can't overwrite cause

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

Konstantin Kolinko  changed:

   What|Removed |Added

Version|trunk   |8.0.28

--- Comment #1 from Konstantin Kolinko  ---
Ack.

1) Tomcat side.

> 1314} catch (IllegalStateException ise) {
> 1315ClassNotFoundException cnfe = new ClassNotFoundException();
> 1316cnfe.initCause(ise);
> 1317throw cnfe;
> 1318}

initCause() usually is used for compatibility for 1.3 and earlier versions of
java that did not have a Throwable(Throwable cause) constructor. There is no
ClassNotFoundException(Throwable) constructor, but there is (String, Throwable)
one.

Calling initCause() here is a recent code, introduced in r1596004 (17 months
ago) with additional refactoring in r1640087.

> 
> I belive the problem is caused by setting initcause on created class when
> constructor
> new ClassNotFoundException()
> 
> has explicty stated:
> 
> 71 public ClassNotFoundException() {
> 72 super((Throwable)null);  // Disallow initCause
> 73 }

The above nasty trick in JRE is old. E.g. 5u20 already has it...



2) The trigger for this behaviour is a bug in your own web application.

You cannot load classes when the web application (and its class loader) has
already been stopped.

If you need help with fixing this bug in your application, ask on the users
mailing list. Don't forget to provide version numbers and full stack trace.

http://tomcat.apache.org/lists.html#tomcat-users
http://markmail.org/message/ntwrtxeke4agdexj

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

[VOTE] Release Apache Tomcat Native 1.2.0

2015-10-22 Thread Mark Thomas 
Version 1.2.0 includes the following changes:
- Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d
- ALPN support

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.0 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...


 [1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.0/
 [2]
https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_0

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

Re: [VOTE] Release Apache Tomcat 7.0.65

2015-10-22 Thread Emmanuel Bourg 
Hi,

I noticed test failures when rebuilding Tomcat 7.0.65 on Debian with
OpenJDK 7 & 8. An IllegalArgumentException "Illegal character(s) in
message header field: Cookie:" is thrown in TestNonLoginAndBasicAuthenticator,
TestSSOnonLoginAndBasicAuthenticator and TestSSOnonLoginAndDigestAuthenticator:


Testcase: testBasicLoginThenAcceptWithCookies took 0.539 sec
Caused an ERROR
Illegal character(s) in message header field: Cookie:
java.lang.IllegalArgumentException: Illegal character(s) in message header 
field: Cookie:
at 
sun.net.www.protocol.http.HttpURLConnection.checkMessageHeader(HttpURLConnection.java:489)
at 
sun.net.www.protocol.http.HttpURLConnection.isExternalMessageHeaderAllowed(HttpURLConnection.java:459)
at 
sun.net.www.protocol.http.HttpURLConnection.setRequestProperty(HttpURLConnection.java:3018)
at 
org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:648)
at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:625)
at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:619)
at 
org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.doTestNonLogin(TestSSOnonLoginAndBasicAuthenticator.java:365)
at 
org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.testBasicLoginThenAcceptWithCookies(TestSSOnonLoginAndBasicAuthenticator.java:215)


Could this be a locale sensitive test case?

Emmanuel Bourg


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

svn commit: r1710107 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 22:15:04 2015
New Revision: 1710107

URL: http://svn.apache.org/viewvc?rev=1710107=rev
Log:
Remove unused code

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710107=1710106=1710107=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Thu Oct 
22 22:15:04 2015
@@ -111,10 +111,6 @@ public class SecureNio2Channel extends N
 };
 }
 
-public void setSSLEngine(SSLEngine engine) {
-this.sslEngine = engine;
-}
-
 @Override
 public void reset(AsynchronousSocketChannel channel, 
SocketWrapperBase socket)
 throws IOException {
@@ -213,6 +209,7 @@ public class SecureNio2Channel extends N
 SSLEngineResult handshake = null;
 
 while (!handshakeComplete) {
+log.debug("Handshake status [" + handshakeStatus + "]" );
 switch (handshakeStatus) {
 case NOT_HANDSHAKING: {
 //should never happen
@@ -305,6 +302,7 @@ public class SecureNio2Channel extends N
 }
 default: throw new 
IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus", 
handshakeStatus));
 }
+log.debug("Handshake complete [" + handshakeComplete + "]" );
 }
 //return 0 if we are complete, otherwise recurse to process the task
 return handshakeComplete ? 0 : handshakeInternal(async);
@@ -463,6 +461,7 @@ public class SecureNio2Channel extends N
 netOutBuffer.flip();
 //set the status
 handshakeStatus = result.getHandshakeStatus();
+log.debug("Result [" + result + "]");
 return result;
 }
 
@@ -499,6 +498,7 @@ public class SecureNio2Channel extends N
 cont = result.getStatus() == SSLEngineResult.Status.OK &&
handshakeStatus == HandshakeStatus.NEED_UNWRAP;
 } while (cont);
+log.debug("Result [" + result + "]");
 return result;
 }
 



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

[Bug 58522] concurrency problem corrupts WARDirContext.Entry children

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

--- Comment #1 from Ryan Fong  ---
Created attachment 33195
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33195=edit
everything

-- 
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 57129] Regression. Load WEB-INF/lib jarfiles in alphabetical order

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

--- Comment #16 from Philippe Busque  ---
We just begun converting your tomcat 6 and tomcat 7 Webfarm to Tomcat 8, and
honestly, this is a show stopper for us.

We cannot, in a cluster setup, start Tomcat and have each instance have a
different class loading behaviour.  This is especially important when
serialization come into play with session sharing inside the cluster, where a
class mismatch can lead to Serialization Exception.

Or with logging libraries, such as logback, which override existing libraries
with their own to offer a logging facade. 

In an ideal world, yes, we would have a nice war with no overriding classes,
with no dependencies pulling deep libraries. In an ideal world, we would use
absolute path for a PreResources.

But this is not ideal. Maven-generated war with SNAPSHOT dependencies will have
variables suffixes. Unless PreResources can support wildcards or prefixes in
order to support versioning, this solution is not viable for most of us.

There was a similar use case back in Tomcat 7, when the support for War outside
the webapp support was dropped, but added back later with a flag.


There exist applications that need a deterministic class loading. Heck, Java
itself at it's core, is deterministic. That's the whole notion of classpath
that is being ignored. If you do not want to make the jar sorting as the
default behaviour, fine. But at the very least, offer it as an option for
people to decide if they need it.

ie



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

svn commit: r1710108 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 22:27:11 2015
New Revision: 1710108

URL: http://svn.apache.org/viewvc?rev=1710108=rev
Log:
Remove temporary debug statements from r1710107

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710108=1710107=1710108=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Thu Oct 
22 22:27:11 2015
@@ -209,7 +209,6 @@ public class SecureNio2Channel extends N
 SSLEngineResult handshake = null;
 
 while (!handshakeComplete) {
-log.debug("Handshake status [" + handshakeStatus + "]" );
 switch (handshakeStatus) {
 case NOT_HANDSHAKING: {
 //should never happen
@@ -302,7 +301,6 @@ public class SecureNio2Channel extends N
 }
 default: throw new 
IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus", 
handshakeStatus));
 }
-log.debug("Handshake complete [" + handshakeComplete + "]" );
 }
 //return 0 if we are complete, otherwise recurse to process the task
 return handshakeComplete ? 0 : handshakeInternal(async);
@@ -461,7 +459,6 @@ public class SecureNio2Channel extends N
 netOutBuffer.flip();
 //set the status
 handshakeStatus = result.getHandshakeStatus();
-log.debug("Result [" + result + "]");
 return result;
 }
 
@@ -498,7 +495,6 @@ public class SecureNio2Channel extends N
 cont = result.getStatus() == SSLEngineResult.Status.OK &&
handshakeStatus == HandshakeStatus.NEED_UNWRAP;
 } while (cont);
-log.debug("Result [" + result + "]");
 return result;
 }
 



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

Re: svn commit: r1710107 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

2015-10-22 Thread Mark Thomas 
On 22/10/2015 23:15, ma...@apache.org wrote:
> Author: markt
> Date: Thu Oct 22 22:15:04 2015
> New Revision: 1710107
> 
> URL: http://svn.apache.org/viewvc?rev=1710107=rev
> Log:
> Remove unused code
> 
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
> 
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710107=1710106=1710107=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Thu 
> Oct 22 22:15:04 2015
> @@ -111,10 +111,6 @@ public class SecureNio2Channel extends N
>  };
>  }
>  
> -public void setSSLEngine(SSLEngine engine) {
> -this.sslEngine = engine;
> -}
> -

Sorry. The rest of this is temporary debug statements. I'll get them
removed shortly.

Mark


>  @Override
>  public void reset(AsynchronousSocketChannel channel, 
> SocketWrapperBase socket)
>  throws IOException {
> @@ -213,6 +209,7 @@ public class SecureNio2Channel extends N
>  SSLEngineResult handshake = null;
>  
>  while (!handshakeComplete) {
> +log.debug("Handshake status [" + handshakeStatus + "]" );
>  switch (handshakeStatus) {
>  case NOT_HANDSHAKING: {
>  //should never happen
> @@ -305,6 +302,7 @@ public class SecureNio2Channel extends N
>  }
>  default: throw new 
> IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus", 
> handshakeStatus));
>  }
> +log.debug("Handshake complete [" + handshakeComplete + "]" );
>  }
>  //return 0 if we are complete, otherwise recurse to process the task
>  return handshakeComplete ? 0 : handshakeInternal(async);
> @@ -463,6 +461,7 @@ public class SecureNio2Channel extends N
>  netOutBuffer.flip();
>  //set the status
>  handshakeStatus = result.getHandshakeStatus();
> +log.debug("Result [" + result + "]");
>  return result;
>  }
>  
> @@ -499,6 +498,7 @@ public class SecureNio2Channel extends N
>  cont = result.getStatus() == SSLEngineResult.Status.OK &&
> handshakeStatus == HandshakeStatus.NEED_UNWRAP;
>  } while (cont);
> +log.debug("Result [" + result + "]");
>  return result;
>  }
>  
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

svn commit: r10883 - /dev/tomcat/tomcat-connectors/native/1.2.0/binaries/

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 10:39:30 2015
New Revision: 10883

Log:
Add the Windows binaries for x86 and x64

Added:

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.sha1
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.asc
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.md5

dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip
--
svn:mime-type = application/java-archive

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.md5
 Thu Oct 22 10:39:30 2015
@@ -0,0 +1 @@
+91b29152d99873ad3fedee348fef6ef6 *tomcat-native-1.2.0-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.sha1
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-ocsp-win32-bin.zip.sha1
--
svn:mime-type = application/zlib

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip
--
svn:mime-type = application/java-archive

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.md5
 Thu Oct 22 10:39:30 2015
@@ -0,0 +1 @@
+d8316940f6849625c98ed78daea1f32a *tomcat-native-1.2.0-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.0/binaries/tomcat-native-1.2.0-win32-bin.zip.sha1
 Thu Oct 22

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

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

--- Comment #12 from Violeta Georgieva  ---
Hi,

You may want to see this issue 58518 which seems to be connected with this
feature.

Best Regards,
Violeta Georgieva

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

Tomcat 9.0.x, tc-native and itanium support

2015-10-22 Thread Mark Thomas 
I've been having problems building OpenSSL 1.0.2d for Windows Itanium
64-bit as part of building the tcnative binaries for Windows.

Given that the last Windows platform to support Itanium is Server 2008
R2 and that that has already entered extended support (with that due to
end in Jan 2020) how do folks feel about dropping the Itanium build from
the binary packages for tcnative 1.2.x and Tomcat 9.0.x?

Mark

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

svn commit: r1710022 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java

2015-10-22 Thread markt 
Author: markt
Date: Thu Oct 22 14:09:49 2015
New Revision: 1710022

URL: http://svn.apache.org/viewvc?rev=1710022=rev
Log:
Fix an NPE if available() is called before the input buffer is created.

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

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1710022=1710021=1710022=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Oct 22 14:09:49 
2015
@@ -616,6 +616,9 @@ public class Stream extends AbstractStre
 
 
 synchronized int available() {
+if (inBuffer == null) {
+return 0;
+}
 return inBuffer.position();
 }
 



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

Re: [VOTE] Release Apache Tomcat Native 1.2.0

2015-10-22 Thread Rémy Maucherat 
2015-10-22 12:47 GMT+02:00 Mark Thomas :

> Version 1.2.0 includes the following changes:
> - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d
> - ALPN support
>
(most importantly IMO) - Add API methods to access OpenSSL BIO

>
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
>
> The Apache Tomcat Native 1.2.0 is
>  [X] Stable, go ahead and release
>  [ ] Broken because of ...
>
>
>  [1]
>
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.0/
>  [2]
> https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_0
>
> So I guess I've been testing the OpenSSL engine for a while, and I didn't
run into issues. ALPN works as well [APR and NIOx] with HTTP/2. So IMO this
is quite ambitious, but maybe "stable" can be tried since most of the "new"
code is actually only a merge from code released elsewhere.

Rémy

Re: Plan for 9.0.0.RC1

2015-10-22 Thread Mark Thomas 
On 19/10/2015 13:38, Rémy Maucherat wrote:
> 2015-10-19 14:24 GMT+02:00 Mark Thomas :

>> Anything reproducible?
> 
> Chrome mostly, Firefox is a bit nicer for me. I use JF's ApacheCon example
> as well so that issues are easier to see:
> https://github.com/jfclere/h2_demos/tree/master/httpd
> Although APR works perfectly, NIO has some glitches and NIO2 doesn't work.
> After debugging everything, I think the encryption layer is fine, the IO
> looks fine as well, and the HTTP2 code looks ok as well.

First of all, I have to say that the sslImplementationName option on the
Connector is fantastic. To be able to switch from APR to NIO+OpenSSL
that easily is great.

JF's HTTP/2 example web page is pretty good too.

I've got things up and running on Windows (a good opportunity to test
the tcnative binaries) and I see what looks to be the same problem with
Chrome + NIO2 in that no images are displayed. Even a simple HTTP/2 page
fails.

I'm hoping that the recent handful of HTTP/2 fixes will have made the
root cause easier to track down. I guess I'll find out soon enough.

Mark

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

[Bug 58523] New: servlet filter not working over virtual directories in tomcat

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

Bug ID: 58523
   Summary: servlet filter not working over virtual directories in
tomcat
   Product: Tomcat 8
   Version: 8.0.15
  Hardware: All
OS: All
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: prady...@gmail.com

Hi,

I had configured virtual directories in glassfish3.x over which I could write
filters.

For an example I could access files at c:/web from http://localhost/TestApp/web
over which I could also place a filter at my web app's web/xml file with


dir_filter
/web/*


Unfortunately Tomcat 8.0 is not allowing me to write a filter above that. It
simply ignores the filters and shows the content in the web directory.

The problem is anybody can access all of the files in the "web" folder.

Any how can we place filter over the virtual directories.

FYI - i have made the web app named "TestApp" and the virtual config is located
at "$tomcat_dir/conf/Catalina/localhost" directory with the file name
"TestApp#web.xml" file and having the content

 


The question is also at stackoverflow -
http://stackoverflow.com/questions/33290483/servlet-filter-not-working-over-virtual-directories-in-tomcat

Regards
Praddy, India

-- 
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 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

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

--- Comment #13 from Huxing Zhang  ---
Okay, just give me some time to look into this issue.

-- 
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: [VOTE] Release Apache Tomcat Native 1.2.0

2015-10-22 Thread Mark Thomas 
On 22/10/2015 11:47, Mark Thomas wrote:
> Version 1.2.0 includes the following changes:
> - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d
> - ALPN support
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 1.2.0 is
>  [X] Stable, go ahead and release
>  [ ] Broken because of ...

I'm happily running HTTP/2 on Windows with the x64 binaries.

I've found a couple of bugs but they have all been in the 9.0.x Java code.

Mark

>  [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.0/
>  [2]
> https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_0
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Re: Plan for 9.0.0.RC1

2015-10-22 Thread Rémy Maucherat 
2015-10-22 16:56 GMT+02:00 Mark Thomas :

> On 19/10/2015 13:38, Rémy Maucherat wrote:
> > 2015-10-19 14:24 GMT+02:00 Mark Thomas :
>
> >> Anything reproducible?
> >
> > Chrome mostly, Firefox is a bit nicer for me. I use JF's ApacheCon
> example
> > as well so that issues are easier to see:
> > https://github.com/jfclere/h2_demos/tree/master/httpd
> > Although APR works perfectly, NIO has some glitches and NIO2 doesn't
> work.
> > After debugging everything, I think the encryption layer is fine, the IO
> > looks fine as well, and the HTTP2 code looks ok as well.
>
> First of all, I have to say that the sslImplementationName option on the
> Connector is fantastic. To be able to switch from APR to NIO+OpenSSL
> that easily is great.
>
> JF's HTTP/2 example web page is pretty good too.
>

Cool ! Yes, it's a good stress test which makes it easy to spot an issue.

>
> I've got things up and running on Windows (a good opportunity to test
> the tcnative binaries) and I see what looks to be the same problem with
> Chrome + NIO2 in that no images are displayed. Even a simple HTTP/2 page
> fails.
>

That's what I get. Nice test since I had never tried the OpenSSL engine on
Windows [and I don't think JF did either].

>
> I'm hoping that the recent handful of HTTP/2 fixes will have made the
> root cause easier to track down. I guess I'll find out soon enough.
>
> Ok, I hope you'll find something interesting.

Rémy

Re: Plan for 9.0.0.RC1

2015-10-22 Thread jean-frederic clere 
On 10/22/2015 05:19 PM, Rémy Maucherat wrote:
> 2015-10-22 16:56 GMT+02:00 Mark Thomas :
> 
>> On 19/10/2015 13:38, Rémy Maucherat wrote:
>>> 2015-10-19 14:24 GMT+02:00 Mark Thomas :
>>
 Anything reproducible?
>>>
>>> Chrome mostly, Firefox is a bit nicer for me. I use JF's ApacheCon
>> example
>>> as well so that issues are easier to see:
>>> https://github.com/jfclere/h2_demos/tree/master/httpd
>>> Although APR works perfectly, NIO has some glitches and NIO2 doesn't
>> work.
>>> After debugging everything, I think the encryption layer is fine, the IO
>>> looks fine as well, and the HTTP2 code looks ok as well.
>>
>> First of all, I have to say that the sslImplementationName option on the
>> Connector is fantastic. To be able to switch from APR to NIO+OpenSSL
>> that easily is great.
>>
>> JF's HTTP/2 example web page is pretty good too.
>>
> 
> Cool ! Yes, it's a good stress test which makes it easy to spot an issue.
> 
>>
>> I've got things up and running on Windows (a good opportunity to test
>> the tcnative binaries) and I see what looks to be the same problem with
>> Chrome + NIO2 in that no images are displayed. Even a simple HTTP/2 page
>> fails.
>>
> 
> That's what I get. Nice test since I had never tried the OpenSSL engine on
> Windows [and I don't think JF did either].

I have issue building 1.0.2c on my windows box for the moment...

Cheers

Jean-Frederic

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

svn commit: r1710030 - in /tomcat/trunk/java/org/apache/catalina/authenticator: ./ jaspic/provider/modules/

2015-10-22 Thread remm 
Author: remm
Date: Thu Oct 22 15:11:06 2015
New Revision: 1710030

URL: http://svn.apache.org/viewvc?rev=1710030=rev
Log:
Remove some duplicate code (helper classes are public for now), add 
configuration for digest, cleanups.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1710030=1710029=1710030=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
Thu Oct 22 15:11:06 2015
@@ -402,7 +402,7 @@ public class DigestAuthenticator extends
 };
 }
 
-private static class DigestInfo {
+public static class DigestInfo {
 
 private final String opaque;
 private final long nonceValidity;
@@ -608,7 +608,7 @@ public class DigestAuthenticator extends
 
 }
 
-private static class NonceInfo {
+public static class NonceInfo {
 private final long timestamp;
 private final boolean seen[];
 private final int offset;

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1710030=1710029=1710030=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java 
Thu Oct 22 15:11:06 2015
@@ -307,13 +307,13 @@ public class SpnegoAuthenticator extends
 /**
  * This class gets a gss credential via a privileged action.
  */
-private static class AcceptAction implements 
PrivilegedExceptionAction {
+public static class AcceptAction implements 
PrivilegedExceptionAction {
 
 GSSContext gssContext;
 
 byte[] decoded;
 
-AcceptAction(GSSContext context, byte[] decodedToken) {
+public AcceptAction(GSSContext context, byte[] decodedToken) {
 this.gssContext = context;
 this.decoded = decodedToken;
 }
@@ -326,7 +326,7 @@ public class SpnegoAuthenticator extends
 }
 
 
-private static class AuthenticateAction implements 
PrivilegedAction {
+public static class AuthenticateAction implements 
PrivilegedAction {
 
 private final Realm realm;
 private final GSSContext gssContext;
@@ -359,7 +359,7 @@ public class SpnegoAuthenticator extends
  * This hack works by re-ordering the list of mechTypes in the NegTokenInit
  * token.
  */
-private static class SpnegoTokenFixer {
+public static class SpnegoTokenFixer {
 
 public static void fix(byte[] token) {
 SpnegoTokenFixer fixer = new SpnegoTokenFixer(token);

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java?rev=1710030=1710029=1710030=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
 Thu Oct 22 15:11:06 2015
@@ -18,7 +18,6 @@ package org.apache.catalina.authenticato
 
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.Iterator;
 import java.util.Map;
 
 import javax.security.auth.Subject;
@@ -35,7 +34,6 @@ import javax.servlet.http.HttpServletRes
 import org.apache.catalina.Context;
 import org.apache.catalina.authenticator.BasicAuthenticator.BasicCredentials;
 import org.apache.catalina.connector.Request;
-import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 
@@ -53,10 +51,9 @@ public class BasicAuthModule extends Tom
 }
 
 
-

[Bug 58520] New: Future returned by javax.websocket.Session.getAsyncRemote().sendText(...) always returns true

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

Bug ID: 58520
   Summary: Future returned by
javax.websocket.Session.getAsyncRemote().sendText(...)
always returns true
   Product: Tomcat 8
   Version: 8.0.27
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: jeperjaperjie...@gmail.com

In our websocket implementation, we are sending events through websockets every
250ms to the client.

It seems that the Future returned by
javax.websocket.Session.getAsyncRemote().sendText(...) always returns true.
This makes it impossible to cancel pending outgoing data.

Scenario:

1. Server is up and running
2. Client connects
3. Server starts sending events every 250ms
4. All goes well
5. Client disconnects from the network (for example by unplugging its UTP)
6. Server keeps sending events; the server has no idea that the client is
disconnected (which is OK, on itself)
7. Twenty seconds later, clients reconnects to network
8. Clients receives all events from the last 20 seconds (around 80 events)

Ideally, during step 6, the server notices that there is a previous pending
event, which can be canceled in favor of the current/new event. With that
approach, the client will not receive all past events at step 8.

-- 
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: r1710058 - in /tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules: BasicAuthModule.java DigestAuthModule.java FormAuthModule.java LocalStrings.properties SSLAuthMo

2015-10-22 Thread remm 
Author: remm
Date: Thu Oct 22 16:26:51 2015
New Revision: 1710058

URL: http://svn.apache.org/viewvc?rev=1710058=rev
Log:
Pull up some methods and quick port of SSL authenticator.

Added:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SSLAuthModule.java
Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/SpnegoAuthModule.java

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/TomcatAuthModule.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java?rev=1710058=1710057=1710058=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/BasicAuthModule.java
 Thu Oct 22 16:26:51 2015
@@ -28,7 +28,6 @@ import javax.security.auth.message.AuthS
 import javax.security.auth.message.MessageInfo;
 import javax.security.auth.message.MessagePolicy;
 import javax.security.auth.message.callback.PasswordValidationCallback;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Context;
@@ -42,10 +41,6 @@ import org.apache.tomcat.util.buf.Messag
  */
 public class BasicAuthModule extends TomcatAuthModule {
 
-private Class[] supportedMessageTypes = new Class[] { 
HttpServletRequest.class,
-HttpServletResponse.class };
-
-
 public BasicAuthModule(Context context) {
 super(context);
 }
@@ -111,22 +106,4 @@ public class BasicAuthModule extends Tom
 }
 
 
-@Override
-public AuthStatus secureResponse(MessageInfo messageInfo, Subject 
serviceSubject)
-throws AuthException {
-return null;
-}
-
-
-@Override
-public void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException {
-
-}
-
-
-@Override
-public Class[] getSupportedMessageTypes() {
-return supportedMessageTypes;
-}
-
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java?rev=1710058=1710057=1710058=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/DigestAuthModule.java
 Thu Oct 22 16:26:51 2015
@@ -51,9 +51,6 @@ public class DigestAuthModule extends To
  */
 protected static final String QOP = "auth";
 
-private Class[] supportedMessageTypes = new Class[] { 
HttpServletRequest.class,
-HttpServletResponse.class };
-
 private CallbackHandler handler;
 
 private Realm realm;
@@ -292,25 +289,6 @@ public class DigestAuthModule extends To
 }
 
 
-@Override
-public AuthStatus secureResponse(MessageInfo messageInfo, Subject 
serviceSubject)
-throws AuthException {
-return null;
-}
-
-
-@Override
-public void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException {
-
-}
-
-
-@Override
-public Class[] getSupportedMessageTypes() {
-return supportedMessageTypes;
-}
-
-
 /**
  * Removes the quotes on a string. RFC2617 states quotes are optional for
  * all parameters except realm.

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java?rev=1710058=1710057=1710058=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/provider/modules/FormAuthModule.java
 Thu Oct 22 16:26:51 2015
@@ -35,7 +35,6 @@ import javax.security.auth.message.Messa
 import javax.security.auth.message.callback.PasswordValidationCallback;
 import javax.servlet.RequestDispatcher;
 import