[Bug 60035] java.io.IOException: Too many open files

[bugzilla]

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

--- Comment #9 from Marcus Hughes  ---
All indications are that this fixed our issues. Thanks again.

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

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

[Bug 60123] New: Tomcat JMX requestProcessingTime sometimes reports a request processor with decades of runtime (since 1-1-1970)

[bugzilla]

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

Bug ID: 60123
   Summary: Tomcat JMX requestProcessingTime sometimes reports a
request processor with decades of runtime (since
1-1-1970)
   Product: Tomcat 7
   Version: 7.0.57
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: eddie.k...@gmail.com

We have an application that periodically monitors JMX
"Catalina:type=RequestProcessor,worker=*,name=*" and looks at each entry
returned from that wildcard, getting requestProcessingTime.  e.g., code with
lines like this:

ObjectName requestProcessorWildcard = new
ObjectName("Catalina:type=RequestProcessor,worker=*,name=*");
Set mbeans = mbs.queryNames(requestProcessorWildcard, null);
for (ObjectName name : mbeans) {
// Get "processing time" for the current request, if any
long currentReqProcTime = getLongValue(mbs, name,
"requestProcessingTime") / 6;

We sometimes see requestProcessingTime returning a value suggesting the request
started on 1-1-1970, currently 46+ years ago.  Looking at Tomcat 7.0.57 source
code (as what I have available to look at), I see this method in
java/org/apache/coyote/RequestInfo.java:

public long getRequestProcessingTime() {
if ( getStage() == org.apache.coyote.Constants.STAGE_ENDED ) return 0;
else return (System.currentTimeMillis() - req.getStartTime());
}

Clearly, if req.getStartTime() == 0, this method will return a nonsensical
request processing time.  This method ought to make sure the start time isn't
zero before doing the subtraction.  When we see this, the request processor
reports itself to be in stage 3 ... aka "STAGE_SERVICE".  Clearly the requests
weren't started in 1970.  We don't know how the request is in the stage
"service" but has its start time zeroed.

Note that the person in this thread
http://osdir.com/ml/users-tomcat.apache.org/2016-06/msg00204.html was probably
experiencing the same flaw.  If you do the math 1466499689496 msec corresponds
to the time span from 1-1-70 to Tue, 21 Jun 2016 09:01:29.496 GMT ... and the
EMail was posted on 21 June 2016!  I haven't followed the code through to see
what can cause this to occur.

-- 
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: r1760457 - in /tomcat/site/trunk: docs/sitemap-main.xml xdocs/sitemap-main.xml

[markt]

Author: markt
Date: Mon Sep 12 22:24:14 2016
New Revision: 1760457

URL: http://svn.apache.org/viewvc?rev=1760457=rev
Log:
Update sitemap

Modified:
tomcat/site/trunk/docs/sitemap-main.xml
tomcat/site/trunk/xdocs/sitemap-main.xml

Modified: tomcat/site/trunk/docs/sitemap-main.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/sitemap-main.xml?rev=1760457=1760456=1760457=diff
==
--- tomcat/site/trunk/docs/sitemap-main.xml (original)
+++ tomcat/site/trunk/docs/sitemap-main.xml Mon Sep 12 22:24:14 2016
@@ -12,16 +12,26 @@
 
   
   
-http://tomcat.apache.org/tomcat-8.0-doc/
+http://tomcat.apache.org/tomcat-9.0-doc/
 monthly
 0.9
   
   
-http://tomcat.apache.org/tomcat-7.0-doc/
+http://tomcat.apache.org/tomcat-8.5-doc/
 monthly
 0.8
   
   
+http://tomcat.apache.org/tomcat-8.0-doc/
+monthly
+0.5
+  
+  
+http://tomcat.apache.org/tomcat-7.0-doc/
+monthly
+0.7
+  
+  
 http://tomcat.apache.org/whichversion.html
 monthly
 0.7
@@ -52,6 +62,11 @@
 0.6
   
   
+http://tomcat.apache.org/native-1.1-doc/
+monthly
+0.4
+  
+  
 http://tomcat.apache.org/security.html
 monthly
 0.6

Modified: tomcat/site/trunk/xdocs/sitemap-main.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/sitemap-main.xml?rev=1760457=1760456=1760457=diff
==
--- tomcat/site/trunk/xdocs/sitemap-main.xml (original)
+++ tomcat/site/trunk/xdocs/sitemap-main.xml Mon Sep 12 22:24:14 2016
@@ -12,16 +12,26 @@
 
   
   
-http://tomcat.apache.org/tomcat-8.0-doc/
+http://tomcat.apache.org/tomcat-9.0-doc/
 monthly
 0.9
   
   
-http://tomcat.apache.org/tomcat-7.0-doc/
+http://tomcat.apache.org/tomcat-8.5-doc/
 monthly
 0.8
   
   
+http://tomcat.apache.org/tomcat-8.0-doc/
+monthly
+0.5
+  
+  
+http://tomcat.apache.org/tomcat-7.0-doc/
+monthly
+0.7
+  
+  
 http://tomcat.apache.org/whichversion.html
 monthly
 0.7
@@ -52,6 +62,11 @@
 0.6
   
   
+http://tomcat.apache.org/native-1.1-doc/
+monthly
+0.4
+  
+  
 http://tomcat.apache.org/security.html
 monthly
 0.6



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

[Bug 60116] NC matches in the Rewrite Valve cause matched groups to be lower case.

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards

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

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

svn commit: r1760456 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/rewrite/RewriteCond.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Sep 12 22:19:23 2016
New Revision: 1760456

URL: http://svn.apache.org/viewvc?rev=1760456=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60116
Fix a problem with the rewrite valve that caused back references evaluated in 
conditions to be forced to lower case when using the NC flag.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 22:19:23 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,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-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1760455 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/rewrite/RewriteCond.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Sep 12 22:16:47 2016
New Revision: 1760455

URL: http://svn.apache.org/viewvc?rev=1760455=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60116
Fix a problem with the rewrite valve that caused back references evaluated in 
conditions to be forced to lower case when using the NC flag.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 22:16:47 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005,1760300

svn commit: r1760454 - /tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

[markt]

Author: markt
Date: Mon Sep 12 22:15:10 2016
New Revision: 1760454

URL: http://svn.apache.org/viewvc?rev=1760454=rev
Log:
Fix indent

Modified:
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1760454=1760453=1760454=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
Mon Sep 12 22:15:10 2016
@@ -466,8 +466,9 @@ public class TestRewriteValve extends To
 doTestRewrite(config, request, expectedURI, expectedQueryString, null);
 }
 
-private void doTestRewrite(String config, String request, String 
expectedURI,
-String expectedQueryString, String expectedAttributeValue) 
throws Exception {
+
+private void doTestRewrite(String config, String request, String 
expectedURI,
+String expectedQueryString, String expectedAttributeValue) throws 
Exception {
 
 Tomcat tomcat = getTomcatInstance();
 



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

svn commit: r1760446 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/RewriteCond.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Sep 12 20:33:07 2016
New Revision: 1760446

URL: http://svn.apache.org/viewvc?rev=1760446=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60116
Fix a problem with the rewrite valve that caused back references evaluated in 
conditions to be forced to lower case when using the NC flag.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1760446=1760445=1760446=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Mon 
Sep 12 20:33:07 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina.valves.rewrite;
 
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -188,9 +187,6 @@ public class RewriteCond {
  */
 public boolean evaluate(Matcher rule, Matcher cond, Resolver resolver) {
 String value = test.evaluate(rule, cond, resolver);
-if (nocase) {
-value = value.toLowerCase(Locale.ENGLISH);
-}
 Condition condition = this.condition.get();
 if (condition == null) {
 if (condPattern.startsWith("<")) {

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1760446=1760445=1760446=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
Mon Sep 12 20:33:07 2016
@@ -447,6 +447,15 @@ public class TestRewriteValve extends To
 }
 
 
+@Test
+public void testFlagsNC() throws Exception {
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=60116
+doTestRewrite("RewriteCond %{QUERY_STRING} a=([a-z]*) [NC]\n"
++ "RewriteRule .* - [E=X-Test:%1]",
+"/c?a=aAa", "/c", null, "aAa");
+}
+
+
 private void doTestRewrite(String config, String request, String 
expectedURI) throws Exception {
 doTestRewrite(config, request, expectedURI, null);
 }
@@ -454,6 +463,11 @@ public class TestRewriteValve extends To
 
 private void doTestRewrite(String config, String request, String 
expectedURI,
 String expectedQueryString) throws Exception {
+doTestRewrite(config, request, expectedURI, expectedQueryString, null);
+}
+
+private void doTestRewrite(String config, String request, String 
expectedURI,
+String expectedQueryString, String expectedAttributeValue) 
throws Exception {
 
 Tomcat tomcat = getTomcatInstance();
 
@@ -485,5 +499,10 @@ public class TestRewriteValve extends To
 String queryString = 
requestDesc.getRequestInfo("REQUEST-QUERY-STRING");
 Assert.assertEquals(expectedQueryString, queryString);
 }
+
+if (expectedAttributeValue != null) {
+String attrbuteValue = requestDesc.getAttribute("X-Test");
+Assert.assertEquals(expectedAttributeValue, attrbuteValue);
+}
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1760446=1760445=1760446=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 12 20:33:07 2016
@@ -59,6 +59,11 @@
 improve the handling for the QSA flag. Includes multiple
 test cases by Santhana Preethi. (markt)
   
+  
+60116: Fix a problem with the rewrite valve that caused back
+references evaluated in conditions to be forced to lower case when 
using
+the NC flag. (markt)
+  
 
   
   



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

svn commit: r1760440 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/http.xml webapps/docs/ssl-howto.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 19:45:56 2016
New Revision: 1760440

URL: http://svn.apache.org/viewvc?rev=1760440=rev
Log:
Merge r1681703:
Merge docs about new DH and EC ephemeral key
handling in tcnative 1.1.34.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 19:45:56 2016
@@ -1,3 +1,3 @@
-/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,1689921,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,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1
 
726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565

[Bug 48490] Changing a node to stopped in uriworkermap.properties not reflected in jkstatus

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEEDINFO|RESOLVED

--- Comment #2 from Mark Thomas  ---
No response. Assuming this is fixed as Rainer suggests.

-- 
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 49732] reply_timeout can't wait forever.

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INVALID

--- Comment #5 from Mark Thomas  ---
No response to Rainer's question. Closing as invalid since individual timeout
settings are available.

-- 
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 54596] Relative path functionality truncates last character of configuration parameters preventing connector from working.

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #11 from Mark Thomas  ---
Assuming this is fixed in 1.2.41.

-- 
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 58813] Incoming requests hang after a website using the ISAPI connector is restarted

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 CC||thomas.reiser@speed4trade.c
   ||om

--- Comment #7 from Mark Thomas  ---
*** Bug 59092 has been marked as a duplicate of this bug. ***

-- 
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 58813] Incoming requests hang after a website using the ISAPI connector is restarted

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 CC||murilo.v.andre...@gmail.com

--- Comment #6 from Mark Thomas  ---
*** Bug 59334 has been marked as a duplicate of this bug. ***

-- 
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 59092] Shutdown of ISAPI filter leads to infinite wait and hangs whole IIS

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|NEW |RESOLVED

--- Comment #4 from Mark Thomas  ---


*** This bug has been marked as a duplicate of bug 58813 ***

-- 
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 58813] Incoming requests hang after a website using the ISAPI connector is restarted

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #5 from Mark Thomas  ---
Fixed in trunk for 1.2.42 onwards

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

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

svn commit: r1760437 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Mon Sep 12 19:06:52 2016
New Revision: 1760437

URL: http://svn.apache.org/viewvc?rev=1760437=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58813
Correctly release a mutex allowing the plugin to complete initialization. Prior 
to this fix, the incomplete initialization was causing a hang on shutdown.
Patch provided by Matthew Reiter.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1760437=1760436=1760437=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Sep 12 19:06:52 2016
@@ -2319,7 +2319,7 @@ BOOL WINAPI TerminateFilter(DWORD dwFlag
 jk_close_file_logger();
 }
 }
-ReleaseMutex(_cs);
+ReleaseMutex(init_cs);
 LeaveCriticalSection(_cs);
 return TRUE;
 }

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1760437=1760436=1760437=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 12 19:06:52 2016
@@ -74,6 +74,12 @@
 was introduced by the fix to 44454 and 56703.
 (rjung)
   
+  
+58813: ISAPI: Correctly release a mutex allowing the plugin
+to complete initialization. Prior to this fix, the incomplete
+initialization was causing a hang on shutdown. Patch provided by 
Matthew
+Reiter. (markt)
+  
 
   
 



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

[Bug 59334] .NET Application Pools requests hang because Jakarta/Tomcat uses a Named Mutex that is currently owned by a different process

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #9 from Mark Thomas  ---


*** This bug has been marked as a duplicate of bug 58813 ***

-- 
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: r15324 - /dev/tomcat/tomcat-7/v7.0.71/

[violetagg]

Author: violetagg
Date: Mon Sep 12 17:33:10 2016
New Revision: 15324

Log:
Tomcat 7.0.71 did not pass the vote

Removed:
dev/tomcat/tomcat-7/v7.0.71/


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

[Bug 60013] Non-ASCII characters in querystring get mangled after URL Rewrite using RewriteValve

[bugzilla]

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

--- Comment #33 from Mark Thomas  ---
It appears that httpd (at least as provided by 2.4.7 in Ubuntu 14.04.5 which I
am using to test) sometimes double encodes when QSA is used as well.

I've reworked the QSA handling, added your test case, fixed another test case
that was broken by this fix and made sure your name is in the changelog.

Thanks for sticking with this. Let us know how you get on. I'd like to get this
all sported out in time for the next release scheduled for the end of the
month.

-- 
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: r1760397 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/RewriteValve.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Sep 12 16:00:27 2016
New Revision: 1760397

URL: http://svn.apache.org/viewvc?rev=1760397=rev
Log:
Follow-up for https://bz.apache.org/bugzilla/show_bug.cgi?id=60013
Fix some long lines and remove multiple calls to 
request.getConnector().getURIEncoding()
Improve handling for QSA.
Includes a test case provided by Santhana Preethi

Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1760397=1760396=1760397=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Mon 
Sep 12 16:00:27 2016
@@ -323,12 +323,16 @@ public class RewriteValve extends ValveB
 
 // As long as MB isn't a char sequence or affiliated, this has to 
be
 // converted to a string
-MessageBytes urlMB = context ? request.getRequestPathMB() : 
request.getDecodedRequestURIMB();
+String uriEncoding = request.getConnector().getURIEncoding();
+String originalQueryStringEncoded = request.getQueryString();
+MessageBytes urlMB =
+context ? request.getRequestPathMB() : 
request.getDecodedRequestURIMB();
 urlMB.toChars();
 CharSequence urlDecoded = urlMB.getCharChunk();
 CharSequence host = request.getServerName();
 boolean rewritten = false;
 boolean done = false;
+boolean qsa = false;
 for (int i = 0; i < rules.length; i++) {
 RewriteRule rule = rules[i];
 CharSequence test = (rule.isHost()) ? host : urlDecoded;
@@ -346,6 +350,13 @@ public class RewriteValve extends ValveB
 rewritten = true;
 }
 
+// Check QSA before the final reply
+if (!qsa && newtest != null && rule.isQsappend()) {
+// TODO: This logic will need some tweaks if we add QSD
+//   support
+qsa = true;
+}
+
 // Final reply
 
 // - forbidden
@@ -360,10 +371,11 @@ public class RewriteValve extends ValveB
 done = true;
 break;
 }
+
 // - redirect (code)
 if (rule.isRedirect() && newtest != null) {
-// append the query string to the url if there is one and 
it hasn't been rewritten
-String originalQueryStringEncoded = 
request.getQueryString();
+// Append the query string to the url if there is one and 
it
+// hasn't been rewritten
 String urlStringDecoded = urlDecoded.toString();
 int index = urlStringDecoded.indexOf("?");
 String rewrittenQueryStringDecoded;
@@ -374,16 +386,19 @@ public class RewriteValve extends ValveB
 urlStringDecoded = urlStringDecoded.substring(0, 
index);
 }
 
-StringBuffer urlStringEncoded = new 
StringBuffer(ENCODER.encode(urlStringDecoded, 
request.getConnector().getURIEncoding()));
-if (originalQueryStringEncoded != null && 
originalQueryStringEncoded.length() > 0) {
+StringBuffer urlStringEncoded =
+new StringBuffer(ENCODER.encode(urlStringDecoded, 
uriEncoding));
+if (originalQueryStringEncoded != null &&
+originalQueryStringEncoded.length() > 0) {
 if (rewrittenQueryStringDecoded == null) {
 urlStringEncoded.append('?');
 
urlStringEncoded.append(originalQueryStringEncoded);
 } else {
-if (rule.isQsappend()) {
+if (qsa) {
 // if qsa is specified append the query
 urlStringEncoded.append('?');
-
urlStringEncoded.append(ENCODER.encode(rewrittenQueryStringDecoded, 
request.getConnector().getURIEncoding()));
+urlStringEncoded.append(
+
ENCODER.encode(rewrittenQueryStringDecoded, uriEncoding));
 urlStringEncoded.append('&');
 
urlStringEncoded.append(originalQueryStringEncoded);
 } else if (index == 

Re: [Bug 60119] New: can go to the property

[Mark Thomas]

On 12/09/2016 15:21, bugzi...@apache.org wrote:
> https://bz.apache.org/bugzilla/show_bug.cgi?id=60119

User locked.

Bug and attachment deleted.

Mark

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

[Bug 60119] New: can go to the property

[bugzilla]

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

Bug ID: 60119
   Summary: can go to the property
   Product: Tomcat Native
   Version: unspecified
  Hardware: Other
   URL: http://creditlogin
OS: Linux
Status: NEW
  Severity: normal
  Priority: P5
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: blueeyes211...@gmail.com

Created attachment 34237
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34237=edit
Open

-- 
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 60117] New: OneLineFormatter doesn't localize the log level.

[bugzilla]

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

Bug ID: 60117
   Summary: OneLineFormatter doesn't localize the log level.
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: PC
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: t.bessho0...@gmail.com

Created attachment 34236
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34236=edit
patch against trunk.

I set "-Duser.language=ja".
The Log level is always output in English.
This means my setting is ignored.
The Log level should be localized.

-- 
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: r1760322 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Sep 12 09:11:19 2016
New Revision: 1760322

URL: http://svn.apache.org/viewvc?rev=1760322=rev
Log:
Ensure that the POOL_EMPTY notification has been added to the jmx notification 
types.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760322=1760321=1760322=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 09:11:19 2016
@@ -90,7 +90,7 @@ public class ConnectionPool extends Noti
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
 String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
-FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
POOL_EMPTY, SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760322=1760321=1760322=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 09:11:19 2016
@@ -72,6 +72,10 @@
 Notify jmx when returning the connection that has been marked suspect.
 (kfujino)
   
+  
+Ensure that the POOL_EMPTY notification has been added to
+the jmx notification types. (kfujino)
+  
 
   
 



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

svn commit: r1760321 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Sep 12 09:10:29 2016
New Revision: 1760321

URL: http://svn.apache.org/viewvc?rev=1760321=rev
Log:
Ensure that the POOL_EMPTY notification has been added to the jmx notification 
types.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760321=1760320=1760321=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 09:10:29 2016
@@ -89,7 +89,7 @@ public class ConnectionPool extends Noti
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
 String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
-FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
POOL_EMPTY, SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

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=1760321=1760320=1760321=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 09:10:29 2016
@@ -96,6 +96,10 @@
 Notify jmx when returning the connection that has been marked suspect.
 (kfujino)
   
+  
+Ensure that the POOL_EMPTY notification has been added to
+the jmx notification types. (kfujino)
+  
 
   
   



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

svn commit: r1760320 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Sep 12 09:09:03 2016
New Revision: 1760320

URL: http://svn.apache.org/viewvc?rev=1760320=rev
Log:
Ensure that the POOL_EMPTY notification has been added to the jmx notification 
types.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760320=1760319=1760320=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 09:09:03 2016
@@ -89,7 +89,7 @@ public class ConnectionPool extends Noti
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
 String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
-FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
POOL_EMPTY, SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1760320=1760319=1760320=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Sep 12 09:09:03 2016
@@ -92,6 +92,10 @@
 Notify jmx when returning the connection that has been marked suspect.
 (kfujino)
   
+  
+Ensure that the POOL_EMPTY notification has been added to
+the jmx notification types. (kfujino)
+  
 
   
   



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

svn commit: r1760319 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon Sep 12 09:06:29 2016
New Revision: 1760319

URL: http://svn.apache.org/viewvc?rev=1760319=rev
Log:
Ensure that the POOL_EMPTY notification has been added to the jmx notification 
types.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760319=1760318=1760319=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 09:06:29 2016
@@ -89,7 +89,7 @@ public class ConnectionPool extends Noti
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
 String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
-FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
POOL_EMPTY, SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1760319=1760318=1760319=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 12 09:06:29 2016
@@ -97,6 +97,10 @@
 Notify jmx when returning the connection that has been marked suspect.
 (kfujino)
   
+  
+Ensure that the POOL_EMPTY notification has been added to
+the jmx notification types. (kfujino)
+  
 
   
   



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

[Bug 60101] 7.0.71 (RC): Jasper fails to initialize when running with SecurityManager enabled

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

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

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

Thanks for the report.
This has been fixed in
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.72 onwards

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: r1760312 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 08:30:33 2016
New Revision: 1760312

URL: http://svn.apache.org/viewvc?rev=1760312=rev
Log:
Tomcat 7.0.71 did not pass the vote

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760312=1760311=1760312=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 08:30:33 2016
@@ -75,7 +75,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r1760309 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/security/SecurityClassLoad.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 08:27:56 2016
New Revision: 1760309

URL: http://svn.apache.org/viewvc?rev=1760309=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60101
Remove preloading of the class that was deleted

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 08:27:56 2016
@@ -1,3 +1,3 @@
 
/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,1689921,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,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1
 
726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565
 

svn commit: r1760307 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/security/SecurityClassLoad.java java/org/apache/jasper/servlet/JasperInitializer.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 08:17:18 2016
New Revision: 1760307

URL: http://svn.apache.org/viewvc?rev=1760307=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60101
Remove preloading of the class that was deleted.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 08:17:18 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,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-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1760306 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/Connect

[kfujino]

Author: kfujino
Date: Mon Sep 12 08:16:06 2016
New Revision: 1760306

URL: http://svn.apache.org/viewvc?rev=1760306=rev
Log:
Notify jmx when returning the connection that has been marked suspect.

Modified:

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

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1760306=1760305=1760306=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Sep 12 08:16:06 2016
@@ -896,6 +896,10 @@ public class ConnectionPool {
 log.info("Connection(" + con + ") that has been marked 
suspect was returned."
 + " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
 }
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.SUSPECT_RETURNED_NOTIFICATION,
+"Connection(" + con + ") that has been marked 
suspect was returned.");
+}
 }
 if (busy.remove(con)) {
 

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760306=1760305=1760306=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 08:16:06 2016
@@ -76,6 +76,7 @@ public class ConnectionPool extends Noti
 public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
 public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT 
CONNETION ABANDONED";
 public static final String POOL_EMPTY = "POOL EMPTY";
+public static final String SUSPECT_RETURNED_NOTIFICATION = "SUSPECT 
CONNETION RETURNED";
 
 @Override
 public MBeanNotificationInfo[] getNotificationInfo() {
@@ -88,7 +89,8 @@ public class ConnectionPool extends Noti
 }
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
-String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION, FAILED_QUERY_NOTIFICATION, 
SUSPECT_ABANDONED_NOTIFICATION};
+String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1760306=1760305=1760306=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 08:16:06 2016
@@ -58,6 +58,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Notify jmx when returning the connection that has been marked suspect.
+(kfujino)
+  
+
+  
 
 
   



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

svn commit: r1760305 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/security/SecurityClassLoad.java java/org/apache/jasper/servlet/JasperInitializer.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 08:15:57 2016
New Revision: 1760305

URL: http://svn.apache.org/viewvc?rev=1760305=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60101
Remove preloading of the class that was deleted.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 08:15:57 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759611,1760005

svn commit: r1760303 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/Connect

[kfujino]

Author: kfujino
Date: Mon Sep 12 08:14:14 2016
New Revision: 1760303

URL: http://svn.apache.org/viewvc?rev=1760303=rev
Log:
Notify jmx when returning the connection that has been marked suspect.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1760303=1760302=1760303=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Sep 12 08:14:14 2016
@@ -893,6 +893,10 @@ public class ConnectionPool {
 log.info("Connection(" + con + ") that has been marked 
suspect was returned."
 + " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
 }
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.SUSPECT_RETURNED_NOTIFICATION,
+"Connection(" + con + ") that has been marked 
suspect was returned.");
+}
 }
 if (busy.remove(con)) {
 

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760303=1760302=1760303=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 08:14:14 2016
@@ -75,6 +75,7 @@ public class ConnectionPool extends Noti
 public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
 public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT 
CONNETION ABANDONED";
 public static final String POOL_EMPTY = "POOL EMPTY";
+public static final String SUSPECT_RETURNED_NOTIFICATION = "SUSPECT 
CONNETION RETURNED";
 
 @Override
 public MBeanNotificationInfo[] getNotificationInfo() {
@@ -87,7 +88,8 @@ public class ConnectionPool extends Noti
 }
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
-String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION, FAILED_QUERY_NOTIFICATION, 
SUSPECT_ABANDONED_NOTIFICATION};
+String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

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=1760303=1760302=1760303=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Sep 12 08:14:14 2016
@@ -82,6 +82,14 @@
   
 
   
+  
+
+  
+Notify jmx when returning the connection that has been marked suspect.
+(kfujino)
+  
+
+  
   
 
   



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

svn commit: r1760301 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/Connect

[kfujino]

Author: kfujino
Date: Mon Sep 12 08:11:31 2016
New Revision: 1760301

URL: http://svn.apache.org/viewvc?rev=1760301=rev
Log:
Notify jmx when returning the connection that has been marked suspect.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1760301=1760300=1760301=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Sep 12 08:11:31 2016
@@ -902,6 +902,10 @@ public class ConnectionPool {
 log.info("Connection(" + con + ") that has been marked 
suspect was returned."
 + " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
 }
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.SUSPECT_RETURNED_NOTIFICATION,
+"Connection(" + con + ") that has been marked 
suspect was returned.");
+}
 }
 if (busy.remove(con)) {
 

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760301=1760300=1760301=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 08:11:31 2016
@@ -75,6 +75,7 @@ public class ConnectionPool extends Noti
 public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
 public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT 
CONNETION ABANDONED";
 public static final String POOL_EMPTY = "POOL EMPTY";
+public static final String SUSPECT_RETURNED_NOTIFICATION = "SUSPECT 
CONNETION RETURNED";
 
 @Override
 public MBeanNotificationInfo[] getNotificationInfo() {
@@ -87,7 +88,8 @@ public class ConnectionPool extends Noti
 }
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
-String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION, FAILED_QUERY_NOTIFICATION, 
SUSPECT_ABANDONED_NOTIFICATION};
+String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1760301=1760300=1760301=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Sep 12 08:11:31 2016
@@ -78,6 +78,14 @@
   
 
   
+  
+
+  
+Notify jmx when returning the connection that has been marked suspect.
+(kfujino)
+  
+
+  
   
 
   



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

svn commit: r1760300 - in /tomcat/trunk: java/org/apache/jasper/security/SecurityClassLoad.java java/org/apache/jasper/servlet/JasperInitializer.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Sep 12 08:11:29 2016
New Revision: 1760300

URL: http://svn.apache.org/viewvc?rev=1760300=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60101
Remove preloading of the class that was deleted.

Modified:
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1760300=1760299=1760300=diff
==
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Mon Sep 
12 08:11:29 2016
@@ -46,8 +46,6 @@ public final class SecurityClassLoad {
 
 loader.loadClass( basePackage +
 "runtime.JspRuntimeLibrary");
-loader.loadClass( basePackage +
-"runtime.JspRuntimeLibrary$PrivilegedIntrospectHelper");
 
 loader.loadClass( basePackage +
 "runtime.ServletResponseWrapperInclude");

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1760300=1760299=1760300=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Mon Sep 
12 08:11:29 2016
@@ -60,8 +60,6 @@ public class JasperInitializer implement
 factory.getClass().getClassLoader().loadClass( basePackage +
 "runtime.JspRuntimeLibrary");
 factory.getClass().getClassLoader().loadClass( basePackage +
-
"runtime.JspRuntimeLibrary$PrivilegedIntrospectHelper");
-factory.getClass().getClassLoader().loadClass( basePackage +
 "runtime.ServletResponseWrapperInclude");
 factory.getClass().getClassLoader().loadClass( basePackage +
 "servlet.JspServletWrapper");

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1760300=1760299=1760300=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 12 08:11:29 2016
@@ -73,6 +73,14 @@
   
 
   
+  
+
+  
+60101: Remove preloading of the class that was deleted.
+(violetagg)
+  
+
+  
   
 
   



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

svn commit: r1760299 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.

[kfujino]

Author: kfujino
Date: Mon Sep 12 08:09:33 2016
New Revision: 1760299

URL: http://svn.apache.org/viewvc?rev=1760299=rev
Log:
Notify jmx when returning the connection that has been marked suspect.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1760299=1760298=1760299=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Sep 12 08:09:33 2016
@@ -902,6 +902,10 @@ public class ConnectionPool {
 log.info("Connection(" + con + ") that has been marked 
suspect was returned."
 + " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
 }
+if (jmxPool!=null) {
+
jmxPool.notify(org.apache.tomcat.jdbc.pool.jmx.ConnectionPool.SUSPECT_RETURNED_NOTIFICATION,
+"Connection(" + con + ") that has been marked 
suspect was returned.");
+}
 }
 if (busy.remove(con)) {
 

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1760299=1760298=1760299=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Sep 12 08:09:33 2016
@@ -75,6 +75,7 @@ public class ConnectionPool extends Noti
 public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
 public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT 
CONNETION ABANDONED";
 public static final String POOL_EMPTY = "POOL EMPTY";
+public static final String SUSPECT_RETURNED_NOTIFICATION = "SUSPECT 
CONNETION RETURNED";
 
 @Override
 public MBeanNotificationInfo[] getNotificationInfo() {
@@ -87,7 +88,8 @@ public class ConnectionPool extends Noti
 }
 
 public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
-String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION, FAILED_QUERY_NOTIFICATION, 
SUSPECT_ABANDONED_NOTIFICATION};
+String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, 
NOTIFY_ABANDON, SLOW_QUERY_NOTIFICATION,
+FAILED_QUERY_NOTIFICATION, SUSPECT_ABANDONED_NOTIFICATION, 
SUSPECT_RETURNED_NOTIFICATION};
 String name = Notification.class.getName();
 String description = "A connection pool error condition was met.";
 MBeanNotificationInfo info = new MBeanNotificationInfo(types, name, 
description);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1760299=1760298=1760299=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 12 08:09:33 2016
@@ -83,6 +83,14 @@
   
 
   
+  
+
+  
+Notify jmx when returning the connection that has been marked suspect.
+(kfujino)
+  
+
+  
   
 
   



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

[Bug 60116] New: NC matches in the Rewrite Valve cause matched groups to be lower case.

[bugzilla]

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

Bug ID: 60116
   Summary: NC matches in the Rewrite Valve cause matched groups
to be lower case.
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: sebs...@sebster.com

I have the following rewrite rule:

RewriteCond %{REQUEST_URI} /test
RewriteCond %{QUERY_STRING}
.*a=([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}).* [NC]
RewriteRule .* - [E=X-Tenant-Id:%1,L]

This matches the query string to the supplied pattern in a case insensitive
way. However, the back reference %1 is always lower case, independent of the
actual query string. That is, if the query string is:

http://localhost:8080/test?a=CFA2AFDF-5D36-4D1F-B798-430557CF4355

the matched back reference %1 is cfa2afdf-5d36-4d1f-b798-430557cf4355.

This is strange and unexpected. It is also not how NC works in The Apache HTTP
server mod_rewrite, which just does the test in a case insensitive way but
returns the actual matched group. Case insensitive Java regular expressions
also do not change the case of any of the matched groups.

-- 
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: [CANCEL][VOTE] Release Apache Tomcat 7.0.71

[Violeta Georgieva]

Hi,

2016-09-07 14:00 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.71 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.71/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1094/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_71/
>
> The proposed 7.0.71 release is:
> [X] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.71 Stable

Cancel the vote because of the reported regression.
I am working on a fix for the issue.

Thanks,
Violeta

> Regards,
> Violeta