svn commit: r1709315 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 20:09:19 2015
New Revision: 1709315

URL: http://svn.apache.org/viewvc?rev=1709315=rev
Log:
Correct a typo
s/should only an escape/should only be an escape/

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

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

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

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

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

--- Comment #21 from Konstantin Kolinko  ---
Reviewing r1704572 and r1704576 (the fix for 7.0.x)

(In reply to Mark Thomas from comment #17)
> I think I have found another, related, problem in attribute values.
> 
> The problem I described in comment #16 (where I was thinking about template
> text) also applies to attribute values. Specifically, consider the following:
> 
> 
> Currently, Tomcat applied attribute value escaping to the whole value. This
> is not correct. The production in the JSP spec for QuotedChar (which is used
> in attribute values) means that attribute escaping only applies outside the
> EL. Inside the EL is handled by ELEXpressionBody which delegates to the EL
> spec.
> 

I agree with this assessment. I was reading the current as well as older
versions of JSP and EL specifications - back to JSP 2.0/Tomcat 5.5.

The chapter "JSP.1.6 Quoting and Escape Conventions" has explicit section on
"Quoting in EL Expressions" and it does not say that any additional quoting
rules from surrounding context are applied to it. So I agree that when parsing
an attribute, "Quoting in Attributes" rules are applied until a ${, then
"Quoting in EL Expressions" rules are applied until a } is read.

Historically, EL expressions were introduced in JSTL 1.0 (JSR-052). At that
time the expressions were evaluated by tags themselves. So an attribute of JSP
tag was escaped as a whole, and unescaping it gives an EL expression.

Effectively if EL expression uses quoting (e.g. ${'\\'}) including it as
attribute value requires double quoting   This
works when using JSTL 1.0 (xmlns:c10="http://java.sun.com/jstl/core;) and EL
evaluation in JSPs is disabled. So the EL is evaluated by the tag library.

If using JSTL 1.1 (xmlns:c="http://java.sun.com/jsp/jstl/core;) and EL is
enabled, it becomes 

I see no mention of quoting changes, but for backwards compatibility there is
an explicit option, <%@page isELIgnored="true">.



My concern is that the behaviour where double escaping in attributes was
required has been there for many years.
E.g. Eclipse IDE cannot parse /tomcat-7.0.x/test/webapp-3.0/el-method.jsp file
and flags errors on the following line,



I think there would better be a flag in Jasper to enable old behaviour of
attribute parsing. In the old behaviour mode the attribute will be parsed and
unescaped as a whole.

I think related change in r1704572 is in o.a.jasper.compiler.AttributeParser.

I am REOPENING to discuss introduction of such configuration option. (Though
may be better to reorganize into a separate BZ issue).

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

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

svn commit: r1709318 - in /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java test/java/org/apache/tomcat/jdbc/test/TestSlowQueryCompara

[fschumacher]

Author: fschumacher
Date: Sun Oct 18 20:56:21 2015
New Revision: 1709318

URL: http://svn.apache.org/viewvc?rev=1709318=rev
Log:
Followup to r1708780. As kkolinko noted, tomcat 7 needs to be built with java 6.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1709318=1709317=1709318=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Sun Oct 18 20:56:21 2015
@@ -447,7 +447,7 @@ public class SlowQueryReport extends Abs
 
 @Override
 public int compare(QueryStats stats1, QueryStats stats2) {
-return Long.compare(stats1.lastInvocation, stats2.lastInvocation);
+return 
Long.valueOf(stats1.lastInvocation).compareTo(stats2.lastInvocation);
 }
 }
 

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1709318=1709317=1709318=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 Sun Oct 18 20:56:21 2015
@@ -45,7 +45,7 @@ public class TestSlowQueryComparator {
 
 };
 
-List stats = new ArrayList<>();
+List stats = new ArrayList();
 
 for (int i = 0; i < testData.length; i++) {
 QueryStats qs = new QueryStats(String.valueOf(i));



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

Re: svn commit: r1708780 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java modules/jdbc-pool/src/test/java/org/apache/tomcat/j

[Felix Schumacher]

Am 18. Oktober 2015 20:48:48 MESZ, schrieb Konstantin Kolinko 
:
>2015-10-15 13:40 GMT+03:00  :
>> Author: fschumacher
>> Date: Thu Oct 15 10:40:25 2015
>> New Revision: 1708780
>>
>> URL: http://svn.apache.org/viewvc?rev=1708780=rev
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58489
>>
>> Comparator should follow the rules. If first object has
>lastInvocation of zero,
>> we should compare it to the second objects lastInvocation and vice
>versa.
>> When we do that, we can use Long#compare just as well.
>>
>> Merge r1708779 from /tomcat/tc8.0.x/trunk (Merged r1708687 and
>r1708745 from /tomcat/trunk)
>>
>> Added:
>>
>tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
>>   - copied unchanged from r1708779,
>tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
>> Modified:
>> tomcat/tc7.0.x/trunk/   (props changed)
>>
>tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>
>
>> Modified:
>tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>> URL:
>http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1708780=1708779=1708780=diff
>>
>==
>> ---
>tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>(original)
>> +++
>tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>Thu Oct 15 10:40:25 2015
>> @@ -447,17 +447,7 @@ public class SlowQueryReport extends Abs
>>
>>  @Override
>>  public int compare(QueryStats stats1, QueryStats stats2) {
>> -if (stats1.lastInvocation == 0) return 1;
>> -if (stats2.lastInvocation == 0) return -1;
>> -
>> -long result = stats1.lastInvocation -
>stats2.lastInvocation;
>> -if (result > 0) {
>> -return 1;
>> -} else if (result == 0) {
>> -return 0;
>> -} else {
>> -return -1;
>> -}
>> +return Long.compare(stats1.lastInvocation,
>stats2.lastInvocation);
>>  }
>>  }
>
>
>Tomcat 7 (minus websocket APIs) must be built with Java 6.
>
>The above Long.compare() method is @since 1.7.
>
>https://ci.apache.org/builders/tomcat-7-trunk/builds/99

Thanks for the reminder. 

I have committed a fix.

Best Regards, 
Felix 

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

svn commit: r1709314 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 20:07:51 2015
New Revision: 1709314

URL: http://svn.apache.org/viewvc?rev=1709314=rev
Log:
Correct a typo
s/should only an escape/should only be an escape/

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1709314=1709313=1709314=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Oct 18 20:07:51 2015
@@ -287,9 +287,9 @@
 
   
 57136: Correct a regression in the previous fix for this
-issue. \${ should only an escape for ${ 
within
-an EL expression. Within a JSP page \$ should be an escape
-for $. The EL specification applies when parsing the
+issue. \${ should only be an escape for ${
+within an EL expression. Within a JSP page \$ should be an
+escape for $. The EL specification applies when parsing 
the
 expression delimited by ${ and }. Parsing of
 the delimiting ${ and } is the responsibility
 of the JSP specification. (markt)



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

svn commit: r1709344 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:35:04 2015
New Revision: 1709344

URL: http://svn.apache.org/viewvc?rev=1709344=rev
Log:
Remove unnecessary local value.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709344=1709343=1709344=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct 
19 04:35:04 2015
@@ -984,7 +984,6 @@ public class DeltaManager extends Cluste
  public ClusterMessage requestCompleted(String sessionId, boolean expires) 
{
 DeltaSession session = null;
 SessionMessage msg = null;
-boolean isDeltaRequest = false ;
 try {
 session = (DeltaSession) findSession(sessionId);
 if (session == null) {
@@ -995,8 +994,7 @@ public class DeltaManager extends Cluste
 DeltaRequest deltaRequest = session.getDeltaRequest();
 session.lock();
 synchronized(deltaRequest) {
-isDeltaRequest = deltaRequest.getSize() > 0 ;
-if (isDeltaRequest) {
+if (deltaRequest.getSize() > 0) {
 counterSend_EVT_SESSION_DELTA++;
 byte[] data = serializeDeltaRequest(session,deltaRequest);
 msg = new SessionMessageImpl(getName(),
@@ -1014,7 +1012,7 @@ public class DeltaManager extends Cluste
 } finally {
 if (session!=null) session.unlock();
 }
-if(!isDeltaRequest) {
+if(msg == null) {
 if(!expires && !session.isPrimarySession()) {
 counterSend_EVT_SESSION_ACCESSED++;
 msg = new SessionMessageImpl(getName(),



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

svn commit: r1709348 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:54:22 2015
New Revision: 1709348

URL: http://svn.apache.org/viewvc?rev=1709348=rev
Log:
Optimize the session lock range in DeltaManager.requestCompleted.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709348=1709347=1709348=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
Mon Oct 19 04:54:22 2015
@@ -978,6 +978,7 @@ public class DeltaManager extends Cluste
   */
  public ClusterMessage requestCompleted(String sessionId, boolean expires) 
{
 DeltaSession session = null;
+SessionMessage msg = null;
 try {
 session = (DeltaSession) findSession(sessionId);
 if (session == null) {
@@ -987,71 +988,63 @@ public class DeltaManager extends Cluste
 }
 DeltaRequest deltaRequest = session.getDeltaRequest();
 session.lock();
-SessionMessage msg = null;
-boolean isDeltaRequest = false ;
-synchronized(deltaRequest) {
-isDeltaRequest = deltaRequest.getSize() > 0 ;
-if (isDeltaRequest) {
-counterSend_EVT_SESSION_DELTA++;
-byte[] data = serializeDeltaRequest(session,deltaRequest);
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_DELTA, 
- data, 
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-session.resetDeltaRequest();
-}  
-}
-if(!isDeltaRequest) {
-if(!expires && !session.isPrimarySession()) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED, 
- null, 
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.accessChangePrimary",getName(),
 sessionId));
-}
-}
-} else { // log only outside synch block!
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.delta",getName(), 
sessionId));
-}
-}
-if (!expires)
-session.setPrimarySession(true);
-//check to see if we need to send out an access message
-if (!expires && (msg == null)) {
-long replDelta = System.currentTimeMillis() - 
session.getLastTimeReplicated();
-if (session.getMaxInactiveInterval() >=0 && 
-replDelta > (session.getMaxInactiveInterval() * 
1000L)) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED, 
- null,
- sessionId, 
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.access", 
getName(),sessionId));
-}
-}
-
-}
-
-//update last replicated time
-if (msg != null){
-   session.setLastTimeReplicated(System.currentTimeMillis());
-   msg.setTimestamp(session.getLastTimeReplicated());
-}
-return msg;
+if (deltaRequest.getSize() > 0) {
+counterSend_EVT_SESSION_DELTA++;
+byte[] data = serializeDeltaRequest(session,deltaRequest);
+msg = new SessionMessageImpl(getName(),
+ SessionMessage.EVT_SESSION_DELTA, 
+ data, 
+ sessionId,
+ sessionId + "-" + 

[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.
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: 53 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-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151019-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-20151019/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151019.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151019-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-20151019/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
 

svn commit: r1709345 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:39:05 2015
New Revision: 1709345

URL: http://svn.apache.org/viewvc?rev=1709345=rev
Log:
Because already holding a lock of session objects, remove unnecessary 
synchronize block of DeltaRequest.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709345=1709344=1709345=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct 
19 04:39:05 2015
@@ -993,17 +993,15 @@ public class DeltaManager extends Cluste
 }
 DeltaRequest deltaRequest = session.getDeltaRequest();
 session.lock();
-synchronized(deltaRequest) {
-if (deltaRequest.getSize() > 0) {
-counterSend_EVT_SESSION_DELTA++;
-byte[] data = serializeDeltaRequest(session,deltaRequest);
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_DELTA,
- data,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-session.resetDeltaRequest();
-}
+if (deltaRequest.getSize() > 0) {
+counterSend_EVT_SESSION_DELTA++;
+byte[] data = serializeDeltaRequest(session,deltaRequest);
+msg = new SessionMessageImpl(getName(),
+ SessionMessage.EVT_SESSION_DELTA,
+ data,
+ sessionId,
+ sessionId + "-" + 
System.currentTimeMillis());
+session.resetDeltaRequest();
 }
 } catch (IOException x) {
 
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",



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

Re: svn commit: r1708687 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.

[Keiichi Fujino]

2015-10-15 5:28 GMT+09:00 :

> Author: fschumacher
> Date: Wed Oct 14 20:28:55 2015
> New Revision: 1708687
>
> URL: http://svn.apache.org/viewvc?rev=1708687=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58489
>
> Comparator should follow the rules. If first object has lastInvocation of
> zero,
> we should compare it to the second objects lastInvocation and vice versa.
> When we do that, we can use Long#compare just as well.
>
> Added:
>
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
> Modified:
>
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>
> Modified:
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1708687=1708686=1708687=diff
>
> ==
> ---
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
> (original)
> +++
> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
> Wed Oct 14 20:28:55 2015
> @@ -475,17 +475,7 @@ public class SlowQueryReport extends Abs
>
>  @Override
>  public int compare(QueryStats stats1, QueryStats stats2) {
> -if (stats1.lastInvocation == 0) return 1;
> -if (stats2.lastInvocation == 0) return -1;
> -
> -long result = stats1.lastInvocation - stats2.lastInvocation;
> -if (result > 0) {
> -return 1;
> -} else if (result == 0) {
> -return 0;
> -} else {
> -return -1;
> -}
> +return Long.compare(stats1.lastInvocation,
> stats2.lastInvocation);
>  }
>  }
>
>

Hi.

I think this fix does not handle 0 value of lastInvocation correctly.
The older code handles 0 value of lastInvocation as the latest QueryStats.
This new code handles 0 value of lastInvocation as the oldest QueryStats.

I think the fix of this bug is described in comment1.
Or set current time to the lastInvocation in the constructor of QueryStats.





>
> Added:
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1708687=auto
>
> ==
> ---
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
> (added)
> +++
> tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
> Wed Oct 14 20:28:55 2015
> @@ -0,0 +1,121 @@
> +package org.apache.tomcat.jdbc.test;
> +
> +import java.lang.reflect.Constructor;
> +import java.lang.reflect.InvocationTargetException;
> +import java.util.ArrayList;
> +import java.util.Collections;
> +import java.util.Comparator;
> +import java.util.List;
> +
> +import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.QueryStats;
> +import org.junit.Assert;
> +import org.junit.Test;
> +
> +public class TestSlowQueryComparator {
> +
> +@Test
> +public void testBug58489() throws ClassNotFoundException,
> +InstantiationException, IllegalAccessException,
> +InvocationTargetException {
> +
> +long[] testData = { 0, 0, 0, 1444225382010l, 0, 1444225382011l, 0,
> +1444225382012l, 0, 1444225382056l, 0, 1444225382014l, 0,
> +1444225382015l, 0, 1444225382016l, 0, 0, 1444225382017l,
> 0,
> +1444225678350l, 0, 1444225680397l, 0, 1444225382018l,
> +1444225382019l, 1444225382020l, 0, 1444225382021l, 0,
> +1444225382022l, 1444225382023l
> +
> +};
> +
> +List stats = new ArrayList<>();
> +
> +for (int i = 0; i < testData.length; i++) {
> +QueryStats qs = new QueryStats(String.valueOf(i));
> +qs.add(0, testData[i]);
> +stats.add(qs);
> +}
> +
> +try {
> +Collections.sort(stats, createComparator());
> +} catch (IllegalArgumentException e) {
> +Assert.fail(e.getMessage());
> +}
> +}
> +
> +@Test
> +public void testEqualQueryStatsWithNoLastInvocation()
> +throws ClassNotFoundException, InstantiationException,
> +IllegalAccessException, IllegalArgumentException,
> +InvocationTargetException {
> +Comparator queryStatsComparator = createComparator();
> +QueryStats q1 = new QueryStats("abc");
> +Assert.assertEquals(0, queryStatsComparator.compare(q1, q1));

svn commit: r1709346 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:46:56 2015
New Revision: 1709346

URL: http://svn.apache.org/viewvc?rev=1709346=rev
Log:
trivial fix of indention.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709346=1709345=1709346=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct 
19 04:46:56 2015
@@ -1025,8 +1025,7 @@ public class DeltaManager extends Cluste
 }
 } else { // log only outside synch block!
 if (log.isDebugEnabled()) {
-log.debug(sm.getString("deltaManager.createMessage.delta",
-getName(), sessionId));
+log.debug(sm.getString("deltaManager.createMessage.delta", 
getName(), sessionId));
 }
 }
 if (!expires) session.setPrimarySession(true);



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

svn commit: r1709343 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:31:07 2015
New Revision: 1709343

URL: http://svn.apache.org/viewvc?rev=1709343=rev
Log:
Optimize the session lock range in DeltaManager.requestCompleted.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709343=1709342=1709343=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Oct 
19 04:31:07 2015
@@ -983,6 +983,8 @@ public class DeltaManager extends Cluste
   */
  public ClusterMessage requestCompleted(String sessionId, boolean expires) 
{
 DeltaSession session = null;
+SessionMessage msg = null;
+boolean isDeltaRequest = false ;
 try {
 session = (DeltaSession) findSession(sessionId);
 if (session == null) {
@@ -992,8 +994,6 @@ public class DeltaManager extends Cluste
 }
 DeltaRequest deltaRequest = session.getDeltaRequest();
 session.lock();
-SessionMessage msg = null;
-boolean isDeltaRequest = false ;
 synchronized(deltaRequest) {
 isDeltaRequest = deltaRequest.getSize() > 0 ;
 if (isDeltaRequest) {
@@ -1007,52 +1007,6 @@ public class DeltaManager extends Cluste
 session.resetDeltaRequest();
 }
 }
-if(!isDeltaRequest) {
-if(!expires && !session.isPrimarySession()) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED,
- null,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.accessChangePrimary",
-getName(), sessionId));
-}
-}
-} else { // log only outside synch block!
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("deltaManager.createMessage.delta",
-getName(), sessionId));
-}
-}
-if (!expires)
-session.setPrimarySession(true);
-//check to see if we need to send out an access message
-if (!expires && (msg == null)) {
-long replDelta = System.currentTimeMillis() - 
session.getLastTimeReplicated();
-if (session.getMaxInactiveInterval() >=0 &&
-replDelta > (session.getMaxInactiveInterval() * 
1000L)) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED,
- null,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.access",
-getName(),sessionId));
-}
-}
-
-}
-
-//update last replicated time
-if (msg != null){
-   session.setLastTimeReplicated(System.currentTimeMillis());
-   msg.setTimestamp(session.getLastTimeReplicated());
-}
-return msg;
 } catch (IOException x) {
 
log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",
 sessionId), x);
@@ -1060,7 +1014,50 @@ public class DeltaManager extends Cluste
 } finally {
 if (session!=null) session.unlock();
 }
+if(!isDeltaRequest) {
+if(!expires && !session.isPrimarySession()) {
+counterSend_EVT_SESSION_ACCESSED++;
+msg = new SessionMessageImpl(getName(),
+ 
SessionMessage.EVT_SESSION_ACCESSED,
+ null,
+ sessionId,
+ sessionId + "-" + 
System.currentTimeMillis());
+if (log.isDebugEnabled()) {
+

svn commit: r1709347 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Oct 19 04:51:36 2015
New Revision: 1709347

URL: http://svn.apache.org/viewvc?rev=1709347=rev
Log:
Optimize the session lock range in DeltaManager.requestCompleted.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1709347=1709346=1709347=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
Mon Oct 19 04:51:36 2015
@@ -982,6 +982,7 @@ public class DeltaManager extends Cluste
   */
  public ClusterMessage requestCompleted(String sessionId, boolean expires) 
{
 DeltaSession session = null;
+SessionMessage msg = null;
 try {
 session = (DeltaSession) findSession(sessionId);
 if (session == null) {
@@ -991,67 +992,16 @@ public class DeltaManager extends Cluste
 }
 DeltaRequest deltaRequest = session.getDeltaRequest();
 session.lock();
-SessionMessage msg = null;
-boolean isDeltaRequest = false ;
-synchronized(deltaRequest) {
-isDeltaRequest = deltaRequest.getSize() > 0 ;
-if (isDeltaRequest) {
-counterSend_EVT_SESSION_DELTA++;
-byte[] data = serializeDeltaRequest(session,deltaRequest);
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_DELTA,
- data,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-session.resetDeltaRequest();
-}
-}
-if(!isDeltaRequest) {
-if(!expires && !session.isPrimarySession()) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED,
- null,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.accessChangePrimary",
-getName(), sessionId));
-}
-}
-} else { // log only outside synch block!
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("deltaManager.createMessage.delta",
-getName(), sessionId));
-}
-}
-if (!expires)
-session.setPrimarySession(true);
-//check to see if we need to send out an access message
-if (!expires && (msg == null)) {
-long replDelta = System.currentTimeMillis() - 
session.getLastTimeReplicated();
-if (session.getMaxInactiveInterval() >=0 &&
-replDelta > (session.getMaxInactiveInterval() * 
1000L)) {
-counterSend_EVT_SESSION_ACCESSED++;
-msg = new SessionMessageImpl(getName(),
- 
SessionMessage.EVT_SESSION_ACCESSED,
- null,
- sessionId,
- sessionId + "-" + 
System.currentTimeMillis());
-if (log.isDebugEnabled()) {
-
log.debug(sm.getString("deltaManager.createMessage.access",
-getName(),sessionId));
-}
-}
-
-}
-
-//update last replicated time
-if (msg != null){
-   session.setLastTimeReplicated(System.currentTimeMillis());
-   msg.setTimestamp(session.getLastTimeReplicated());
+if (deltaRequest.getSize() > 0) {
+counterSend_EVT_SESSION_DELTA++;
+byte[] data = serializeDeltaRequest(session,deltaRequest);
+msg = new SessionMessageImpl(getName(),
+ SessionMessage.EVT_SESSION_DELTA,
+ data,
+ sessionId,
+ sessionId + 

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

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] 1709318
Blamelist: fschumacher

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: svn commit: r1708780 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java modules/jdbc-pool/src/test/java/org/apache/tomcat/j

[Konstantin Kolinko]

2015-10-15 13:40 GMT+03:00  :
> Author: fschumacher
> Date: Thu Oct 15 10:40:25 2015
> New Revision: 1708780
>
> URL: http://svn.apache.org/viewvc?rev=1708780=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58489
>
> Comparator should follow the rules. If first object has lastInvocation of 
> zero,
> we should compare it to the second objects lastInvocation and vice versa.
> When we do that, we can use Long#compare just as well.
>
> Merge r1708779 from /tomcat/tc8.0.x/trunk (Merged r1708687 and r1708745 from 
> /tomcat/trunk)
>
> Added:
> 
> tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
>   - copied unchanged from r1708779, 
> tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> 
> tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java


> Modified: 
> tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1708780=1708779=1708780=diff
> ==
> --- 
> tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>  (original)
> +++ 
> tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
>  Thu Oct 15 10:40:25 2015
> @@ -447,17 +447,7 @@ public class SlowQueryReport extends Abs
>
>  @Override
>  public int compare(QueryStats stats1, QueryStats stats2) {
> -if (stats1.lastInvocation == 0) return 1;
> -if (stats2.lastInvocation == 0) return -1;
> -
> -long result = stats1.lastInvocation - stats2.lastInvocation;
> -if (result > 0) {
> -return 1;
> -} else if (result == 0) {
> -return 0;
> -} else {
> -return -1;
> -}
> +return Long.compare(stats1.lastInvocation, 
> stats2.lastInvocation);
>  }
>  }


Tomcat 7 (minus websocket APIs) must be built with Java 6.

The above Long.compare() method is @since 1.7.

https://ci.apache.org/builders/tomcat-7-trunk/builds/99


Best regards,
Konstantin Kolinko

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

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

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 19:00:14 2015
New Revision: 1709297

URL: http://svn.apache.org/viewvc?rev=1709297=rev
Log:
proposal

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1709297=1709296=1709297=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 18 19:00:14 2015
@@ -67,6 +67,14 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, remm
   -1:
 
+* Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
+  Reported by Benjamin Gandon on the dev list
+  Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
+  https://svn.apache.org/r1707054
+  - to be applied to extras.xml line 220
+  +1: kkolinko
+  -1:
+
   
 PATCHES/ISSUES THAT ARE STALLED:
 



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

Re: svn commit: r1708968 - in /tomcat/site/trunk: docs/migration-9.html docs/migration.html xdocs/migration-9.xml xdocs/migration.xml

[Martin Grigorov]

Hi,

On Fri, Oct 16, 2015 at 2:03 PM,  wrote:

> In JSP pages that use wildcard import syntax the new classes added in
> +Servlet API may conflict with ones in web applications.
> +For example, if package "a" contains class
> +PushBuilder, the following JSP page will cease to
> compile in
> +Tomcat 8:
>

I think this should say "Tomcat 9".


> +
> +
>



Martin Grigorov
Wicket Training and Consulting
https://twitter.com/mtgrigorov

Re: svn commit: r1708968 - in /tomcat/site/trunk: docs/migration-9.html docs/migration.html xdocs/migration-9.xml xdocs/migration.xml

[Martin Grigorov]

On Fri, Oct 16, 2015 at 2:03 PM,  wrote:

> 


s/virtua/virtuaL/

Martin Grigorov
Wicket Training and Consulting
https://twitter.com/mtgrigorov

svn commit: r1709305 - in /tomcat/site/trunk: docs/migration-9.html xdocs/migration-9.xml

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 19:30:19 2015
New Revision: 1709305

URL: http://svn.apache.org/viewvc?rev=1709305=rev
Log:
Correct a typo noted by Martin Grigorov on dev@ list.

Modified:
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-9.xml

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1709305=1709304=1709305=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Sun Oct 18 19:30:19 2015
@@ -300,7 +300,7 @@ of Apache Tomcat.
 Servlet API may conflict with ones in web applications.
 For example, if package "a" contains class
 PushBuilder, the following JSP page will cease to compile in
-Tomcat 8:
+Tomcat 9:
 
 
 

Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1709305=1709304=1709305=diff
==
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Sun Oct 18 19:30:19 2015
@@ -49,7 +49,7 @@ of Apache Tomcat.
 Servlet API may conflict with ones in web applications.
 For example, if package "a" contains class
 PushBuilder, the following JSP page will cease to compile in
-Tomcat 8:
+Tomcat 9:
 
 



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

Re: svn commit: r1708968 - in /tomcat/site/trunk: docs/migration-9.html docs/migration.html xdocs/migration-9.xml xdocs/migration.xml

[Konstantin Kolinko]

2015-10-18 22:20 GMT+03:00 Martin Grigorov :
> Hi,
>
> On Fri, Oct 16, 2015 at 2:03 PM,  wrote:
>
>> In JSP pages that use wildcard import syntax the new classes added in
>> +Servlet API may conflict with ones in web applications.
>> +For example, if package "a" contains class
>> +PushBuilder, the following JSP page will cease to
>> compile in
>> +Tomcat 8:
>>
>
> I think this should say "Tomcat 9".
>

Fixed. Thank you.


>> +
>> +
>>



>> 
>
>
> s/virtua/virtuaL/
>

This have already been fixed by Mark
http://svn.apache.org/viewvc?rev=1709054=rev

Best regards,
Konstantin Kolinko

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

Bug report for Tomcat 9 [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|57505|New|Enh|2015-01-27|Add integration tests for JspC|
|57661|New|Enh|2015-03-04|Delay sending of 100 continue response until appli|
|57767|New|Enh|2015-03-27|Websocket client proprietary configuration|
|58242|New|Enh|2015-08-13|Scanning jars in classpath to get annotations in p|
+-+---+---+--+--+
| Total4 bugs   |
+---+

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

Bug report for Tomcat 6 [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat|
|43400|New|Enh|2007-09-14|enum support for tag libs |
|43742|New|Enh|2007-10-30|.tag compiles  performed one at a time -- extremel|
|43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output |
|44199|New|Enh|2008-01-10|expose current backlog queue size |
|44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f|
|44294|New|Enh|2008-01-25|Support for EL functions with varargs |
|44312|Opn|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam|
|44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt|
|45014|New|Enh|2008-05-15|Request and Response classes should have wrappers |
|45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks|
|45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or |
|45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE|
|45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output|
|46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c|
|46263|Opn|Enh|2008-11-21|Tomcat reloading of context.xml does not update do|
|46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl|
|46350|New|Enh|2008-12-05|Maven repository should contain source bundles|
|46558|Opn|Enh|2009-01-19|Shutdown port with address binding|
|47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho|
|47242|New|Enh|2009-05-22|request for AJP command line client   |
|47281|New|Enh|2009-05-28|Efficiency of the JDBCStore   |
|47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session|
|47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath|
|47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked|
|48358|Opn|Enh|2009-12-09|JSP-unloading reloaded|
|48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.|
|48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b|
|48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe|
|48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr|
|48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static|
|48928|New|Enh|2010-03-17|An alternative solution to preloading classes when|
|49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient  |
|49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding  |
|49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/|
|49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu|
|49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c|
|50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a|
|50288|New|Enh|2010-11-17|Uploading a war file that already exists should au|
|50677|Opn|Enh|2011-01-27|Allow system property variables in catalina.proper|
|50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull |
|51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound|
|51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages   |
|52791|New|Enh|2012-02-28|[PATCH] read windows installer default values from|
|52924|New|Enh|2012-03-15|Add support for per-application JSP compile config|
|53011|New|Enh|2012-03-31|Ant Jasper task fails after one error |
|53031|New|Enh|2012-04-03|Ant Jasper task should support Fork option|
|53677|New|Nor|2012-08-07|ArrayIndexOutOfBoundsException when response heade|
|54007|New|Nor|2012-10-15|Improve handling of failed web application deploym|
|56607|New|Enh|2014-06-09|shutdown.bat exits before shutdown|

Bug report for Taglibs [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field   |
|38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)|
|42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements   |
|46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l|
|48333|New|Enh|2009-12-02|TLD generator |
|57434|New|Nor|2015-01-11|Race condition in EL1.0 validation|
|57548|New|Min|2015-02-08|Auto-generate the value for org.apache.taglibs.sta|
|57684|New|Min|2015-03-10|Version info should be taken from project version |
+-+---+---+--+--+
| Total8 bugs   |
+---+

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

Bug report for Tomcat 8 [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing |
|51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs|
|53737|Opn|Enh|2012-08-18|Use ServletContext.getJspConfigDescriptor() in Jas|
|53930|New|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma|
|54503|New|Enh|2013-01-29|SAML2 based single sign on|
|54700|New|Enh|2013-03-15|Improvement: Add support for system property to sp|
|54741|New|Enh|2013-03-22|Add org.apache.catalina.startup.Tomcat#addWebapp(S|
|55006|New|Enh|2013-05-22|Add http proxy support for ClientEndpoint using sy|
|55243|New|Enh|2013-07-11|Add special search string for nested roles|
|55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC   |
|55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages  |
|55479|New|Enh|2013-08-24|JSR 196 (JASPIC) support in Tomcat|
|9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI  |
|55675|New|Enh|2013-10-18|Checking and handling invalid configuration option|
|55770|New|Enh|2013-11-12|Allow the crlFile to be reloaded  |
|55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp|
|55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta|
|56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia|
|56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b|
|56398|New|Enh|2014-04-11|Support Arquillian-based unit testing |
|56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and|
|56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components|
|56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S|
|56546|New|Enh|2014-05-19|Improve thread trace logging in WebappClassLoader.|
|56676|New|Enh|2014-06-26|Normalize access to native library|
|56713|New|Enh|2014-07-12|Limit time that incoming request waits while webap|
|56724|New|Enh|2014-07-15|Restart Container background thread if it died une|
|56838|Opn|Enh|2014-08-11|Performance drop when repeatedly calling WebappCla|
|56890|Inf|Maj|2014-08-26|getRealPath returns null  |
|56917|New|Enh|2014-09-05|Create a configuration to write relative 302 respo|
|56966|New|Enh|2014-09-11|AccessLogValve's elapsed time has 15ms precision o|
|57130|New|Enh|2014-10-22|Allow digest.sh to accept password from a file or |
|57287|New|Enh|2014-11-29|Sort files listed by DefaultServlet   |
|57345|New|Enh|2014-12-12|APR/Native HTTPS Connector Should Support All Open|
|57421|New|Enh|2015-01-07|Farming default directories   |
|57486|New|Enh|2015-01-23|Improve reuse of ProtectedFunctionMapper instances|
|57665|New|Enh|2015-03-05|support x-forwarded-host  |
|57701|New|Enh|2015-03-13|Implement "[Redeploy]" button for a web applicatio|
|57799|Inf|Nor|2015-04-08|MessageCreationException: Couldn't create SOAP mes|
|57809|New|Enh|2015-04-13|Don't store merged web.xml|
|57830|New|Enh|2015-04-18|Add support for ProxyProtocol |
|58052|Opn|Enh|2015-06-19|RewriteValve: Implement additional RewriteRule dir|
|58072|New|Enh|2015-06-23|ECDH curve selection  |
|58111|New|Enh|2015-07-07|Update to Eclipse ECJ 4.5 |
|58143|Opn|Enh|2015-07-15|The WebppClassLoader doesn't call transformers on |
|58283|New|Enh|2015-08-25|Change Base Path to use (user.home) instead of abs|
|58431|New|Enh|2015-09-20|AccessLogValve default values for prefix and suffi|
|58433|New|Enh|2015-09-21|RemoteIpValve not activated on redirect from mappi|
|58486|New|Min|2015-10-07|JreMemoryLeakPreventionListener: initialize two fu|
|58490|New|Nor|2015-10-09|Webapp does not start when using web-fragments icw|
+-+---+---+--+--+
| 

Bug report for Tomcat 7 [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|18500|New|Enh|2003-03-30|Host aliases to match by regular expression   |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page|
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49821|New|Enh|2010-08-25|Tomcat CLI [PATCH/Contribution]   |
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern|
|50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac|
|51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class|
|51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to |
|51463|New|Enh|2011-07-01|Tomcat.setBaseDir  (package org.apache.catalina.st|
|51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul|
|51587|New|Enh|2011-07-29|Implement status and uptime commands  |
|51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter [PATC|
|52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site|
|52381|New|Enh|2011-12-22|Please add OSGi metadata  |
|52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up|
|52489|New|Enh|2012-01-19|Enhancement request for code signing of war files |
|52688|New|Enh|2012-02-16|Add ability to remove old access log files [PATCHE|
|52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s|
|53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota|
|53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr|
|53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf|
|53492|New|Enh|2012-07-01|Make JspC shell multithreaded |
|53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from |
|53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l|
|54330|New|Enh|2012-12-19|Patch with some refactoring of Member.java [PATCH |
|54499|New|Enh|2013-01-29|Implementation of Extensible EL Interpreter   |
|54802|New|Enh|2013-04-04|Provide location information for exceptions thrown|
|55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae|
|55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star|
|55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security |
|55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di|
|56148|New|Enh|2014-02-17|support (multiple) ocsp stapling  |
|56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest|
|56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation|
|56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co|
|56614|New|Enh|2014-06-12|Add a switch to ignore annotations detection on ta|
|56787|New|Enh|2014-07-29|Simplified jndi name parsing  |
|57367|New|Enh|2014-12-18|If JAR scan experiences a stack overflow, give the|
|57705|New|Enh|2015-03-14|RemoteAddrValve: no log message no explanation whe|
|57827|New|Enh|2015-04-17|Enable adding/removing of members via jmx in a sta|
|57870|New|Enh|2015-04-29|backport GzipOutputFilter #doWrite to Tomcat 7 to |
|57872|New|Enh|2015-04-29|Do not auto-switch session cookie to version=1 due|
|57892|New|Enh|2015-05-05|Log once a warning if a symbolic link is ignored (|
|57906|New|Min|2015-05-08|Message about failure to load ApplicationContextFa|
|57937|New|Enh|2015-05-19|Request for a form based two factor authentication|
|58289|Inf|Nor|2015-08-27|request.getRemoteAddr() sometimes returning IP add|

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) 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-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 25 runs.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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 timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 hour 6 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-20151018-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-trunk/dest-20151018/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151018.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151018-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-master/dest-20151018/bin/openssl
 -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-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public

Bug report for Tomcat Native [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown|
|49038|Inf|Nor|2010-04-02|Crash in tcnative |
|52319|Inf|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da]  sig|
|52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i|
|53605|Inf|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash   |
|53847|Inf|Nor|2012-09-10|High CPU usage in tomcat native 1.22+ |
|53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration|
|54085|New|Nor|2012-11-01|ssl_socket_recv sometimes loops infinitely with no|
|54664|New|Reg|2013-03-11|[1.1.27 branch] Poll.remove incorrectly reports AP|
|55087|New|Cri|2013-06-10|tomcat crashes in tcnative-1.dll with OCSP when OC|
|55113|Inf|Nor|2013-06-18|FIPS-compatible OpenSSL fails fingerprint test in |
|55114|New|Nor|2013-06-18|BUILDING file in win32 source package contains UNI|
|55706|New|Nor|2013-10-25|broken apr version check in native v1.1.29 build; |
|55771|New|Maj|2013-11-12|Memory leak and then crash in org.apache.tomcat.jn|
|55797|Inf|Nor|2013-11-19|Tomcat 7.0.47 crashes using server jvm.dll and APR|
|55938|New|Nor|2013-12-29|clang-analyzer report for 1.1.31  |
|56027|Opn|Nor|2014-01-17|Unable to use TCN on RHEL6 boxes if box is booted |
|56108|New|Cri|2014-02-04|Allow user-defined Diffie-Hellman parameters (secu|
|56378|New|Nor|2014-04-09|Cert load fails if cert is located in path with no|
|56415|New|Maj|2014-04-16|EXCEPTION_ACCESS_VIOLATION (0xc005) in tcnativ|
|56878|New|Trv|2014-08-21|Checking whether unsigned int is less than zero is|
|57140|New|Cri|2014-10-24|tcnative-1.dll 1.1.31 indicated in fatal error|
|57521|New|Cri|2015-02-02|Tomcat randomly crashes with [libtcnative-1.so.0.1|
|57815|New|Enh|2015-04-15|Improve error message when OpenSSL does not suppor|
|58058|New|Nor|2015-06-19|Library _instance needs to be volatile|
|58081|New|Nor|2015-06-29|Incorrect Java version in README  |
|58082|New|Nor|2015-06-29|Old version of JUnit specified|
|58194|New|Maj|2015-07-30|Tomcat crash EXCEPTION_ACCESS_VIOLATION in tcnativ|
|58244|Inf|Nor|2015-08-14|two way SSL loses client certificate after a few r|
|58263|New|Nor|2015-08-19|APR SSL connector crashes |
|58404|New|Nor|2015-09-13|Duplicate property definitions compile.[source|tar|
|58434|New|Nor|2015-09-21|Make Fails Against LibreSSL   |
+-+---+---+--+--+
| Total   32 bugs   |
+---+

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

Bug report for Tomcat Connectors [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn|
|45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff|
|45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so|
|46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca|
|47327|New|Enh|2009-06-07|Return tomcat authenticated user back to mod_jk (A|
|47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_|
|47714|Opn|Cri|2009-08-20|Response mixed between users  |
|47750|New|Maj|2009-08-27|ISAPI: Loss of worker settings when changing via j|
|47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit|
|48490|Inf|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert|
|48513|New|Enh|2010-01-09|IIS Quick setup instructions  |
|48564|New|Enh|2010-01-18|Allow to turn off retries for LB worker   |
|48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv|
|49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work|
|49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat |
|49732|Inf|Nor|2010-08-10|reply_timeout can't wait forever. |
|49822|New|Enh|2010-08-25|Add hash lb worker method |
|49903|New|Enh|2010-09-09|Make workers file reloadable  |
|52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus|
|53883|New|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe  on the p|
|53977|New|Maj|2012-10-07|32bits isapi connector cannot work in wow64 mode  |
|54027|New|Cri|2012-10-18|isapi send request to outside address instead of i|
|54117|New|Maj|2012-11-08|access violation exception in isapi_redirect.dll  |
|54596|Opn|Nor|2013-02-22|Relative path functionality truncates last charact|
|54621|New|Nor|2013-02-28|[PATCH] custom mod_jk availability checks |
|54923|New|Nor|2013-05-03|nsapi_redirect.so does not work with iPlanet on So|
|56489|New|Enh|2014-05-05|Include a directory for configuration files   |
|56576|New|Enh|2014-05-29|Websocket support |
|57066|New|Cri|2014-10-08|isapi_redirect.dll is crashing intermittently when|
|57402|New|Enh|2014-12-30|Provide correlation ID between mod_jk log and acce|
|57403|New|Enh|2014-12-30|Persist configuration changes made via status work|
|57407|New|Enh|2014-12-31|Make session_cookie, session_path and session_cook|
|57485|New|Nor|2015-01-23|mod_jk passed the incomplete chunked transferred r|
|57790|New|Enh|2015-04-03|Check worker names for typos  |
|57946|New|Nor|2015-05-23|Configuration example for mod_jk should be updated|
|58249|New|Nor|2015-08-17|Documentation regarding max_packet_size parameter |
|58287|New|Nor|2015-08-26|Questionable use of "Global" objects on Windows   |
|58425|New|Nor|2015-09-17|validate::jk_ajp12_worker.c always returns JK_FALS|
|58481|New|Nor|2015-10-05|JAX WS Request fails with "Premature end of file" |
+-+---+---+--+--+
| Total   40 bugs   |
+---+

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

Bug report for Tomcat Modules [2015/10/18]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers |
|48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite  |
|48861|New|Nor|2010-03-04|Files without AL headers  |
|49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean   |
|49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da|
|50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen|
|51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho|
|51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods   |
|52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o|
|53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe|
|54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int|
|54929|Inf|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang|
|55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ|
|56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p|
|56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio|
|56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr|
|56586|New|Nor|2014-06-02|initSQL should be committed if defaultAutoCommit =|
|56775|New|Nor|2014-07-28|PoolCleanerTime schedule issue|
|56779|New|Nor|2014-07-28|Allow multiple connection initialization statement|
|56790|New|Nor|2014-07-29|Resizing pool.maxActive to a higher value at runti|
|56798|New|Nor|2014-07-31|Idle eviction strategy could perform better (and i|
|56804|New|Nor|2014-08-02|Use a default validationQueryTimeout other than "f|
|56805|New|Nor|2014-08-02|datasource.getConnection() may be unnecessarily bl|
|56837|New|Nor|2014-08-11|if validationQuery have error with timeBetweenEvic|
|56970|New|Nor|2014-09-11|MaxActive vs. MaxTotal for commons-dbcp and tomcat|
|56974|New|Nor|2014-09-12|jdbc-pool validation query defaultAutoCommit statu|
|57460|New|Nor|2015-01-19|[DB2]Connection broken after few hours but not rem|
|57729|New|Enh|2015-03-20|Add QueryExecutionReportInterceptor to log query e|
+-+---+---+--+--+
| Total   28 bugs   |
+---+

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

svn commit: r1709268 - in /tomcat/trunk: modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java test/webapp/WEB-INF/tags/bug58178.tag test/webapp/WEB-INF/tags/bug5817

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 12:20:10 2015
New Revision: 1709268

URL: http://svn.apache.org/viewvc?rev=1709268=rev
Log:
svn:eol-style = native

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
   (props changed)
tomcat/trunk/test/webapp/WEB-INF/tags/bug58178.tag   (props changed)
tomcat/trunk/test/webapp/WEB-INF/tags/bug58178b.tag   (props changed)

Propchange: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/webapp/WEB-INF/tags/bug58178.tag
--
svn:eol-style = native

Propchange: tomcat/trunk/test/webapp/WEB-INF/tags/bug58178b.tag
--
svn:eol-style = native



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

svn commit: r1709269 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java test/webapp/WEB-INF/tags/bug58178.tag test/webapp/WEB-INF/tags

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 12:22:31 2015
New Revision: 1709269

URL: http://svn.apache.org/viewvc?rev=1709269=rev
Log:
svn:eol-style = native

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
   (props changed)
tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag   (props changed)
tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag   (props 
changed)

Propchange: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
--
svn:eol-style = native

Propchange: tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178.tag
--
svn:eol-style = native

Propchange: tomcat/tc8.0.x/trunk/test/webapp/WEB-INF/tags/bug58178b.tag
--
svn:eol-style = native



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

svn commit: r1709267 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 12:16:22 2015
New Revision: 1709267

URL: http://svn.apache.org/viewvc?rev=1709267=rev
Log:
Update to Checkstyle 6.11.2
Add release date for Tomcat 8.0.28.

Merged r1709266 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 Sun Oct 18 12:16: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
 

svn commit: r1709270 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java test/webapp-3.0/WEB-INF/tags/bug58178.tag

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 12:24:56 2015
New Revision: 1709270

URL: http://svn.apache.org/viewvc?rev=1709270=rev
Log:
svn:eol-style = native

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
   (props changed)
tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags/bug58178.tag   (props 
changed)

Propchange: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
--
svn:eol-style = native

Propchange: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/tags/bug58178.tag
--
svn:eol-style = native



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

svn commit: r1709266 - /tomcat/trunk/build.properties.default

[kkolinko]

Author: kkolinko
Date: Sun Oct 18 12:09:53 2015
New Revision: 1709266

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

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1709266=1709265=1709266=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Oct 18 12:09:53 2015
@@ -211,7 +211,7 @@ objenesis.loc=https://objenesis.googleco
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
 # - Checkstyle, version 6.0 or later -
-checkstyle.version=6.8.1
+checkstyle.version=6.11.2
 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

svn commit: r1709295 - in /tomcat/trunk: java/org/apache/catalina/filters/ test/org/apache/catalina/filters/

[violetagg]

Author: violetagg
Date: Sun Oct 18 18:05:06 2015
New Revision: 1709295

URL: http://svn.apache.org/viewvc?rev=1709295=rev
Log:
There are use cases when a nonce information cannot be provided via header. 
This commit introduces a mechanism to provide it via request parameters.
If there is a X-CSRF-Token header, it will be taken with preference over any 
parameter with the same name in the request. 
Request parameters cannot be used to fetch new nonce, only header.
Only configured paths can accept such request parameters with nonce 
information. 

Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java

tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1709295=1709294=1709295=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Sun 
Oct 18 18:05:06 2015
@@ -92,15 +92,9 @@ public class CsrfPreventionFilter extend
 
 boolean skipNonceCheck = false;
 
-if (Constants.METHOD_GET.equals(req.getMethod())) {
-String path = req.getServletPath();
-if (req.getPathInfo() != null) {
-path = path + req.getPathInfo();
-}
-
-if (entryPoints.contains(path)) {
-skipNonceCheck = true;
-}
+if (Constants.METHOD_GET.equals(req.getMethod())
+&& entryPoints.contains(getRequestedPath(req))) {
+skipNonceCheck = true;
 }
 
 HttpSession session = req.getSession(false);

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1709295=1709294=1709295=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java 
Sun Oct 18 18:05:06 2015
@@ -21,6 +21,7 @@ import java.util.Random;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.juli.logging.Log;
@@ -121,4 +122,11 @@ public abstract class CsrfPreventionFilt
 return buffer.toString();
 }
 
+protected String getRequestedPath(HttpServletRequest request) {
+String path = request.getServletPath();
+if (request.getPathInfo() != null) {
+path = path + request.getPathInfo();
+}
+return path;
+}
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java?rev=1709295=1709294=1709295=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java 
Sun Oct 18 18:05:06 2015
@@ -17,7 +17,10 @@
 package org.apache.catalina.filters;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -30,12 +33,9 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 
 /**
- * Provides basic CSRF protection for REST APIs.
- * The filter assumes that:
- * 
- * The filter is mapped to /*
- * The clients have adapted the transfer of the nonce through the 
'X-CSRF-Token' header.
- * 
+ * Provides basic CSRF protection for REST APIs. The filter assumes that the
+ * clients have adapted the transfer of the nonce through the 'X-CSRF-Token'
+ * header.
  *
  * 
  * Positive scenario:
@@ -81,9 +81,13 @@ public class RestCsrfPreventionFilter ex
 }
 
 private static final Pattern NON_MODIFYING_METHODS_PATTERN = 
Pattern.compile("GET|HEAD|OPTIONS");
-private static final Predicate nonModifyingMethods = m -> m != 
null &&
+private static final Predicate nonModifyingMethods = m -> 
Objects.nonNull(m) &&
 NON_MODIFYING_METHODS_PATTERN.matcher(m).matches();
 
+private Set pathsAcceptingParams = new HashSet<>();
+
+private String