[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57136

--- Comment #25 from Mark Thomas  ---
Also see this thread on the dev list:
http://tomcat.markmail.org/thread/uzo65gf572s636ly

-- 
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 58586] Classloader memory leak on Tomcat application .war file redeployment.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58586

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
Memory leaks in JDBC drivers are not bugs in Tomcat. Please use the users
mailing list if you require further assistance.

This may provide someuseful background:
http://people.apache.org/~markt/presentations/2010-11-04-Memory-Leaks-60mins.pdf

-- 
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 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

--- Comment #3 from Aidan  ---
Wow! - a very impressive response - keep up the good work guys!
Yep, Aidan is fine for patch credit but please feel free to use your own name.

-- 
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: tomcat timeout handling

[Rémy Maucherat]

2015-11-05 3:29 GMT+01:00 Bernd Eckenfels :

> I think this is wrong, it does not only apply to the initial line but
> also the output. Maybe this could be clarified, especially in relation
> with uploadTimeout and keepAliveTimeout. Especially when does the
> connector transition from one to the other.
>
> Obviously, the connection timeout is also used for output. Input is
specifically discussed since client's input is usually far slower and less
reliable, especially when dealing with large posts.

This was discussed at length in the relevant BZ, which you looked at. The
situation is now understood but there is no better solution than the
current behavior. In your situation, the most efficient is probably to
configure a smaller output buffer.

Note: I believe the message should be on the user list.

Rémy

Re: On escaping of EL in attributes (BZ 57136)

[Mark Thomas]

On 05/11/2015 08:48, Mark Thomas wrote:
> On 05/11/2015 05:05, Konstantin Kolinko wrote:
>> Hi!
>>
>> I happened to stumble on the following entry in changelog for 6.0.19:
>>
>>   
>> Fix various edge-cases when parsing EL, particularly inside attribute
>> values. Note that the Expert Group has confirmed that JSP.1.6 takes
>> precedence over JSP.1.3.10. Therefore EL in attributes must be 
>> escaped
>> twice. (markt)
>>   
> 
> Wow. I have absolutely no memory of that at all.
> 
> Let me see if I can dig up the discussion that provided that confirmation.

OK, found it. Having a precise date range to work with made it a lot
easier. Apologies in advance as I have the feeling that this is e-mail
is going to be on the long side.

Back in 2009, I, acting on behalf of the Tomcat community, raised this
via a challenge to the JSP 2.1 TCK using the following examples:

  <-- The spec requires this
<-- The TCK expects this

To put this in the current context, the fix for BZ 57136 implements the
first form.

Our TCK contact discussed it with the JSP lead and the conclusion was
that the second form was the correct one. The reason given was that the
second form is valid XML whereas the first form is not.

I queried this on the grounds that the grammar is explicit that the
second form is correct and that the spec also states that the grammar
takes precedence.

The response was that a request would be made to clarify the spec.

No such clarification was made in JSP 2.2 or JSP 2.3.

Which brings us to where we are today. The spec says one thing, I assume
the TCK tests for something else (I don't have access to the later JSP
TCK versions), we have a private clarification from 7 years ago that the
spec is wrong and the two versions of the spec since then have not
included any related correction.

In the past we have used the following order of precedence when the
specs have been unclear:
- what the EG intended based on their discussions
- what the TCK tests for
- spec language

However, this order has only been used where we required clarification
rather than when there were inconsistencies. Also, more recently, I have
seen the view expressed with the EGs that it doesn't matter what the EG
discussed, the specification language always takes priority even if the
language does not reflect what the EG intended.

To summarise:

In favour of form 1:
- it is consistent with the spec
- EGs have recently expressed the spec takes precedence
- There have been two releases of the JSP spec since the issue was
  raised and the spec has not been updated

In favour of form 2:
- it is well-formed XML
- it is what the TCK tested (tests?) for
- the spec lead expressed the view this was the intended behaviour
- Up until the BZ 57136 fix, Tomcat did it this way

At this point, I don't see a clear argument one way or the other.

I've looked through the open JSP spec issues:
https://java.net/jira/browse/JSP_SPEC_PUBLIC

and I don't see anything for this. I do see a lot of very old issues
that don't appear to have been looked at for some time.

Given the lack of clarity of the which behaviour is correct, I think we
have little choice but to make this optional and that we should get this
done before the next 8.0.x release. I intend to start working on that in
trunk today.

Mark


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

Re: On escaping of EL in attributes (BZ 57136)

[Mark Thomas]

On 05/11/2015 05:05, Konstantin Kolinko wrote:
> Hi!
> 
> I happened to stumble on the following entry in changelog for 6.0.19:
> 
>   
> Fix various edge-cases when parsing EL, particularly inside attribute
> values. Note that the Expert Group has confirmed that JSP.1.6 takes
> precedence over JSP.1.3.10. Therefore EL in attributes must be escaped
> twice. (markt)
>   

Wow. I have absolutely no memory of that at all.

Let me see if I can dig up the discussion that provided that confirmation.

Mark


> 
> Chapters mentioned here:
> JSP.1.6 Quoting and Escape Conventions
> JSP.1.3.10.1 EBNF Grammar for JSP Syntax
> 
> Related discussion:
> "EL and TCK" on dev@, started 2008-09-18
> http://tomcat.markmail.org/thread/2rq3vkvx76vmhq75
> 
> Related commits:
> Tomcat 6:
> http://svn.apache.org/viewvc?rev=708165=rev
> http://svn.apache.org/viewvc?rev=708166=rev
> Tomcat trunk:
> http://svn.apache.org/viewvc?rev=702587=rev
> 
> So apparently the change in EL escaping in attributes that was done
> while fixing BZ 57136 [1] has already been discussed and resolved in a
> different way 7 years ago.
> 
> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=57136#c17
> 
> Best regards,
> Konstantin Kolinko
> 
> -
> 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

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/151

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1712736 - in /tomcat/tc8.0.x/trunk: java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ res/checkstyle/ webapps/docs/

[remm]

Author: remm
Date: Thu Nov  5 10:29:53 2015
New Revision: 1712736

URL: http://svn.apache.org/viewvc?rev=1712736=rev
Log:
Port r1712575: Use InstanceManager for server endpoint instances.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.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/tomcat/websocket/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1712736=1712735=1712736=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
Thu Nov  5 10:29:53 2015
@@ -99,6 +99,8 @@ wsSession.sendCloseFail=Failed to send c
 wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not 
registered with this session
 wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for 
the unrecognised type [{1}]
 wsSession.unknownHandlerType=Unable to add the message handler [{0}] as it was 
wrapped as the unrecognised type [{1}]
+wsSession.instanceNew=Endpoint instance registration failed
+wsSession.instanceDestroy=Endpoint instance unregistration failed
 
 # Note the following message is used as a close reason in a WebSocket control
 # frame and therefore must be 123 bytes (not characters) or less in length.

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1712736=1712735=1712736=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Thu 
Nov  5 10:29:53 2015
@@ -47,6 +47,7 @@ import javax.websocket.WebSocketContaine
 
 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.res.StringManager;
 
@@ -180,6 +181,15 @@ public class WsSession implements Sessio
 this.userProperties.putAll(endpointConfig.getUserProperties());
 this.id = Long.toHexString(ids.getAndIncrement());
 
+InstanceManager instanceManager = 
webSocketContainer.getInstanceManager();
+if (instanceManager != null) {
+try {
+instanceManager.newInstance(localEndpoint);
+} catch (Exception e) {
+throw new 
DeploymentException(sm.getString("wsSession.instanceNew"), e);
+}
+}
+
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("wsSession.created", id));
 }
@@ -520,11 +530,15 @@ public class WsSession implements Sessio
 private void fireEndpointOnClose(CloseReason closeReason) {
 
 // Fire the onClose event
+InstanceManager instanceManager = 
webSocketContainer.getInstanceManager();
 Thread t = Thread.currentThread();
 ClassLoader cl = t.getContextClassLoader();
 t.setContextClassLoader(applicationClassLoader);
 try {
 localEndpoint.onClose(this, closeReason);
+if (instanceManager != null) {
+instanceManager.destroyInstance(localEndpoint);
+}
 } catch (Throwable throwable) {
 ExceptionUtils.handleThrowable(throwable);
 localEndpoint.onError(this, throwable);

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1712736=1712735=1712736=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
Thu Nov  5 10:29:53 2015
@@ -64,6 +64,7 @@ import javax.websocket.WebSocketContaine
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
@@ -127,6 +128,15 @@ public class WsWebSocketContainer
 private int backgroundProcessCount 

svn commit: r1712738 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ res/checkstyle/ webapps/docs/

[remm]

Author: remm
Date: Thu Nov  5 10:35:27 2015
New Revision: 1712738

URL: http://svn.apache.org/viewvc?rev=1712738=rev
Log:
Port r1712575: Use InstanceManager for server endpoint instances.

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

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 10:35:27 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
-/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
 

Re: svn commit: r1712738 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ res/checkstyle/ webapps/docs/

[Konstantin Kolinko]

2015-11-05 13:35 GMT+03:00  :
> Author: remm
> Date: Thu Nov  5 10:35:27 2015
> New Revision: 1712738
>
> URL: http://svn.apache.org/viewvc?rev=1712738=rev
> Log:
> Port r1712575: Use InstanceManager for server endpoint instances.
>
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
> 
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>


Technically, Buildbot reports a test failure
https://ci.apache.org/builders/tomcat-7-trunk/builds/150

   [concat] Testsuites with failed tests:
   [concat] 
TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.BIO.txt
   [concat] 
TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.NIO.txt

https://ci.apache.org/projects/tomcat/tomcat7/logs/logs/1712738/TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.BIO.txt
https://ci.apache.org/projects/tomcat/tomcat7/logs/logs/1712738/TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.NIO.txt

Caused by: java.lang.RuntimeException: Not implemented
at 
org.apache.catalina.filters.TesterServletContext.getAttribute(TesterServletContext.java:157)
at 
org.apache.tomcat.websocket.server.WsServerContainer.(WsServerContainer.java:102)
at 
org.apache.tomcat.websocket.server.TestWsServerContainer.testDuplicatePaths_03(TestWsServerContainer.java:199)

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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[Bug 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

--- Comment #5 from Mark Thomas  ---
Yes, in a new bugzulla enhancement please.

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

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

[Bug 58582] org.apache.catalina.realm.CombinedRealm should implement backgroundProcess

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58582

--- Comment #4 from Aidan  ---
BTW, I have a simple enhancement patch for
org.apache.catalina.realm.MemoryRealm that uses backgroundProcess() to reload
conf/tomcat-users.xml when it's modified - would you be interested in that ?

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

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

--- Comment #19 from Violeta Georgieva  ---
(In reply to Huxing Zhang from comment #18)
> Created attachment 33230 [details]
> patch including latest ConfigFileLoader enhancement.

Hi,

Please do not remove DirContextURLStreamHandlerFactory, users can use it to
provide additional stream handlers.

Regards,
Violeta

-- 
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: r1712826 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/

[remm]

Author: remm
Date: Thu Nov  5 17:29:20 2015
New Revision: 1712826

URL: http://svn.apache.org/viewvc?rev=1712826=rev
Log:
- Add (another, sorry) classloader keyed static map to retrieve the 
InstanceManager from anywhere, as a last resort.
- Pass along the application classloader during upgrade, using a token object.
- Don't use the InstanceManager for internal upgrade handlers (no naming, etc), 
this would optimize websockets and HTTP/2 upgrade.
- Set a proper context classloader environment for upgrade handler init/destroy 
and use the InstanceManager, except for internal handlers where they are 
responsible for it.
- Support the InstanceManager for the websockets client endpoints.

Added:
tomcat/trunk/java/org/apache/coyote/UpgradeToken.java
tomcat/trunk/java/org/apache/coyote/http2/AsyncHttp2UpgradeHandler.jav
tomcat/trunk/java/org/apache/tomcat/InstanceManagerBindings.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/res/checkstyle/org-import-control.xml

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=1712826=1712825=1712826=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov  5 
17:29:20 2015
@@ -80,6 +80,8 @@ 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.coyote.http11.upgrade.InternalHttpUpgradeHandler;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -1844,12 +1846,18 @@ public class Request implements HttpServ
 
 T handler;
 try {
-handler = (T) 
getContext().getInstanceManager().newInstance(httpUpgradeHandlerClass);
+// Do not go through the instance manager for internal Tomcat 
classes since they don't need injection
+if 
(InternalHttpUpgradeHandler.class.isAssignableFrom(httpUpgradeHandlerClass)) {
+handler = (T) httpUpgradeHandlerClass.newInstance();
+} else {
+handler = (T) 
getContext().getInstanceManager().newInstance(httpUpgradeHandlerClass);
+}
 } catch (InstantiationException | IllegalAccessException | 
InvocationTargetException | NamingException e) {
 throw new ServletException(e);
 }
+UpgradeToken upgradeToken = new UpgradeToken(handler, 
getContext().getLoader().getClassLoader());
 
-coyoteRequest.action(ActionCode.UPGRADE, handler);
+coyoteRequest.action(ActionCode.UPGRADE, upgradeToken);
 
 // Output required by RFC2616. Protocol specific headers should have
 // already been set.

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1712826=1712825=1712826=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Nov  5 
17:29:20 2015
@@ -113,6 +113,7 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.naming.ContextBindings;
 import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.InstanceManagerBindings;
 import org.apache.tomcat.JarScanner;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.IntrospectionUtils;
@@ -5147,9 

[Bug 58590] New: org.apache.catalina.realm.MemoryRealm can use backgroundProcess() to reload tomcat-users.xml when it changes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58590

Bug ID: 58590
   Summary: org.apache.catalina.realm.MemoryRealm can use
backgroundProcess() to reload tomcat-users.xml when it
changes
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: apa...@leocap.com

Based on a derived class that I created and tested successfully with Tomcat 8,
I suggest the following lines be added to MemoryRealm in order to give it this
capability:


private Date _lastUpdate = null;
private File _usersFile = null;


public MemoryRealm()
{
_lastUpdate = new Date();
_usersFile = new File( getPathname() );
}


/**
 * The default 10 second value for the Engine's backgroundProcessorDelay
XML attribute
 * will cause this method to be called that often.
 */
@Override
public void backgroundProcess()
{
try {
// only reload if file has changed since we last loaded it
if( _lastUpdate.getTime() < _usersFile.lastModified() ) {
_lastUpdate = new Date();

log.info( "reloading " + getPathname() );

stop();
principals.clear();
start(); // trigger a repopulation (from tomcat-users.xml)
}
}
catch( Exception ex ) {
log.error( "Failed to re-initialise realm: ", ex );
}
}

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

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

Violeta Georgieva  changed:

   What|Removed |Added

  Attachment #33220|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

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

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=56777

Violeta Georgieva  changed:

   What|Removed |Added

  Attachment #33193|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

svn commit: r1712830 - in /tomcat/trunk/java/org/apache/coyote: UpgradeToken.java http2/AsyncHttp2UpgradeHandler.jav

[remm]

Author: remm
Date: Thu Nov  5 17:36:33 2015
New Revision: 1712830

URL: http://svn.apache.org/viewvc?rev=1712830=rev
Log:
Native style and remove some experiment code.

Removed:
tomcat/trunk/java/org/apache/coyote/http2/AsyncHttp2UpgradeHandler.jav
Modified:
tomcat/trunk/java/org/apache/coyote/UpgradeToken.java   (props changed)

Propchange: tomcat/trunk/java/org/apache/coyote/UpgradeToken.java
--
svn:eol-style = native



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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1712860 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/el/ test/org/apache/jasper/compiler/ test

[markt]

Author: markt
Date: Thu Nov  5 20:00:46 2015
New Revision: 1712860

URL: http://svn.apache.org/viewvc?rev=1712860=rev
Log:
Further work on https://bz.apache.org/bugzilla/show_bug.cgi?id=57136
Add a configuration option that allows EL expressions in attribute values to 
use JSP attribute quoting or not. The default (and specification compliant 
behaviour) is not to.

Added:
tomcat/tc8.0.x/trunk/test/webapp/el-misc-no-quote-attribute-el.jsp
  - copied unchanged from r1712859, 
tomcat/trunk/test/webapp/el-misc-no-quote-attribute-el.jsp
tomcat/tc8.0.x/trunk/test/webapp/el-misc-with-quote-attribute-el.jsp
  - copied unchanged from r1712859, 
tomcat/trunk/test/webapp/el-misc-with-quote-attribute-el.jsp
Removed:
tomcat/tc8.0.x/trunk/test/webapp/el-misc.jsp
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java

tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 20:00:46 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
 

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1712837 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

[remm]

Author: remm
Date: Thu Nov  5 18:04:51 2015
New Revision: 1712837

URL: http://svn.apache.org/viewvc?rev=1712837=rev
Log:
Trigger a new build (just in case; the test does work for me).

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java

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=1712837=1712836=1712837=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov  5 
18:04:51 2015
@@ -1843,7 +1843,6 @@ public class Request implements HttpServ
 @Override
 public  T upgrade(
 Class httpUpgradeHandlerClass) throws java.io.IOException, 
ServletException {
-
 T handler;
 try {
 // Do not go through the instance manager for internal Tomcat 
classes since they don't need injection



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

Re: tomcat timeout handling

[ecki]

This is/was a bug report against the documentation which does not document the 
timeout correctly.

-- 
http://bernd.eckenfels.net

-Original Message-
From: "Rémy Maucherat" 
To: Tomcat Developers List 
Sent: Do., 05 Nov. 2015 10:09
Subject: Re: tomcat timeout handling

2015-11-05 3:29 GMT+01:00 Bernd Eckenfels :

> I think this is wrong, it does not only apply to the initial line but
> also the output. Maybe this could be clarified, especially in relation
> with uploadTimeout and keepAliveTimeout. Especially when does the
> connector transition from one to the other.
>
> Obviously, the connection timeout is also used for output. Input is
specifically discussed since client's input is usually far slower and less
reliable, especially when dealing with large posts.

This was discussed at length in the relevant BZ, which you looked at. The
situation is now understood but there is no better solution than the
current behavior. In your situation, the most efficient is probably to
configure a smaller output buffer.

Note: I believe the message should be on the user list.

Rémy

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

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

[markt]

Author: markt
Date: Thu Nov  5 19:55:00 2015
New Revision: 1712859

URL: http://svn.apache.org/viewvc?rev=1712859=rev
Log:
Further work on https://bz.apache.org/bugzilla/show_bug.cgi?id=57136
Add a configuration option that allows EL expressions in attribute values to 
use JSP attribute quoting or not. The default (and specification compliant 
behaviour) is not to.

Added:
tomcat/trunk/test/webapp/el-misc-no-quote-attribute-el.jsp
  - copied unchanged from r1712812, tomcat/trunk/test/webapp/el-misc.jsp
tomcat/trunk/test/webapp/el-misc-with-quote-attribute-el.jsp   (with props)
Removed:
tomcat/trunk/test/webapp/el-misc.jsp
Modified:
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1712859=1712858=1712859=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Nov  5 
19:55:00 2015
@@ -205,6 +205,8 @@ public final class EmbeddedServletOption
  */
 private boolean strictQuoteEscaping = true;
 
+private boolean quoteAttributeEL = false;
+
 public String getProperty(String name ) {
 return settings.getProperty( name );
 }
@@ -215,6 +217,15 @@ public final class EmbeddedServletOption
 }
 }
 
+public void setQuoteAttributeEL(boolean b) {
+this.quoteAttributeEL = b;
+}
+
+@Override
+public boolean getQuoteAttributeEL() {
+return quoteAttributeEL;
+}
+
 /**
  * Are we keeping generated code around?
  */
@@ -765,6 +776,18 @@ public final class EmbeddedServletOption
 }
 }
 
+String quoteAttributeEL = config.getInitParameter("quoteAttributeEL");
+if (quoteAttributeEL != null) {
+if (quoteAttributeEL.equalsIgnoreCase("true")) {
+this.quoteAttributeEL = true;
+} else if (quoteAttributeEL.equalsIgnoreCase("false")) {
+this.quoteAttributeEL = false;
+} else {
+if (log.isWarnEnabled()) {
+
log.warn(Localizer.getMessage("jsp.warning.quoteAttributeEL"));
+}
+}
+}
 
 // Setup the global Tag Libraries location cache for this
 // web-application.

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712859=1712858=1712859=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 19:55:00 2015
@@ -137,6 +137,7 @@ public class JspC extends Task implement
 protected static final String SWITCH_VALIDATE_XML = "-validateXml";
 protected static final String SWITCH_NO_BLOCK_EXTERNAL = 
"-no-blockExternal";
 protected static final String SWITCH_NO_STRICT_QUOTE_ESCAPING = 
"-no-strictQuoteEscaping";
+protected static final String SWITCH_QUOTE_ATTRIBUTE_EL = 
"-quoteAttributeEL";
 protected static final String SHOW_SUCCESS ="-s";
 protected static final String LIST_ERRORS = "-l";
 protected static final int INC_WEBXML = 10;
@@ -171,6 +172,7 @@ public class JspC extends Task implement
 protected boolean validateXml;
 protected boolean blockExternal = true;
 protected boolean strictQuoteEscaping = true;
+protected boolean quoteAttributeEL = false;
 protected boolean xpoweredBy;
 protected boolean mappedFile = false;
 protected boolean poolingEnabled = true;
@@ -387,6 +389,8 @@ public class JspC extends Task implement
 setBlockExternal(false);
 } else if (tok.equals(SWITCH_NO_STRICT_QUOTE_ESCAPING)) {
 setStrictQuoteEscaping(false);
+} else if (tok.equals(SWITCH_QUOTE_ATTRIBUTE_EL)) {
+setQuoteAttributeEL(true);
 } else {
 if (tok.startsWith("-")) {
 throw new JasperException("Unrecognized option: " + tok +
@@ -903,6 +907,15 @@ public class JspC extends Task implement
 return strictQuoteEscaping;
 }
 
+public void setQuoteAttributeEL(boolean b) {
+quoteAttributeEL = b;
+}
+
+@Override
+public boolean getQuoteAttributeEL() {
+return quoteAttributeEL;
+}
+
 public void 

[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57136

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #26 from Mark Thomas  ---
A configuration option has been added to the JSP Servlet.

-- 
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 58590] org.apache.catalina.realm.MemoryRealm can use backgroundProcess() to reload tomcat-users.xml when it changes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58590

--- Comment #1 from Konstantin Kolinko  ---
1. Code conventions:
http://tomcat.apache.org/getinvolved.html

Actually Sun's conventions but with spaces instead of tabs.

2. backgroundProcess() runs frequently. I see no need to perform this work on
each run.

3. It shall work without stopping and starting the realm. Users should not be
locked from the system while it reloads.

4. MemoryRealm is rarely used.  The usual configuration uses UserDatabaseRealm
+ MemoryUserDatabase (created by MemoryUserDatabaseFactory).

5. It should be possible to turn this feature on or off.

I do not know what the default should be.
On one hand we already have  so we are already checking
hard drive by default.

On other hand, on production systems such setting is likely to be off by
default (as there is an expectation that nobody will ever update that file).

6. There shall be an explicit method to reload and an explicit method to
perform an up-to-date check - so that it were possible to call them via JMX.

-- 
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: r1712876 - /tomcat/trunk/build.properties.default

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 23:43:42 2015
New Revision: 1712876

URL: http://svn.apache.org/viewvc?rev=1712876=rev
Log:
Update to Checkstyle 6.12.1

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1712876=1712875=1712876=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Nov  5 23:43:42 2015
@@ -215,7 +215,7 @@ objenesis.loc=https://objenesis.googleco
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
 # - Checkstyle, version 6.0 or later -
-checkstyle.version=6.12
+checkstyle.version=6.12.1
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar



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

Re: tomcat timeout handling

[Rémy Maucherat]

2015-11-05 20:57 GMT+01:00 :

> This is/was a bug report against the documentation which does not document
> the timeout correctly.
>
> Yes, ok, it could be improved :)

Rémy

[Bug 58590] org.apache.catalina.realm.MemoryRealm can use backgroundProcess() to reload tomcat-users.xml when it changes

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58590

--- Comment #2 from Aidan  ---
(In reply to Konstantin Kolinko from comment #1)

Hi Konstantin,

> 1. Code conventions:
> http://tomcat.apache.org/getinvolved.html
> 
> Actually Sun's conventions but with spaces instead of tabs.

Ok, I can edit to conform with that.

> 2. backgroundProcess() runs frequently. I see no need to perform this work
> on each run.

Every 10 seconds for this container, by default, I believe - that doesn't seem
too often to merely check the modified date of a file.

> 3. It shall work without stopping and starting the realm. Users should not
> be locked from the system while it reloads.

OK, fair point, I can try to address that.

> 4. MemoryRealm is rarely used.  The usual configuration uses
> UserDatabaseRealm + MemoryUserDatabase (created by
> MemoryUserDatabaseFactory).

True, but it wasn't clear to me how to effect the same change in
UserDatabaseRealm and I was a bit pushed for time.

> 5. It should be possible to turn this feature on or off.

As I wasn't proposing this change for the default Realm I didn't think that was
necessary.

> I do not know what the default should be.
> On one hand we already have  so we are already
> checking hard drive by default.
> 
> On other hand, on production systems such setting is likely to be off by
> default (as there is an expectation that nobody will ever update that file).

I think that setting only relates to .war files ?? AFAIK there is currently no
mechanism to force re-reading of tomcat-users.xml without a restart. But I
accept that if a user requires runtime user/role loading then they should
probably use a JNDI or JDBC-based realm instead. However, I think it's nice to
have an out-of-the-box alternative that has this capability. 
I wrote this patch at the bank where I work where we use Tomcat (with the APR)
to serve several hundred internal users 24x5. We rarely update tomcat-users.xml
but when we do we have to perform a disruptive restart. The patch fixes that,
at least.

> 6. There shall be an explicit method to reload and an explicit method to
> perform an up-to-date check - so that it were possible to call them via JMX.

I hadn't thought of that. But as cool and useful as JMX is, it's beyond a lot
of the casual users whom this patch is aimed at, I suspect.

Having said all that, I'm happy to rework it as best I can in order to address
all your points or for you to simply reject it.

Kind Regards,
Aidan

-- 
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: r1712878 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Nov  5 23:47:22 2015
New Revision: 1712878

URL: http://svn.apache.org/viewvc?rev=1712878=rev
Log:
Update to Checkstyle 6.12.1
Merged r1712876 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 23:47:22 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
 

Re: Tomcat Native 1.2.2

[Huxing Zhang]

Hi All,

I have solved the problem building tcnative on Mac OSX.

The message worth noticing is:
ld: warning: ld: warning: ignoring file /usr/local/openssl/lib/libcrypto.a, 
file was built for archive which is not the architecture being linked (x86_64): 
/usr/local/openssl/lib/libcrypto.aignoring file 
/usr/local/openssl/lib/libssl.a, file was built for archive which is not the 
architecture being linked (x86_64): /usr/local/openssl/lib/libssl.a

The root cause is openssl is not correctly compiled with the right architecture.

Recompile openssl with the following configuration will solve this problem.

cd $openssl_source_dir
./Configure darwin64-x86_64-cc --prefix=/usr/local/openssl shared
make
make install

I am sorry for posting such an email in dev list.

Best regards,
Huxing

--
From:Huxing Zhang 
Time:2015 Nov 4 (Wed) 17:37
To:Tomcat Developers List 
Subject:Re: Tomcat Native 1.2.2


Hi All,

I have trouble running tcnative test under Mac OSX(EI Capitan).

I used the jdk8,  apr 1.5.2, openssl 1.0.2d(OpenSSL 1.0.2d 9 Jul 2015) to build 
the tcnative code in trunk.

I followed the instructions described in native/BUILDING:

Step by step build output is:
1) sh buildconf --with-apr=/Users/wangtao/work/apache-tomcat/apr/apr-1.5.2

Looking for apr source in /Users/wangtao/work/apache-tomcat/apr/apr-1.5.2
Creating configure ...
Generating 'make' outputs ...
rebuilding rpm spec file
Using version '1.2.2' and release '1' in RPM spec file

2) ./configure --with-apr=/usr/local/apr --with-ssl=/usr/local/openssl
checking build system type... x86_64-apple-darwin15.0.0
checking host system type... x86_64-apple-darwin15.0.0
checking target system type... x86_64-apple-darwin15.0.0
checking for a BSD-compatible install... /usr/bin/install -c
checking for working mkdir -p... yes
Tomcat Native Version: 1.2.2
checking for chosen layout... tcnative
checking for APR... yes
configure: APR 1.5.2 detected.
  setting CC to "gcc"
  setting CPP to "gcc -E"
  adding "-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include" to 
TCNATIVE_PRIV_INCLUDES
checking for JDK os include directory...  darwin
  adding "-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin" to 
TCNATIVE_PRIV_INCLUDES
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking for OpenSSL library... using openssl from /usr/local/openssl/lib and 
/usr/local/openssl/include
checking OpenSSL library version >= 1.0.2... ok
checking for OpenSSL DSA support... yes
  adding "-I/usr/local/openssl/include" to TCNATIVE_PRIV_INCLUDES
  setting TCNATIVE_LDFLAGS to "-L/usr/local/openssl/lib -lssl -lcrypto"
  adding "-DHAVE_OPENSSL" to CFLAGS
  setting TCNATIVE_LIBS to ""
  setting TCNATIVE_LIBS to " /usr/local/apr/lib/libapr-1.la -lpthread"
checking for apr_pollset_wakeup in -lapr-1... yes
  adding "-DHAVE_POLLSET_WAKEUP" to CFLAGS
configure: creating ./config.status
config.status: creating tcnative.pc
config.status: creating Makefile
config.status: executing default commands

3) make
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o 
src/address.lo -c src/address.c && touch src/address.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/bb.lo -c 
src/bb.c && touch src/bb.lo
/bin/sh /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2   
-DHAVE_CONFIG_H  -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -DDARWIN_10   -g -O2 
-DHAVE_OPENSSL -DHAVE_POLLSET_WAKEUP   
-I/Users/wangtao/work/apache-tomcat/tcnative/trunk/native/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include 
-I/Users/wangtao/.jenv/candidates/java/1.8.0_51/include/darwin 
-I/usr/local/openssl/include  -I/usr/local/apr/include/apr-1   -o src/dir.lo -c 
src/dir.c && touch src/dir.lo
/bin/sh /usr/local/apr/build-1/libtool --silent 

[Bug 58585] Tomcat 9.0.0-dev (@r1712593) AccessControlException on first access via HTTPS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58585

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #4 from Mark Thomas  ---
Thanks. Fixed, along with a couple of others thsat emerged once these were
fixed.

-- 
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: r1712866 - in /tomcat/trunk/java/org/apache: catalina/connector/OutputBuffer.java catalina/security/SecurityClassLoad.java coyote/http2/Stream.java

[markt]

Author: markt
Date: Thu Nov  5 21:06:00 2015
New Revision: 1712866

URL: http://svn.apache.org/viewvc?rev=1712866=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58585
Fix security exceptions when starting with a security manager.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1712866=1712865=1712866=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Nov  
5 21:06:00 2015
@@ -558,7 +558,7 @@ public class OutputBuffer extends Writer
 enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
 }
 
-final Charset charset = B2CConverter.getCharset(enc);
+final Charset charset = getCharset(enc);
 SynchronizedStack stack = encoders.get(charset);
 if (stack == null) {
 stack = new SynchronizedStack<>();
@@ -572,6 +572,30 @@ public class OutputBuffer extends Writer
 }
 }
 
+
+private static Charset getCharset(String encoding) throws IOException {
+if (Globals.IS_SECURITY_ENABLED) {
+try {
+return AccessController.doPrivileged(
+new PrivilegedExceptionAction() {
+@Override
+public Charset run() throws IOException {
+return B2CConverter.getCharset(encoding);
+}
+});
+} catch (PrivilegedActionException ex) {
+Exception e = ex.getException();
+if (e instanceof IOException) {
+throw (IOException) e;
+} else {
+throw new IOException(ex);
+}
+}
+} else {
+return B2CConverter.getCharset(encoding);
+}
+}
+
 
 private static C2BConverter createConverter(Charset charset) throws 
IOException {
 if (Globals.IS_SECURITY_ENABLED){

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1712866=1712865=1712866=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu 
Nov  5 21:06:00 2015
@@ -70,6 +70,9 @@ public final class SecurityClassLoad {
  "ApplicationDispatcher$PrivilegedInclude");
 loader.loadClass
 (basePackage +
+ "ApplicationPushBuilder");
+loader.loadClass
+(basePackage +
 "AsyncContextImpl");
 loader.loadClass
 (basePackage +
@@ -167,6 +170,7 @@ public final class SecurityClassLoad {
 // Make sure system property is read at this point
 Class clazz = loader.loadClass(basePackage + "Constants");
 clazz.newInstance();
+loader.loadClass(basePackage + "http2.Stream$1");
 }
 
 
@@ -232,6 +236,9 @@ public final class SecurityClassLoad {
  "OutputBuffer$1");
 loader.loadClass
 (basePackage +
+ "OutputBuffer$2");
+loader.loadClass
+(basePackage +
  "CoyoteInputStream$1");
 loader.loadClass
 (basePackage +
@@ -268,10 +275,17 @@ public final class SecurityClassLoad {
 loader.loadClass(basePackage + "util.buf.StringCache");
 loader.loadClass(basePackage + "util.buf.StringCache$ByteEntry");
 loader.loadClass(basePackage + "util.buf.StringCache$CharEntry");
+// collections
+loader.loadClass(basePackage + 
"util.collections.CaseInsensitiveKeyMap");
+loader.loadClass(basePackage + 
"util.collections.CaseInsensitiveKeyMap$EntryImpl");
+loader.loadClass(basePackage + 
"util.collections.CaseInsensitiveKeyMap$EntryIterator");
+loader.loadClass(basePackage + 
"util.collections.CaseInsensitiveKeyMap$EntrySet");
+loader.loadClass(basePackage + 
"util.collections.CaseInsensitiveKeyMap$Key");
 // http
+loader.loadClass(basePackage + "util.http.CookieProcessor");
+loader.loadClass(basePackage + "util.http.NamesEnumerator");
 // Make sure system property is read at this point
-Class clazz = loader.loadClass(
-basePackage + "util.http.FastHttpDateFormat");
+Class clazz = 

[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57136

--- Comment #27 from Yoni Amir  ---
Thank you for providing a configuration option for this. Any chance to
elaborate what the option name is, and where (and if) it will be documented?
I apologize if these are trivial questions, I am not sure where to find this
information.
Thanks,
Yoni

-- 
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: r1712899 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/ java/org/apache/tomcat/util/http/ test/org/apache/catalina/comet/ test/org/apache/catalina/core/

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 02:20:13 2015
New Revision: 1712899

URL: http://svn.apache.org/viewvc?rev=1712899=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547
Several remaining replacements of X.valueOf(String).xValue() with simple 
x.parseX().

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/SetCookieSupport.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 02:20:13 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: r1712904 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/tagplugins/jstl/Util.java

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 03:11:05 2015
New Revision: 1712904

URL: http://svn.apache.org/viewvc?rev=1712904=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
Revert one unneeded change from r1712227
It is indexOf(concatenated string) there, not indexOf(char).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 03:11:05 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
-/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
 

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

[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-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 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-nio2 :  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-nio2/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-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 41 mins 41 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-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-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-20151106.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151106/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-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
 

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 39 mins 11 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-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151106/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151106.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 
.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151106/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-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
 

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

[Huxing Zhang]

Hi Mark,

Unit test failed because of this commit. Full details can be found in [1].

Test case failure exception stack trace:

Testcase: testZeroLengthRequestBodyPostA took 3.038 sec
FAILED
expected:<200> but was:<500>
junit.framework.AssertionFailedError: expected:<200> but was:<500>
at 
org.apache.coyote.ajp.TestAbstractAjpProcessor.validateResponseHeaders(TestAbstractAjpProcessor.java:830)
at 
org.apache.coyote.ajp.TestAbstractAjpProcessor.doTestZeroLengthRequestBody(TestAbstractAjpProcessor.java:743)
at 
org.apache.coyote.ajp.TestAbstractAjpProcessor.testZeroLengthRequestBodyPostA(TestAbstractAjpProcessor.java:706)

06-Nov-2015 10:44:32.685 SEVERE [ajp-apr-127.0.0.1-auto-7-exec-1] 
org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for 
servlet [ReadBody] in context with path [] threw exception
 java.lang.UnsupportedOperationException: The Comet protocol is not supported 
by this connector
at 
org.apache.coyote.ajp.AbstractAjpProcessor.action(AbstractAjpProcessor.java:622)
at org.apache.coyote.Request.action(Request.java:380)
at 
org.apache.catalina.connector.InputBuffer.available(InputBuffer.java:249)
at 
org.apache.catalina.connector.CoyoteInputStream.available(CoyoteInputStream.java:124)
at 
org.apache.coyote.ajp.TestAbstractAjpProcessor$ReadBodyServlet.doRequest(TestAbstractAjpProcessor.java:968)
at 
org.apache.coyote.ajp.TestAbstractAjpProcessor$ReadBodyServlet.doPost(TestAbstractAjpProcessor.java:955)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:648)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:729)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at 
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:212)
at 
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)
at 
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:502)
at 
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:141)
at 
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
at 
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)
at 
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:518)
at 
org.apache.coyote.ajp.AbstractAjpProcessor.process(AbstractAjpProcessor.java:849)
at 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:673)
at 
org.apache.tomcat.util.net.AprEndpoint$SocketWithOptionsProcessor.run(AprEndpoint.java:2437)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at 
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

If protocol is AJP, AbstractAjpProcessor.action will throw 
UnsupportedOperationException.

In org.apache.catalina.connector.InputBuffer#avaliable(), readForAvailable is 
not enough to avoid IS_COMET action.
I think we should also check the protocol, since IS_COMET only support HTTP.

The only way to I can figure out is to use 
Thread.currentThread.getName().isStartsWith("http"), but maybe there is 
something better.

[1] 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html

Thanks,
Huxing Zhang
--
From:markt 
Time:2015 Nov 4 (Wed) 18:55
To:dev 
Subject:svn commit: r1712529 - in /tomcat/tc8.0.x/trunk/java/org/apache: 
catalina/connector/ catalina/core/ coyote/ coyote/ajp/ coyote/http11/


Author: markt
Date: Wed Nov  4 10:55:12 2015
New Revision: 1712529

URL: http://svn.apache.org/viewvc?rev=1712529=rev
Log:
Follow-up to r1712081.
Comet is not-blocking too, so it also needs to trigger a read on a call to 
available() if no bytes are in the buffer

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1712529=1712528=1712529=diff

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

[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 3 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: 39 mins 33 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-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-20151106-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-20151106.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-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-20151106/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
 

svn commit: r1712901 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/manager/ java/org/apache/coyote/ java/org/apache/el/parser

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 02:45:03 2015
New Revision: 1712901

URL: http://svn.apache.org/viewvc?rev=1712901=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547
Several remaining replacements of X.valueOf(String).xValue() with simple 
x.parseX().

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 02:45:03 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
-/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
 

svn commit: r1712902 - /tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 02:59:43 2015
New Revision: 1712902

URL: http://svn.apache.org/viewvc?rev=1712902=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
Revert one unneeded change from r1712225
It is indexOf(concatenated string) there, not indexOf(char).

Modified:
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java

Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1712902=1712901=1712902=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Fri Nov  6 
02:59:43 2015
@@ -154,7 +154,7 @@ public class Util {
 public static String stripSession(String url) {
 StringBuilder u = new StringBuilder(url);
 int sessionStart;
-while ((sessionStart = u.toString().indexOf(';' + 
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
+while ((sessionStart = u.toString().indexOf(";" + 
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
 int sessionEnd = u.toString().indexOf(';', sessionStart + 1);
 if (sessionEnd == -1)
 sessionEnd = u.toString().indexOf('?', sessionStart + 1);



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

svn commit: r1712903 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/tagplugins/jstl/Util.java

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 03:05:16 2015
New Revision: 1712903

URL: http://svn.apache.org/viewvc?rev=1712903=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
Revert one unneeded change from r1712226
It is indexOf(concatenated string) there, not indexOf(char).

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java

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

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 03:18:07 2015
New Revision: 1712905

URL: http://svn.apache.org/viewvc?rev=1712905=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
String.lastIndexOf(String) -> String.lastIndexOf(char) where possible

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1712905=1712904=1712905=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Nov  
6 03:18:07 2015
@@ -346,7 +346,7 @@ public class ApplicationContext
 
 if (file == null)
 return (null);
-int period = file.lastIndexOf(".");
+int period = file.lastIndexOf('.');
 if (period < 0)
 return (null);
 String extension = file.substring(period + 1);

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1712905=1712904=1712905=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Nov  6 
03:18:07 2015
@@ -655,8 +655,8 @@ public abstract class RealmBase extends
 for(int k=0; k < patterns.length && !matched; k++) {
 String pattern = patterns[k];
 if(pattern.startsWith("*.")){
-int slash = uri.lastIndexOf("/");
-int dot = uri.lastIndexOf(".");
+int slash = uri.lastIndexOf('/');
+int dot = uri.lastIndexOf('.');
 if(slash >= 0 && dot > slash &&
dot != uri.length()-1 &&
uri.length()-dot == pattern.length()-1) {

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1712905=1712904=1712905=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Nov  6 
03:18:07 2015
@@ -1166,7 +1166,7 @@ public final class CGIServlet extends Ht
 
 // create directories
 String dirPath = destPath.toString().substring(
-0,destPath.toString().lastIndexOf("/"));
+0,destPath.toString().lastIndexOf('/'));
 File dir = new File(dirPath);
 if (!dir.mkdirs() && !dir.isDirectory()) {
 if (debug >= 2) {

Modified: tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1712905=1712904=1712905=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java Fri 
Nov  6 03:18:07 2015
@@ -59,7 +59,7 @@ public class FileResource extends Abstra
 // Need to return the mounted name, not the real name
 int endOfName = webAppPath.length() - 1;
 name = webAppPath.substring(
-webAppPath.lastIndexOf("/", endOfName - 1) + 1,
+webAppPath.lastIndexOf('/', endOfName - 1) + 1,
 endOfName);
 }
 } else {

Modified: 
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?rev=1712905=1712904=1712905=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java 
Fri Nov  6 03:18:07 2015
@@ -111,7 +111,7 @@ class 

svn commit: r1712898 - /tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 02:18:00 2015
New Revision: 1712898

URL: http://svn.apache.org/viewvc?rev=1712898=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547
One remaining replacement of X.valueOf(String).xValue() with simple x.parseX().

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java?rev=1712898=1712897=1712898=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardHostValve.java Fri 
Nov  6 02:18:00 2015
@@ -133,8 +133,7 @@ public class TestStandardHostValve exten
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
-int error =
-Integer.valueOf(req.getParameter("errorCode")).intValue();
+int error = Integer.parseInt(req.getParameter("errorCode"));
 resp.sendError(error);
 }
 }



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

svn commit: r1712906 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/realm/ java/org/apache/catalina/servlets/ java/org/apache/catalina/webresources/ java/org/ap

[kkolinko]

Author: kkolinko
Date: Fri Nov  6 03:27:36 2015
New Revision: 1712906

URL: http://svn.apache.org/viewvc?rev=1712906=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
String.lastIndexOf(String) -> String.lastIndexOf(char) where possible

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java

tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  6 03:27: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
 

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

[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-bio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 3 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-bio :  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-bio/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-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 40 mins 44 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-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-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-20151106.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151106-native-src.tar.gz
 -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151106/bin/o
 penssl -Dexecute.test.bio=true -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
 

[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57136

--- Comment #28 from Violeta Georgieva  ---
(In reply to Yoni Amir from comment #27)
> Thank you for providing a configuration option for this. Any chance to
> elaborate what the option name is, and where (and if) it will be documented?
> I apologize if these are trivial questions, I am not sure where to find this
> information.
> Thanks,
> Yoni

Here it is
https://ci.apache.org/projects/tomcat/tomcat9/docs/jasper-howto.html
strictQuoteEscaping

-- 
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: r1712738 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ res/checkstyle/ webapps/docs/

[Rémy Maucherat]

2015-11-05 14:24 GMT+01:00 Konstantin Kolinko :

> 2015-11-05 13:35 GMT+03:00  :
> > Author: remm
> > Date: Thu Nov  5 10:35:27 2015
> > New Revision: 1712738
> >
> > URL: http://svn.apache.org/viewvc?rev=1712738=rev
> > Log:
> > Port r1712575: Use InstanceManager for server endpoint instances.
> >
> > Modified:
> > tomcat/tc7.0.x/trunk/   (props changed)
> >
>  tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
> > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
> >
>  
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
> >
>  
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
> > tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
> > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> >
>
>
> Technically, Buildbot reports a test failure
> https://ci.apache.org/builders/tomcat-7-trunk/builds/150
>
>[concat] Testsuites with failed tests:
>[concat]
> TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.BIO.txt
>[concat]
> TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.NIO.txt
>
>
> https://ci.apache.org/projects/tomcat/tomcat7/logs/logs/1712738/TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.BIO.txt
>
> https://ci.apache.org/projects/tomcat/tomcat7/logs/logs/1712738/TEST-org.apache.tomcat.websocket.server.TestWsServerContainer.NIO.txt
>
> Caused by: java.lang.RuntimeException: Not implemented
> at
> org.apache.catalina.filters.TesterServletContext.getAttribute(TesterServletContext.java:157)
> at
> org.apache.tomcat.websocket.server.WsServerContainer.(WsServerContainer.java:102)
> at
> org.apache.tomcat.websocket.server.TestWsServerContainer.testDuplicatePaths_03(TestWsServerContainer.java:199)
>
> Yes, I forgot to port the test fix. My bad.

Rémy

svn commit: r1712761 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/filters/TesterServletContext.java

[remm]

Author: remm
Date: Thu Nov  5 13:33:06 2015
New Revision: 1712761

URL: http://svn.apache.org/viewvc?rev=1712761=rev
Log:
Port test "fix" for websockets.

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 13:33:06 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: r1712766 - /tomcat/trunk/webapps/docs/config/systemprops.xml

[markt]

Author: markt
Date: Thu Nov  5 13:36:16 2015
New Revision: 1712766

URL: http://svn.apache.org/viewvc?rev=1712766=rev
Log:
Deprecate the STRICT_QUOTE_ESCAPING system property.

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

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1712766=1712765=1712766=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Nov  5 13:36:16 2015
@@ -139,9 +139,8 @@
 
 
 
-  If false the requirements for escaping quotes in JSP
-  attributes will be relaxed so that an unescaped quote will not
-  cause an error.
+  Deprecated. Configures the default setting for the
+  strictQuoteEscaping JSP initialisation paramater.
   If not specified, the specification compliant default of
   true will be used.
 



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

svn commit: r1712767 - in /tomcat/trunk: conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Thu Nov  5 13:36:22 2015
New Revision: 1712767

URL: http://svn.apache.org/viewvc?rev=1712767=rev
Log:
Remove the deprecated STRICT_QUOTE_ESCAPING system property

Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/jasper-howto.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1712767=1712766=1712767=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov  5 13:36:22 2015
@@ -246,9 +246,6 @@
   
   
   
-  
-  
-  
 
 
 jsp

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1712767=1712766=1712767=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Nov  5 
13:36:22 2015
@@ -200,18 +200,10 @@ public final class EmbeddedServletOption
 private int jspIdleTimeout = -1;
 
 /**
- * System property that controls if the strict quoting rules are applied
- * when parsing attribute values that use scriptlet expressions (<%=...%>).
- */
-private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= 
Boolean.parseBoolean(
-System.getProperty(
-"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
-"true"));
-/**
  * Should JSP.1.6 be applied strictly to attributes defined using scriptlet
  * expressions?
  */
-private boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+private boolean strictQuoteEscaping = true;
 
 public String getProperty(String name ) {
 return settings.getProperty( name );
@@ -768,8 +760,7 @@ public final class EmbeddedServletOption
 this.strictQuoteEscaping = false;
 } else {
 if (log.isWarnEnabled()) {
-
log.warn(Localizer.getMessage("jsp.warning.strictQuoteEscaping",
-Boolean.toString(STRICT_QUOTE_ESCAPING_DEFAULT)));
+
log.warn(Localizer.getMessage("jsp.warning.strictQuoteEscaping"));
 }
 }
 }

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712767=1712766=1712767=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 13:36:22 2015
@@ -107,15 +107,6 @@ public class JspC extends Task implement
 // Logger
 private static final Log log = LogFactory.getLog(JspC.class);
 
-/**
- * System property that controls if the strict quoting rules are applied
- * when parsing attribute values that use scriptlet expressions (<%=...%>).
- */
-private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= 
Boolean.parseBoolean(
-System.getProperty(
-"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
-"true"));
-
 protected static final String SWITCH_VERBOSE = "-v";
 protected static final String SWITCH_HELP = "-help";
 protected static final String SWITCH_OUTPUT_DIR = "-d";
@@ -181,7 +172,7 @@ public class JspC extends Task implement
 protected boolean validateTld;
 protected boolean validateXml;
 protected boolean blockExternal = true;
-protected boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+protected boolean strictQuoteEscaping = true;
 protected boolean xpoweredBy;
 protected boolean mappedFile = false;
 protected boolean poolingEnabled = true;

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1712767=1712766=1712767=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu 
Nov  5 13:36:22 2015
@@ -123,7 +123,7 @@ jsp.warning.suppressSmap=Warning: Invali
 jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam 
displaySourceFragment. Will use the default value of \"true\"
 jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam 
maxLoadedJsps. Will 

svn commit: r1712765 - in /tomcat/trunk: conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ webapps/docs/

[markt]

Author: markt
Date: Thu Nov  5 13:36:12 2015
New Revision: 1712765

URL: http://svn.apache.org/viewvc?rev=1712765=rev
Log:
Convert the STRICT_QUOTE_ESCAPING system property setting into a per web
application setting.

Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/jasper-howto.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1712765=1712764=1712765=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov  5 13:36:12 2015
@@ -241,6 +241,14 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
 
 
 jsp

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1712765=1712764=1712765=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Nov  5 
13:36:12 2015
@@ -199,6 +199,20 @@ public final class EmbeddedServletOption
  */
 private int jspIdleTimeout = -1;
 
+/**
+ * System property that controls if the strict quoting rules are applied
+ * when parsing attribute values that use scriptlet expressions (<%=...%>).
+ */
+private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= 
Boolean.parseBoolean(
+System.getProperty(
+"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
+"true"));
+/**
+ * Should JSP.1.6 be applied strictly to attributes defined using scriptlet
+ * expressions?
+ */
+private boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+
 public String getProperty(String name ) {
 return settings.getProperty( name );
 }
@@ -442,6 +456,11 @@ public final class EmbeddedServletOption
 return jspIdleTimeout;
 }
 
+@Override
+public boolean getStrictQuoteEscaping() {
+return strictQuoteEscaping;
+}
+
 /**
  * Create an EmbeddedServletOptions object using data available from
  * ServletConfig and ServletContext.
@@ -741,6 +760,21 @@ public final class EmbeddedServletOption
 }
 }
 
+String strictQuoteEscaping = 
config.getInitParameter("strictQuoteEscaping");
+if (strictQuoteEscaping != null) {
+if (strictQuoteEscaping.equalsIgnoreCase("true")) {
+this.strictQuoteEscaping = true;
+} else if (strictQuoteEscaping.equalsIgnoreCase("false")) {
+this.strictQuoteEscaping = false;
+} else {
+if (log.isWarnEnabled()) {
+
log.warn(Localizer.getMessage("jsp.warning.strictQuoteEscaping",
+Boolean.toString(STRICT_QUOTE_ESCAPING_DEFAULT)));
+}
+}
+}
+
+
 // Setup the global Tag Libraries location cache for this
 // web-application.
 tldCache = TldCache.getInstance(context);

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712765=1712764=1712765=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 13:36:12 2015
@@ -107,6 +107,15 @@ public class JspC extends Task implement
 // Logger
 private static final Log log = LogFactory.getLog(JspC.class);
 
+/**
+ * System property that controls if the strict quoting rules are applied
+ * when parsing attribute values that use scriptlet expressions (<%=...%>).
+ */
+private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= 
Boolean.parseBoolean(
+System.getProperty(
+"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
+"true"));
+
 protected static final String SWITCH_VERBOSE = "-v";
 protected static final String SWITCH_HELP = "-help";
 protected static final String SWITCH_OUTPUT_DIR = "-d";
@@ -137,6 +146,8 @@ public class JspC extends Task implement
 protected static final String SWITCH_VALIDATE_XML = "-validateXml";
 protected static final String SWITCH_BLOCK_EXTERNAL = "-blockExternal";
 protected static final String SWITCH_NO_BLOCK_EXTERNAL = 
"-no-blockExternal";
+

svn commit: r1712768 - in /tomcat/tc8.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Thu Nov  5 13:39:13 2015
New Revision: 1712768

URL: http://svn.apache.org/viewvc?rev=1712768=rev
Log:
Convert the STRICT_QUOTE_ESCAPING system property setting into a per web
application setting.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java

tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc8.0.x/trunk/webapps/docs/jasper-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 13:39:13 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
 

svn commit: r1712771 - /tomcat/trunk/java/org/apache/jasper/JspC.java

[markt]

Author: markt
Date: Thu Nov  5 13:47:24 2015
New Revision: 1712771

URL: http://svn.apache.org/viewvc?rev=1712771=rev
Log:
Add missing processing of new switches

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712771=1712770=1712771=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 13:47:24 2015
@@ -389,6 +389,10 @@ public class JspC extends Task implement
 setBlockExternal(true);
 } else if (tok.equals(SWITCH_NO_BLOCK_EXTERNAL)) {
 setBlockExternal(false);
+} else if (tok.equals(SWITCH_STRICT_QUOTE_ESCAPING)) {
+setStrictQuoteEscaping(true);
+} else if (tok.equals(SWITCH_NO_STRICT_QUOTE_ESCAPING)) {
+setStrictQuoteEscaping(false);
 } else {
 if (tok.startsWith("-")) {
 throw new JasperException("Unrecognized option: " + tok +



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

svn commit: r1712774 - /tomcat/trunk/java/org/apache/jasper/JspC.java

[markt]

Author: markt
Date: Thu Nov  5 13:59:07 2015
New Revision: 1712774

URL: http://svn.apache.org/viewvc?rev=1712774=rev
Log:
Remove now unused constants

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712774=1712773=1712774=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 13:59:07 2015
@@ -135,9 +135,7 @@ public class JspC extends Task implement
 protected static final String SWITCH_DUMP_SMAP = "-dumpsmap";
 protected static final String SWITCH_VALIDATE_TLD = "-validateTld";
 protected static final String SWITCH_VALIDATE_XML = "-validateXml";
-protected static final String SWITCH_BLOCK_EXTERNAL = "-blockExternal";
 protected static final String SWITCH_NO_BLOCK_EXTERNAL = 
"-no-blockExternal";
-protected static final String SWITCH_STRICT_QUOTE_ESCAPING = 
"-strictQuoteEscaping";
 protected static final String SWITCH_NO_STRICT_QUOTE_ESCAPING = 
"-no-strictQuoteEscaping";
 protected static final String SHOW_SUCCESS ="-s";
 protected static final String LIST_ERRORS = "-l";



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

svn commit: r1712775 - /tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

[markt]

Author: markt
Date: Thu Nov  5 14:02:55 2015
New Revision: 1712775

URL: http://svn.apache.org/viewvc?rev=1712775=rev
Log: (empty)

Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1712775=1712774=1712775=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu 
Nov  5 14:02:55 2015
@@ -124,6 +124,7 @@ jsp.warning.displaySourceFragment=Warnin
 jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam 
maxLoadedJsps. Will use the default value of \"-1\"
 jsp.warning.jspIdleTimeout=Warning: Invalid value for the initParam 
jspIdleTimeout. Will use the default value of \"-1\"
 jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam 
strictQuoteEscaping. Will use the default value of \"true\"
+jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam 
quoteAttributeEL. Will use the default value of \"false\"
 jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
 jsp.warning.unknown.element.in.tag=Unknown element ({0}) in tag
 jsp.warning.unknown.element.in.tagfile=Unknown element ({0}) in tag-file



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

svn commit: r1712762 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/filters/TesterServletContext.java

[remm]

Author: remm
Date: Thu Nov  5 13:33:19 2015
New Revision: 1712762

URL: http://svn.apache.org/viewvc?rev=1712762=rev
Log:
Port test "fix" for websockets.

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterServletContext.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 13:33:19 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
-/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: r1712772 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/JspC.java

[markt]

Author: markt
Date: Thu Nov  5 13:48:07 2015
New Revision: 1712772

URL: http://svn.apache.org/viewvc?rev=1712772=rev
Log:
Process new switches

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  5 13:48: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: r1712773 - /tomcat/trunk/java/org/apache/jasper/JspC.java

[markt]

Author: markt
Date: Thu Nov  5 13:50:27 2015
New Revision: 1712773

URL: http://svn.apache.org/viewvc?rev=1712773=rev
Log:
Now system properties that change defaults have been removed, these
switches are NO-OPs so removed them.

Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712773=1712772=1712773=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov  5 13:50:27 2015
@@ -385,12 +385,8 @@ public class JspC extends Task implement
 setValidateTld(true);
 } else if (tok.equals(SWITCH_VALIDATE_XML)) {
 setValidateXml(true);
-} else if (tok.equals(SWITCH_BLOCK_EXTERNAL)) {
-setBlockExternal(true);
 } else if (tok.equals(SWITCH_NO_BLOCK_EXTERNAL)) {
 setBlockExternal(false);
-} else if (tok.equals(SWITCH_STRICT_QUOTE_ESCAPING)) {
-setStrictQuoteEscaping(true);
 } else if (tok.equals(SWITCH_NO_STRICT_QUOTE_ESCAPING)) {
 setStrictQuoteEscaping(false);
 } else {



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