svn commit: r1803300 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ActionCode.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:32:59 2017
New Revision: 1803300

URL: http://svn.apache.org/viewvc?rev=1803300&view=rev
Log:
Better comment
Review by kkolinko

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 28 16:32:59 2017
@@ -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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,17638

Re: svn commit: r1803278 - in /tomcat/trunk: java/org/apache/catalina/valves/AbstractAccessLogValve.java java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/ActionCode.java webapps/do

2017-07-28 Thread Mark Thomas 
On 28/07/2017 17:09, Konstantin Kolinko wrote:

Both issues fixed. Thanks for the review.

Mark


> 2017-07-28 17:50 GMT+03:00  :
>> Author: markt
>> Date: Fri Jul 28 14:50:36 2017
>> New Revision: 1803278
>>
>> URL: http://svn.apache.org/viewvc?rev=1803278&view=rev
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61164
>> Add support for the %X pattern in the AccessLogValve that reports the 
>> connection status at the end of the request. Patch provided by Zemian Deng.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
>> tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
>> tomcat/trunk/java/org/apache/coyote/ActionCode.java
>> tomcat/trunk/webapps/docs/changelog.xml
>> tomcat/trunk/webapps/docs/config/valve.xml
>>
>> Modified: 
>> tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1803278&r1=1803277&r2=1803278&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
>> Fri Jul 28 14:50:36 2017
>> @@ -30,7 +30,9 @@ import java.util.List;
>>  import java.util.Locale;
>>  import java.util.Map;
>>  import java.util.TimeZone;
>> +import java.util.concurrent.atomic.AtomicBoolean;
>>
>> +import javax.servlet.RequestDispatcher;
>>  import javax.servlet.ServletException;
>>  import javax.servlet.http.Cookie;
>>  import javax.servlet.http.HttpSession;
>> @@ -40,9 +42,11 @@ import org.apache.catalina.Globals;
>>  import org.apache.catalina.LifecycleException;
>>  import org.apache.catalina.LifecycleState;
>>  import org.apache.catalina.Session;
>> +import org.apache.catalina.connector.ClientAbortException;
>>  import org.apache.catalina.connector.Request;
>>  import org.apache.catalina.connector.Response;
>>  import org.apache.catalina.util.TLSUtil;
>> +import org.apache.coyote.ActionCode;
>>  import org.apache.coyote.RequestInfo;
>>  import org.apache.juli.logging.Log;
>>  import org.apache.juli.logging.LogFactory;
>> @@ -83,7 +87,14 @@ import org.apache.tomcat.util.collection
>>   * %v - Local server name
>>   * %D - Time taken to process the request, in millis
>>   * %T - Time taken to process the request, in seconds
>> + * %F - Time taken to commit the response, in millis
>>   * %I - current Request thread name (can compare later with 
>> stacktraces)
>> + * %X - Connection status when response is completed:
>> + *   
>> + *   X = Connection aborted before the response 
>> completed.
>> + *   + = Connection may be kept alive after the response 
>> is sent.
>> + *   - = Connection will be closed after the response is 
>> sent.
>> + *   
>>   * 
>>   * In addition, the caller can specify one of the following aliases for
>>   * commonly utilized patterns:
>> @@ -1506,6 +1517,47 @@ public abstract class AbstractAccessLogV
>>  }
>>  }
>>
>> +/**
>> + * Write connection status when response is completed - %X
>> + */
>> +protected static class ConnectionStatusElement implements 
>> AccessLogElement {
>> +@Override
>> +public void addElement(CharArrayWriter buf, Date date, Request 
>> request, Response response, long time) {
>> +if (response != null && request != null) {
>> +boolean statusFound = false;
>> +
>> +// Check whether connection IO is in "not allowed" state
>> +AtomicBoolean isIoAllowed = new AtomicBoolean(false);
>> +request.getCoyoteRequest().action(ActionCode.IS_IO_ALLOWED, 
>> isIoAllowed);
>> +if (!isIoAllowed.get()) {
>> +buf.append('X');
>> +statusFound = true;
>> +} else {
>> +// Check for connection aborted cond
>> +if (response.isError()) {
>> +Throwable ex = (Throwable) 
>> request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
>> +if (ex instanceof ClientAbortException) {
>> +buf.append('X');
>> +statusFound = true;
>> +}
>> +}
>> +}
>> +
>> +// If status is not found yet, cont to check whether 
>> connection is keep-alive or close
>> +if (!statusFound) {
>> +String connStatus = 
>> response.getHeader(org.apache.coyote.http11.Constants.CONNECTION);
>> +if 
>> (org.apache.coyote.http11.Constants.CLOSE.equals(connStatus)) {
> 
> I think it needs equalsIgnoreCase(), as the "Close" header can be set
> by web application code as well and thus can be in any case
> (to force Tomcat to close the connection).
> 
> BTW,

svn commit: r1803297 - /tomcat/trunk/java/org/apache/coyote/ActionCode.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:30:57 2017
New Revision: 1803297

URL: http://svn.apache.org/viewvc?rev=1803297&view=rev
Log:
Better comment
Review by kkolinko

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

Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1803297&r1=1803296&r2=1803297&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Fri Jul 28 16:30:57 2017
@@ -54,7 +54,8 @@ public enum ActionCode {
 IS_ERROR,
 
 /**
- * Is connection IO allowed after processor is in error stated.
+ * The processor may have been placed into an error state and some error
+ * states do not permit any further I/O. Is I/O currently allowed?
  */
 IS_IO_ALLOWED,
 



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

svn commit: r1803296 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/AbstractAccessLogValve.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:28:47 2017
New Revision: 1803296

URL: http://svn.apache.org/viewvc?rev=1803296&view=rev
Log:
HTTP header value may use different case if set by the application
Review by kkolinko

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

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 28 16:28:47 2017
@@ -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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,176

svn commit: r1803295 - /tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:28:02 2017
New Revision: 1803295

URL: http://svn.apache.org/viewvc?rev=1803295&view=rev
Log:
HTTP header value may use different case if set by the application
Review by kkolinko

Modified:
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1803295&r1=1803294&r2=1803295&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
Fri Jul 28 16:28:02 2017
@@ -1546,7 +1546,7 @@ public abstract class AbstractAccessLogV
 // If status is not found yet, cont to check whether 
connection is keep-alive or close
 if (!statusFound) {
 String connStatus = 
response.getHeader(org.apache.coyote.http11.Constants.CONNECTION);
-if 
(org.apache.coyote.http11.Constants.CLOSE.equals(connStatus)) {
+if 
(org.apache.coyote.http11.Constants.CLOSE.equalsIgnoreCase(connStatus)) {
 buf.append('-');
 } else {
 buf.append('+');



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

svn commit: r1803294 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:23:11 2017
New Revision: 1803294

URL: http://svn.apache.org/viewvc?rev=1803294&view=rev
Log:
Remove the download and doc links for 6.0.x
Remove most of the remaining references to Tomcat 6

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/conference.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/download-taglibs.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/docs/migration-6.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security-taglibs.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/docs/taglibs.html
tomcat/site/trunk/docs/tomcat-55-eol.html
tomcat/site/trunk/docs/tomcat-60-eol.html
tomcat/site/trunk/docs/tomcat-80-eol.html
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/migration.xml
tomcat/site/trunk/xdocs/stylesheets/project.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 Tomcat 7
 
 
-Tomcat 6
-
-
 Tomcat Connectors
 
 
@@ -100,9 +97,6 @@
 Tomcat 7.0
 
 
-Tomcat 6.0
-
-
 Tomcat Connectors
 
 
@@ -466,8 +460,8 @@ problem you are having before reporting
 The same problem should be reported only once, but the fix may
 be applied to different Tomcat versions. While doing so, the bug report
 is moved between different products. A bug that is originally
-reported against Tomcat 8 is moved to Tomcat 7 and maybe later to
-Tomcat 6. So it makes sense to search all the versions at once.
+reported against Tomcat 9 is moved to Tomcat 8 and maybe later to
+Tomcat 7. So it makes sense to search all the versions at once.
 
 
 Here is a quick list of supported products:
@@ -475,8 +469,8 @@ problem you are having before reporting
 
  
 
-Tomcat 9, Tomcat 8, Tomcat 7 and
- Tomcat 6 – Tomcat 9.0.x, 8.5.x or 8.0.x, 7.0.x and 
6.0.x
+Tomcat 9, Tomcat 8 and Tomcat 7
+ – Tomcat 9.0.x, 8.5.x or 8.0.x and 7.0.x
  
 
 Tomcat Connectors – Integration of Tomcat with other Web 
servers
@@ -559,16 +553,6 @@ problem you are having before reporting
   See Buildbot page for details.
   
 
-  
-
-STATUS file for Tomcat 6
-
-A STATUS file is used in Review-Then-Commit development process to
-  propose and then vote for the proposed patches. These are available
-  in the source code of versions of Tomcat that use Review-Than-Commit.
-  Currently only Tomcat 6 uses this development model.
-  
-
 
 
 
@@ -583,7 +567,6 @@ problem you are having before reporting
 Product
   Changelog (released)
   Changelog (unreleased)
-  STATUS
 
 
 
@@ -597,7 +580,6 @@ problem you are having before reporting
   
 http://svn.ap

Re: svn commit: r1803278 - in /tomcat/trunk: java/org/apache/catalina/valves/AbstractAccessLogValve.java java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/ActionCode.java webapps/do

2017-07-28 Thread Konstantin Kolinko 
2017-07-28 17:50 GMT+03:00  :
> Author: markt
> Date: Fri Jul 28 14:50:36 2017
> New Revision: 1803278
>
> URL: http://svn.apache.org/viewvc?rev=1803278&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61164
> Add support for the %X pattern in the AccessLogValve that reports the 
> connection status at the end of the request. Patch provided by Zemian Deng.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
> tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
> tomcat/trunk/java/org/apache/coyote/ActionCode.java
> tomcat/trunk/webapps/docs/changelog.xml
> tomcat/trunk/webapps/docs/config/valve.xml
>
> Modified: 
> tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1803278&r1=1803277&r2=1803278&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
> Fri Jul 28 14:50:36 2017
> @@ -30,7 +30,9 @@ import java.util.List;
>  import java.util.Locale;
>  import java.util.Map;
>  import java.util.TimeZone;
> +import java.util.concurrent.atomic.AtomicBoolean;
>
> +import javax.servlet.RequestDispatcher;
>  import javax.servlet.ServletException;
>  import javax.servlet.http.Cookie;
>  import javax.servlet.http.HttpSession;
> @@ -40,9 +42,11 @@ import org.apache.catalina.Globals;
>  import org.apache.catalina.LifecycleException;
>  import org.apache.catalina.LifecycleState;
>  import org.apache.catalina.Session;
> +import org.apache.catalina.connector.ClientAbortException;
>  import org.apache.catalina.connector.Request;
>  import org.apache.catalina.connector.Response;
>  import org.apache.catalina.util.TLSUtil;
> +import org.apache.coyote.ActionCode;
>  import org.apache.coyote.RequestInfo;
>  import org.apache.juli.logging.Log;
>  import org.apache.juli.logging.LogFactory;
> @@ -83,7 +87,14 @@ import org.apache.tomcat.util.collection
>   * %v - Local server name
>   * %D - Time taken to process the request, in millis
>   * %T - Time taken to process the request, in seconds
> + * %F - Time taken to commit the response, in millis
>   * %I - current Request thread name (can compare later with 
> stacktraces)
> + * %X - Connection status when response is completed:
> + *   
> + *   X = Connection aborted before the response 
> completed.
> + *   + = Connection may be kept alive after the response is 
> sent.
> + *   - = Connection will be closed after the response is 
> sent.
> + *   
>   * 
>   * In addition, the caller can specify one of the following aliases for
>   * commonly utilized patterns:
> @@ -1506,6 +1517,47 @@ public abstract class AbstractAccessLogV
>  }
>  }
>
> +/**
> + * Write connection status when response is completed - %X
> + */
> +protected static class ConnectionStatusElement implements 
> AccessLogElement {
> +@Override
> +public void addElement(CharArrayWriter buf, Date date, Request 
> request, Response response, long time) {
> +if (response != null && request != null) {
> +boolean statusFound = false;
> +
> +// Check whether connection IO is in "not allowed" state
> +AtomicBoolean isIoAllowed = new AtomicBoolean(false);
> +request.getCoyoteRequest().action(ActionCode.IS_IO_ALLOWED, 
> isIoAllowed);
> +if (!isIoAllowed.get()) {
> +buf.append('X');
> +statusFound = true;
> +} else {
> +// Check for connection aborted cond
> +if (response.isError()) {
> +Throwable ex = (Throwable) 
> request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
> +if (ex instanceof ClientAbortException) {
> +buf.append('X');
> +statusFound = true;
> +}
> +}
> +}
> +
> +// If status is not found yet, cont to check whether 
> connection is keep-alive or close
> +if (!statusFound) {
> +String connStatus = 
> response.getHeader(org.apache.coyote.http11.Constants.CONNECTION);
> +if 
> (org.apache.coyote.http11.Constants.CLOSE.equals(connStatus)) {

I think it needs equalsIgnoreCase(), as the "Close" header can be set
by web application code as well and thus can be in any case
(to force Tomcat to close the connection).

BTW, I wonder what happens if it is an HTTP/1.0 client.

(I think there will be a "Close" header in the response anyway, so
this code works as well.)

> +buf.append('-');
> +} else

svn commit: r20661 - /dev/tomcat/tomcat-8/v8.5.19/ /release/tomcat/tomcat-8/v8.5.19/

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 16:07:24 2017
New Revision: 20661

Log:
Release Tomcat 8.5.19

Added:
release/tomcat/tomcat-8/v8.5.19/
  - copied from r20660, dev/tomcat/tomcat-8/v8.5.19/
Removed:
dev/tomcat/tomcat-8/v8.5.19/


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

svn commit: r1803288 - /tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:55:57 2017
New Revision: 1803288

URL: http://svn.apache.org/viewvc?rev=1803288&view=rev
Log:
Remove deprecated code

Removed:
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java


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

svn commit: r1803287 - in /tomcat/tc8.5.x/trunk/java/org/apache: catalina/ha/ catalina/realm/ catalina/startup/ tomcat/util/descriptor/tagplugin/ tomcat/util/descriptor/tld/ tomcat/util/descriptor/web

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:55:30 2017
New Revision: 1803287

URL: http://svn.apache.org/viewvc?rev=1803287&view=rev
Log:
Deprecate RuleSetBase as it has no meaningful content once deprecated methods 
are removed

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri 
Jul 28 15:55:30 2017
@@ -29,6 +29,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Peter Rossbach
  */
+@SuppressWarnings("deprecation")
 public class ClusterRuleSet extends RuleSetBase {
 
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri 
Jul 28 15:55:30 2017
@@ -31,6 +31,7 @@ import org.xml.sax.Attributes;
  *
  * @author Craig R. McClanahan
  */
+@SuppressWarnings("deprecation")
 public class MemoryRuleSet extends RuleSetBase {
 
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java 
Fri Jul 28 15:55:30 2017
@@ -29,6 +29,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Craig R. McClanahan
  */
+@SuppressWarnings("deprecation")
 public class ContextRuleSet extends RuleSetBase {
 
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
 Fri Jul 28 15:55:30 2017
@@ -25,6 +25,7 @@ import org.apache.tomcat.util.digester.R
  * CredentialHandler such as the NestedCredentialHandler that used
  * nested CredentialHandlers.
  */
+@SuppressWarnings("deprecation")
 public class CredentialHandlerRuleSet extends RuleSetBase {
 
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java 
Fri Jul 28 15:55:30 2017
@@ -31,6 +31,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Craig R. McClanahan
  */
+@SuppressWarnings("deprecation")
 public class EngineRuleSet extends RuleSetBase {
 
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org

svn commit: r1803286 - in /tomcat/trunk/java/org/apache: catalina/ha/ catalina/realm/ catalina/startup/ tomcat/util/descriptor/tagplugin/ tomcat/util/descriptor/tld/ tomcat/util/descriptor/web/ tomcat

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:46:05 2017
New Revision: 1803286

URL: http://svn.apache.org/viewvc?rev=1803286&view=rev
Log:
Deprecate RuleSetBase as it has no meaningful content

Modified:
tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 28 
15:46:05 2017
@@ -14,14 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ha;
 
-
 import org.apache.tomcat.util.digester.Digester;
-import org.apache.tomcat.util.digester.RuleSetBase;
-
+import org.apache.tomcat.util.digester.RuleSet;
 
 /**
  * RuleSet for processing the contents of a
@@ -29,7 +25,7 @@ import org.apache.tomcat.util.digester.R
  *
  * @author Peter Rossbach
  */
-public class ClusterRuleSet extends RuleSetBase {
+public class ClusterRuleSet implements RuleSet {
 
 
 // - Instance Variables
@@ -49,9 +45,7 @@ public class ClusterRuleSet extends Rule
  * matching pattern prefix.
  */
 public ClusterRuleSet() {
-
 this("");
-
 }
 
 
@@ -63,7 +57,6 @@ public class ClusterRuleSet extends Rule
  *  trailing slash character)
  */
 public ClusterRuleSet(String prefix) {
-super();
 this.prefix = prefix;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Jul 28 
15:46:05 2017
@@ -14,29 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.realm;
 
-
 import org.apache.tomcat.util.digester.Digester;
 import org.apache.tomcat.util.digester.Rule;
-import org.apache.tomcat.util.digester.RuleSetBase;
+import org.apache.tomcat.util.digester.RuleSet;
 import org.xml.sax.Attributes;
 
-
 /**
  * RuleSet for recognizing the users defined in the
  * XML file processed by MemoryRealm.
  *
  * @author Craig R. McClanahan
  */
-public class MemoryRuleSet extends RuleSetBase {
+public class MemoryRuleSet implements RuleSet {
 
 
 // - Instance Variables
 
-
 /**
  * The matching pattern prefix to use for recognizing our elements.
  */
@@ -45,15 +40,12 @@ public class MemoryRuleSet extends RuleS
 
 //  Constructor
 
-
 /**
  * Construct an instance of this RuleSet with the default
  * matching pattern prefix.
  */
 public MemoryRuleSet() {
-
 this("tomcat-users/");
-
 }
 
 
@@ -65,7 +57,6 @@ public class MemoryRuleSet extends RuleS
  *  trailing slash character)
  */
 public MemoryRuleSet(String prefix) {
-super();
 this.prefix = prefix;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jul 
28 15:46:05 2017
@@ -14,14 +14,10 @@
  * See the License for the spec

svn commit: r1803284 - in /tomcat/trunk/java/org/apache/tomcat/util/digester: CallMethodRule.java Digester.java RuleSet.java RuleSetBase.java Rules.java RulesBase.java

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:31:10 2017
New Revision: 1803284

URL: http://svn.apache.org/viewvc?rev=1803284&view=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1803284&r1=1803283&r2=1803284&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Fri 
Jul 28 15:31:10 2017
@@ -14,15 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.tomcat.util.digester;
 
-
 import org.apache.tomcat.util.IntrospectionUtils;
 import org.xml.sax.Attributes;
 
-
 /**
  * Rule implementation that calls a method on an object on the stack
  * (normally the top/parent object), passing arguments collected from
@@ -63,7 +59,6 @@ import org.xml.sax.Attributes;
  * then it is always invoked, regardless of whether the parameters were
  * available or not (missing parameters are passed as null values).
  */
-
 public class CallMethodRule extends Rule {
 
 // --- Constructors
@@ -76,11 +71,11 @@ public class CallMethodRule extends Rule
  * @param paramCount The number of parameters to collect, or
  *  zero for a single argument from the body of this element.
  */
-public CallMethodRule(String methodName,
-  int paramCount) {
+public CallMethodRule(String methodName, int paramCount) {
 this(0, methodName, paramCount);
 }
 
+
 /**
  * Construct a "call method" rule with the specified method name.  The
  * parameter types (if any) default to java.lang.String.
@@ -93,10 +88,7 @@ public class CallMethodRule extends Rule
  * @param paramCount The number of parameters to collect, or
  *  zero for a single argument from the body of this element.
  */
-public CallMethodRule(int targetOffset,
-  String methodName,
-  int paramCount) {
-
+public CallMethodRule(int targetOffset, String methodName, int paramCount) 
{
 this.targetOffset = targetOffset;
 this.methodName = methodName;
 this.paramCount = paramCount;
@@ -108,9 +100,9 @@ public class CallMethodRule extends Rule
 this.paramTypes[i] = String.class;
 }
 }
-this.paramClassNames = null;
 }
 
+
 /**
  * Construct a "call method" rule with the specified method name.
  * The method should accept no parameters.
@@ -118,9 +110,7 @@ public class CallMethodRule extends Rule
  * @param methodName Method name of the parent method to call
  */
 public CallMethodRule(String methodName) {
-
 this(0, methodName, 0, null);
-
 }
 
 
@@ -144,10 +134,8 @@ public class CallMethodRule extends Rule
  *  Java wrapper class instead, such as java.lang.Boolean.TYPE
  *  for a boolean parameter)
  */
-public CallMethodRule(  int targetOffset,
-String methodName,
-int paramCount,
-Class paramTypes[]) {
+public CallMethodRule(int targetOffset, String methodName, int paramCount,
+Class paramTypes[]) {
 
 this.targetOffset = targetOffset;
 this.methodName = methodName;
@@ -161,13 +149,11 @@ public class CallMethodRule extends Rule
 this.paramTypes = new Class[paramTypes.length];
 System.arraycopy(paramTypes, 0, this.paramTypes, 0, 
this.paramTypes.length);
 }
-this.paramClassNames = null;
 }
 
 
 // - Instance Variables
 
-
 /**
  * The body text collected from this element.
  */
@@ -181,6 +167,7 @@ public class CallMethodRule extends Rule
  */
 protected final int targetOffset;
 
+
 /**
  * The method name to call on the parent object.
  */
@@ -200,20 +187,13 @@ public class CallMethodRule extends Rule
  */
 protected Class paramTypes[] = null;
 
-/**
- * The names of the classes of the parameters to be collected.
- * This attribute allows creation of the classes to be postponed until the 
digester is set.
- *
- * @deprecated Unused. This will be removed in Tom

svn commit: r1803282 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ha/ java/org/apache/catalina/realm/ java/org/apache/catalina/startup/ java/org/apache/tomcat/util/descriptor/web/ java/org/

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:21:26 2017
New Revision: 1803282

URL: http://svn.apache.org/viewvc?rev=1803282&view=rev
Log:
Deprecate unused code identified by FindBugs

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Rules.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 28 15:21:26 2017
@@ -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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,17

svn commit: r1803281 - in /tomcat/trunk/java/org/apache: catalina/ha/ catalina/realm/ catalina/startup/ tomcat/util/descriptor/web/ tomcat/util/digester/

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 15:20:32 2017
New Revision: 1803281

URL: http://svn.apache.org/viewvc?rev=1803281&view=rev
Log:
Deprecate unused code identified by FindBugs

Modified:
tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 28 
15:20:32 2017
@@ -64,7 +64,6 @@ public class ClusterRuleSet extends Rule
  */
 public ClusterRuleSet(String prefix) {
 super();
-this.namespaceURI = null;
 this.prefix = prefix;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Jul 28 
15:20:32 2017
@@ -65,11 +65,8 @@ public class MemoryRuleSet extends RuleS
  *  trailing slash character)
  */
 public MemoryRuleSet(String prefix) {
-
 super();
-this.namespaceURI = null;
 this.prefix = prefix;
-
 }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jul 
28 15:20:32 2017
@@ -81,7 +81,6 @@ public class ContextRuleSet extends Rule
  *  created
  */
 public ContextRuleSet(String prefix, boolean create) {
-this.namespaceURI = null;
 this.prefix = prefix;
 this.create = create;
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java 
Fri Jul 28 15:20:32 2017
@@ -61,7 +61,6 @@ public class CredentialHandlerRuleSet ex
  *  trailing slash character)
  */
 public CredentialHandlerRuleSet(String prefix) {
-this.namespaceURI = null;
 this.prefix = prefix;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Fri Jul 28 
15:20:32 2017
@@ -63,7 +63,6 @@ public class EngineRuleSet extends RuleS
  *  trailing slash character)
  */
 public EngineRuleSet(String prefix) {
-this.namespaceURI = null;
 this.prefix = prefix;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff
==

[Bug 61164] Add %X option to access log for connection status

2017-07-28 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61164

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #9 from Mark Thomas  ---
Thanks for the patch. It has been applied to trunk (for 9.0.0.M26 onwards) and
8.5.x (for 8.5.20 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: r1803279 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/AbstractAccessLogValve.java java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/ActionCode.java web

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 14:52:33 2017
New Revision: 1803279

URL: http://svn.apache.org/viewvc?rev=1803279&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61164
Add support for the %X pattern in the AccessLogValve that reports the 
connection status at the end of the request. Patch provided by Zemian Deng.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 28 14:52:33 2017
@@ -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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,176

[GitHub] tomcat issue #70: Add new accesslog valve pattern %X for recording connectio...

2017-07-28 Thread markt-asf 
Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/70
  
Patch applied. Many thanks.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request #70: Add new accesslog valve pattern %X for recording co...

2017-07-28 Thread markt-asf 
Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/70


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1803278 - in /tomcat/trunk: java/org/apache/catalina/valves/AbstractAccessLogValve.java java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/ActionCode.java webapps/docs/c

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 14:50:36 2017
New Revision: 1803278

URL: http://svn.apache.org/viewvc?rev=1803278&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61164
Add support for the %X pattern in the AccessLogValve that reports the 
connection status at the end of the request. Patch provided by Zemian Deng.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ActionCode.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1803278&r1=1803277&r2=1803278&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
Fri Jul 28 14:50:36 2017
@@ -30,7 +30,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpSession;
@@ -40,9 +42,11 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Session;
+import org.apache.catalina.connector.ClientAbortException;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.TLSUtil;
+import org.apache.coyote.ActionCode;
 import org.apache.coyote.RequestInfo;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -83,7 +87,14 @@ import org.apache.tomcat.util.collection
  * %v - Local server name
  * %D - Time taken to process the request, in millis
  * %T - Time taken to process the request, in seconds
+ * %F - Time taken to commit the response, in millis
  * %I - current Request thread name (can compare later with 
stacktraces)
+ * %X - Connection status when response is completed:
+ *   
+ *   X = Connection aborted before the response 
completed.
+ *   + = Connection may be kept alive after the response is 
sent.
+ *   - = Connection will be closed after the response is 
sent.
+ *   
  * 
  * In addition, the caller can specify one of the following aliases for
  * commonly utilized patterns:
@@ -1506,6 +1517,47 @@ public abstract class AbstractAccessLogV
 }
 }
 
+/**
+ * Write connection status when response is completed - %X
+ */
+protected static class ConnectionStatusElement implements AccessLogElement 
{
+@Override
+public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
+if (response != null && request != null) {
+boolean statusFound = false;
+
+// Check whether connection IO is in "not allowed" state
+AtomicBoolean isIoAllowed = new AtomicBoolean(false);
+request.getCoyoteRequest().action(ActionCode.IS_IO_ALLOWED, 
isIoAllowed);
+if (!isIoAllowed.get()) {
+buf.append('X');
+statusFound = true;
+} else {
+// Check for connection aborted cond
+if (response.isError()) {
+Throwable ex = (Throwable) 
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
+if (ex instanceof ClientAbortException) {
+buf.append('X');
+statusFound = true;
+}
+}
+}
+
+// If status is not found yet, cont to check whether 
connection is keep-alive or close
+if (!statusFound) {
+String connStatus = 
response.getHeader(org.apache.coyote.http11.Constants.CONNECTION);
+if 
(org.apache.coyote.http11.Constants.CLOSE.equals(connStatus)) {
+buf.append('-');
+} else {
+buf.append('+');
+}
+}
+} else {
+// Unknown connection status
+buf.append('?');
+}
+}
+}
 
 /**
  * Parse pattern string and create the array of AccessLogElement.
@@ -1636,6 +1688,8 @@ public abstract class AbstractAccessLogV
 return new LocalServerNameElement();
 case 'I':
 return new ThreadNameElement();
+case 'X':
+return new ConnectionStatusElement();
 default:

[RESULT][VOTE] Release Apache Tomcat 8.5.19

2017-07-28 Thread Mark Thomas 
The following votes were cast:

Binding:
+1 (stable): violetagg, markt, schultz, csutherl, remm, mgrigorov,
 fschumacher, ebourg

The vote therefore passes.

Thank you to everyone who contributed towards this release.

Mark

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

svn commit: r1803270 - /tomcat/trunk/webapps/docs/changelog.xml

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 12:07:24 2017
New Revision: 1803270

URL: http://svn.apache.org/viewvc?rev=1803270&view=rev
Log:
Update release date

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1803270&r1=1803269&r2=1803270&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 28 12:07:24 2017
@@ -73,7 +73,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r20659 - /dev/tomcat/tomcat-9/v9.0.0.M25/ /release/tomcat/tomcat-9/v9.0.0.M25/

2017-07-28 Thread markt 
Author: markt
Date: Fri Jul 28 12:06:27 2017
New Revision: 20659

Log:
Release 9.0.0.M25

Added:
release/tomcat/tomcat-9/v9.0.0.M25/
  - copied from r20658, dev/tomcat/tomcat-9/v9.0.0.M25/
Removed:
dev/tomcat/tomcat-9/v9.0.0.M25/


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

[RESULT][VOTE] Release Apache Tomcat 9.0.0.M25

2017-07-28 Thread Mark Thomas 
The following votes were cast:

Binding:
+1 (alpha): huxing, markt, remm, fschumacher, csutherl

No other votes were cast.

This vote therefore passes.

Thank you to everyone who contributed to this release.

Mark

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

Re: [VOTE] Release Apache Tomcat 8.5.19

2017-07-28 Thread Emmanuel Bourg 
Le 25/07/2017 à 01:22, Mark Thomas a écrit :

> [X] Stable - go ahead and release as 8.5.19
+1, tested on Debian

Emmanuel Bourg

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

[Bug 61351] Non-US-ASCII letters in url-mapping

2017-07-28 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351

--- Comment #6 from Martin Nybo Andersen  ---
Thanks Mark,

Both for the explanation and the quick fix.
My url-mappings work again from r1803226. :-)

Kind regards,
Martin

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