date:20170106

svn commit: r1777724 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 22:02:29 2017
New Revision: 124

URL: http://svn.apache.org/viewvc?rev=124=rev
Log:
Ensure UpgradeProcessor instances associated with closed connections are 
removed from the map of current connections to Processors.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 22:02:29 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,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,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,1762168,176217

svn commit: r1777723 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java java/org/apache/coyote/LocalStrings.properties

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 22:01:49 2017
New Revision: 123

URL: http://svn.apache.org/viewvc?rev=123=rev
Log:
Improve debug logging for tracking Processor usage

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 22:01:49 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,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,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,1762168,176217

svn commit: r1777722 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 22:00:28 2017
New Revision: 122

URL: http://svn.apache.org/viewvc?rev=122=rev
Log:
Ensure UpgradeProcessor instances associated with closed connections are 
removed from the map of current connections to Processors.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=122=121=122=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan  6 
22:00:28 2017
@@ -631,7 +631,6 @@ public class AprEndpoint extends Abstrac
 for (SocketWrapperBase socketWrapper : connections.values()) 
{
 try {
 socketWrapper.close();
-getHandler().release(socketWrapper);
 } catch (IOException e) {
 // Ignore
 }
@@ -2413,6 +2412,7 @@ public class AprEndpoint extends Abstrac
 
 @Override
 public void close() {
+getEndpoint().getHandler().release(this);
 synchronized (closedLock) {
 // APR typically crashes if the same socket is closed twice so
 // make sure that doesn't happen.

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=122=121=122=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 22:00:28 2017
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Ensure UpgradeProcessor instances associated with closed connections 
are
+removed from the map of current connections to Processors. (markt)
+  
+
+  
   
 
   



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

svn commit: r1777721 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java LocalStrings.properties

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 21:54:14 2017
New Revision: 121

URL: http://svn.apache.org/viewvc?rev=121=rev
Log:
Improve debug logging for tracking Processor usage

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

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=121=120=121=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jan  6 
21:54:14 2017
@@ -691,6 +691,11 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=121=120=121=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Fri Jan  6 
21:54:14 2017
@@ -12,12 +12,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+abstractConnectionHandler.connectionsGet=Found processor [{0}] for socket [{1}]
 abstractConnectionHandler.error=Error reading request, ignored
 abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
 abstractConnectionHandler.process=Processing socket [{0}] with status [{1}]
+abstractConnectionHandler.processorPop=Popped processor [{0}] from cache
 abstractConnectionHandler.protocolexception.debug=ProtocolExceptions are 
normal, ignored
 abstractConnectionHandler.socketexception.debug=SocketExceptions are normal, 
ignored
 abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor 
for negotiated protocol [{0}]
+abstractConnectionHandler.upgradeCreate=Created upgrade processor [{0}] for 
socket wrapper [{1}]
 
 abstractProcessor.httpupgrade.notsupported=HTTP upgrade is not supported by 
this protocol
 abstractProcessor.noExecute=Unable to transfer processing to a container 
thread because this Processor is not currently associated with a SocketWrapper



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

Re: Wrong type of the value of javax.servlet.error.exception_type

2017-01-06 Thread Christopher Schultz

Martin,

On 1/6/17 8:23 AM, Martin Grigorov wrote:
> I've just upgraded my local/development Tomcat to 8.5.10 and I've hit a
> problem in Apache Wicket:
> 
> java.lang.ClassCastException: java.lang.String cannot be cast to
> java.lang.Class
> at
> org.apache.wicket.protocol.http.servlet.ErrorAttributes.of(ErrorAttributes.java:152)
> 
> 
> line 152 is:
> Class type = (Class Throwable>)request.getAttribute("javax.servlet.error.exception_type");
> 
> In a debugger I see that the value is the class name, not the class itself.
> 
> According to
> http://download.oracle.com/otn-pub/jcp/servlet-3.0-fr-eval-oth-JSpec/servlet-3_0-final-spec.pdf,
> p.10.9.1, table 10-1 the type of the value should be:
> 
> Request Attributes  Type
> javax.servlet.error.status_code java.lang.Integer
> javax.servlet.error.exception_type java.lang.Class   <<< a Class
> javax.servlet.error.message java.lang.String
> javax.servlet.error.exception java.lang.Throwable
> javax.servlet.error.request_uri java.lang.String
> javax.servlet.error.servlet_name java.lang.String
> 
> 
> I didn't see any change related to this between 8.5.8 and 8.5.10 so I'm not
> sure whether this should be a stopper for the release of 8.5.10.

I only see a single instance of javax.servlet.error.exception_type in
8.5 trunk (in javax/servlet/RequestDispatcher.ERROR_EXCEPTION_TYPE) and
a single use of ERROR_EXCEPTION_TYPE itself (in
o.a.c.core.StandardHostValve) and the code is fairly straightforward:

// line 330:
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,
  realError.getClass());

The reference "realError" is a java.lang.Throwable, and, presumably,
realError.getClass will always return a java.lang.Class object.

Can you see where that request attribute is being set in your test? I
wonder if either Wicket or the application itself is abusing that
request attribute.

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1777619 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread Mark Thomas

On 06/01/2017 20:22, Violeta Georgieva wrote:
> 2017-01-06 21:29 GMT+02:00 Mark Thomas :
>>
>> On 06/01/2017 15:57, Mark Thomas wrote:
>>> On 06/01/2017 14:45, ma...@apache.org wrote:
 Author: markt
 Date: Fri Jan  6 14:45:03 2017
 New Revision: 1777619

 URL: http://svn.apache.org/viewvc?rev=1777619=rev
 Log:
 Partial revert of r1534619.
 The caller has to be able to differentiate between no data and EOF.
>>>
>>> While this fixed the looping issue, it appears to have broken multiple
>>> Autobahn tests. I'm working on a better fix.
>>
>> I'm not sure if this is good news or bad news. The Autobahn test
>> failures persist after I revet this fix.
>>
>> Digging...
> 
> Which test is the failing one? Connector type - NIO/NIO2/APR?
> I ran it on my machine - MAC OS, Connector - NIO and I do not see failures.

Fairly old autobahn tests:  (I haven't updated them in a while)
User-Agent: AutobahnTestSuite/0.7.5-0.10.1

APR/native
Windows

Not exactly sure what is going wrong yet.

Mark


> 
>> Mark
>>
>>
>>>
>>> Mark
>>>
>>>

 Modified:

> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
 tomcat/trunk/webapps/docs/changelog.xml

 Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
 URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1777619=1777618=1777619=diff

> ==
 ---
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
> (original)
 +++
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Fri
> Jan  6 14:45:03 2017
 @@ -16,6 +16,7 @@
   */
  package org.apache.tomcat.websocket.server;

 +import java.io.EOFException;
  import java.io.IOException;
  import java.nio.ByteBuffer;

 @@ -61,7 +62,9 @@ public class WsFrameServer extends WsFra

>  inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
  int read = socketWrapper.read(false, inputBuffer);
  inputBuffer.limit(inputBuffer.position()).reset();
 -if (read <= 0) {
 +if (read < 0) {
 +throw new EOFException();
 +} else if (read == 0) {
  return;
  }
  if (log.isDebugEnabled()) {

 Modified: tomcat/trunk/webapps/docs/changelog.xml
 URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777619=1777618=1777619=diff

> ==
 --- tomcat/trunk/webapps/docs/changelog.xml (original)
 +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 14:45:03 2017
 @@ -53,6 +53,14 @@

  

 +  
 +
 +  
 +Prevent potential processing loop on unexpected WebSocket
> connection
 +closure. (markt)
 +  
 +
 +  

  




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

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


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

Re: svn commit: r1777619 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread Violeta Georgieva

2017-01-06 21:29 GMT+02:00 Mark Thomas :
>
> On 06/01/2017 15:57, Mark Thomas wrote:
> > On 06/01/2017 14:45, ma...@apache.org wrote:
> >> Author: markt
> >> Date: Fri Jan  6 14:45:03 2017
> >> New Revision: 1777619
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1777619=rev
> >> Log:
> >> Partial revert of r1534619.
> >> The caller has to be able to differentiate between no data and EOF.
> >
> > While this fixed the looping issue, it appears to have broken multiple
> > Autobahn tests. I'm working on a better fix.
>
> I'm not sure if this is good news or bad news. The Autobahn test
> failures persist after I revet this fix.
>
> Digging...

Which test is the failing one? Connector type - NIO/NIO2/APR?
I ran it on my machine - MAC OS, Connector - NIO and I do not see failures.

> Mark
>
>
> >
> > Mark
> >
> >
> >>
> >> Modified:
> >>
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
> >> tomcat/trunk/webapps/docs/changelog.xml
> >>
> >> Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
> >> URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1777619=1777618=1777619=diff
> >>
==
> >> ---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
(original)
> >> +++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Fri
Jan  6 14:45:03 2017
> >> @@ -16,6 +16,7 @@
> >>   */
> >>  package org.apache.tomcat.websocket.server;
> >>
> >> +import java.io.EOFException;
> >>  import java.io.IOException;
> >>  import java.nio.ByteBuffer;
> >>
> >> @@ -61,7 +62,9 @@ public class WsFrameServer extends WsFra
> >>
 inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
> >>  int read = socketWrapper.read(false, inputBuffer);
> >>  inputBuffer.limit(inputBuffer.position()).reset();
> >> -if (read <= 0) {
> >> +if (read < 0) {
> >> +throw new EOFException();
> >> +} else if (read == 0) {
> >>  return;
> >>  }
> >>  if (log.isDebugEnabled()) {
> >>
> >> Modified: tomcat/trunk/webapps/docs/changelog.xml
> >> URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777619=1777618=1777619=diff
> >>
==
> >> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> >> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 14:45:03 2017
> >> @@ -53,6 +53,14 @@
> >>
> >>  
> >>
> >> +  
> >> +
> >> +  
> >> +Prevent potential processing loop on unexpected WebSocket
connection
> >> +closure. (markt)
> >> +  
> >> +
> >> +  
> >>
> >>  
> >>
> >>
> >>
> >>
> >> -
> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >>
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Re: svn commit: r1777619 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread Mark Thomas

On 06/01/2017 15:57, Mark Thomas wrote:
> On 06/01/2017 14:45, ma...@apache.org wrote:
>> Author: markt
>> Date: Fri Jan  6 14:45:03 2017
>> New Revision: 1777619
>>
>> URL: http://svn.apache.org/viewvc?rev=1777619=rev
>> Log:
>> Partial revert of r1534619.
>> The caller has to be able to differentiate between no data and EOF.
> 
> While this fixed the looping issue, it appears to have broken multiple
> Autobahn tests. I'm working on a better fix.

I'm not sure if this is good news or bad news. The Autobahn test
failures persist after I revet this fix.

Digging...

Mark


> 
> Mark
> 
> 
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
>> tomcat/trunk/webapps/docs/changelog.xml
>>
>> Modified: 
>> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1777619=1777618=1777619=diff
>> ==
>> --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
>> Fri Jan  6 14:45:03 2017
>> @@ -16,6 +16,7 @@
>>   */
>>  package org.apache.tomcat.websocket.server;
>>  
>> +import java.io.EOFException;
>>  import java.io.IOException;
>>  import java.nio.ByteBuffer;
>>  
>> @@ -61,7 +62,9 @@ public class WsFrameServer extends WsFra
>>  
>> inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
>>  int read = socketWrapper.read(false, inputBuffer);
>>  inputBuffer.limit(inputBuffer.position()).reset();
>> -if (read <= 0) {
>> +if (read < 0) {
>> +throw new EOFException();
>> +} else if (read == 0) {
>>  return;
>>  }
>>  if (log.isDebugEnabled()) {
>>
>> Modified: tomcat/trunk/webapps/docs/changelog.xml
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777619=1777618=1777619=diff
>> ==
>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 14:45:03 2017
>> @@ -53,6 +53,14 @@
>>
>>  
>>
>> +  
>> +
>> +  
>> +Prevent potential processing loop on unexpected WebSocket connection
>> +closure. (markt)
>> +  
>> +
>> +  
>>
>>  
>>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Re: svn commit: r1777647 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread Rémy Maucherat

2017-01-06 17:55 GMT+01:00 Violeta Georgieva :

> 2017-01-06 18:50 GMT+02:00 :
> >
> > Author: remm
> > Date: Fri Jan  6 16:50:50 2017
> > New Revision: 1777647
> >
> > URL: http://svn.apache.org/viewvc?rev=1777647=rev
> > Log:
> > Revert try/finally for simple tags.
>
> I just succeeded to extract a test case.
> Can you look at the patch below and give me your feedback?
>

I thought it was better to revert it for now. It's possible this can work,
but not sure.

Rémy

>
>
>
> Index: java/org/apache/jasper/compiler/Generator.java
> ===
> --- java/org/apache/jasper/compiler/Generator.java (revision 1777614)
> +++ java/org/apache/jasper/compiler/Generator.java (working copy)
> @@ -2655,6 +2655,8 @@
>  // Declare AT_BEGIN scripting variables
>  declareScriptingVars(n, VariableInfo.AT_BEGIN);
>  saveScriptingVars(n, VariableInfo.AT_BEGIN);
> +// Declare AT_END scripting variables
> +declareScriptingVars(n, VariableInfo.AT_END);
>
>  String tagHandlerClassName =
> tagHandlerClass.getCanonicalName();
>  writeNewInstance(tagHandlerVar, tagHandlerClassName);
> @@ -2709,8 +2711,7 @@
>  // Synchronize AT_BEGIN scripting variables
>  syncScriptingVars(n, VariableInfo.AT_BEGIN);
>
> -// Declare and synchronize AT_END scripting variables
> -declareScriptingVars(n, VariableInfo.AT_END);
> +// Synchronize AT_END scripting variables
>  syncScriptingVars(n, VariableInfo.AT_END);
>
>  out.popIndent();
> Index: test/webapp/bug48nnn/bug48616b.jsp
> ===
> --- test/webapp/bug48nnn/bug48616b.jsp (revision 1777614)
> +++ test/webapp/bug48nnn/bug48616b.jsp (working copy)
> @@ -26,3 +26,6 @@
>  
>
>  
> +<%
> +  out.println(X);
> +%>
> \ No newline at end of file
> Index: test/webapp/WEB-INF/tags/bug42390.tag
> ===
> --- test/webapp/WEB-INF/tags/bug42390.tag (revision 1777614)
> +++ test/webapp/WEB-INF/tags/bug42390.tag (working copy)
> @@ -14,5 +14,5 @@
>See the License for the specific language governing permissions and
>limitations under the License.
>  --%>
> -<%@ variable name-given="X" scope="AT_BEGIN" %>
> +<%@ variable name-given="X" scope="AT_END" %>
>  
> \ No newline at end of file
>

svn commit: r1777652 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 16:56:29 2017
New Revision: 1777652

URL: http://svn.apache.org/viewvc?rev=1777652=rev
Log:
 Revert try/finally for simple tags.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 16:56:29 2017
@@ -1,4 +1,4 @@
 
/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001
 
,1664176,1665087,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565,1767653,1767656,1776543,1777015
 
/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578,1765591,1765596,1767370,1772175,1772230,1773419,1774137,1774250,1774306-1774307,1774309,1774342,1777014

Re: svn commit: r1777647 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread Violeta Georgieva

2017-01-06 18:50 GMT+02:00 :
>
> Author: remm
> Date: Fri Jan  6 16:50:50 2017
> New Revision: 1777647
>
> URL: http://svn.apache.org/viewvc?rev=1777647=rev
> Log:
> Revert try/finally for simple tags.

I just succeeded to extract a test case.
Can you look at the patch below and give me your feedback?



Index: java/org/apache/jasper/compiler/Generator.java
===
--- java/org/apache/jasper/compiler/Generator.java (revision 1777614)
+++ java/org/apache/jasper/compiler/Generator.java (working copy)
@@ -2655,6 +2655,8 @@
 // Declare AT_BEGIN scripting variables
 declareScriptingVars(n, VariableInfo.AT_BEGIN);
 saveScriptingVars(n, VariableInfo.AT_BEGIN);
+// Declare AT_END scripting variables
+declareScriptingVars(n, VariableInfo.AT_END);

 String tagHandlerClassName =
tagHandlerClass.getCanonicalName();
 writeNewInstance(tagHandlerVar, tagHandlerClassName);
@@ -2709,8 +2711,7 @@
 // Synchronize AT_BEGIN scripting variables
 syncScriptingVars(n, VariableInfo.AT_BEGIN);

-// Declare and synchronize AT_END scripting variables
-declareScriptingVars(n, VariableInfo.AT_END);
+// Synchronize AT_END scripting variables
 syncScriptingVars(n, VariableInfo.AT_END);

 out.popIndent();
Index: test/webapp/bug48nnn/bug48616b.jsp
===
--- test/webapp/bug48nnn/bug48616b.jsp (revision 1777614)
+++ test/webapp/bug48nnn/bug48616b.jsp (working copy)
@@ -26,3 +26,6 @@
 
   
 
+<%
+  out.println(X);
+%>
\ No newline at end of file
Index: test/webapp/WEB-INF/tags/bug42390.tag
===
--- test/webapp/WEB-INF/tags/bug42390.tag (revision 1777614)
+++ test/webapp/WEB-INF/tags/bug42390.tag (working copy)
@@ -14,5 +14,5 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ variable name-given="X" scope="AT_BEGIN" %>
+<%@ variable name-given="X" scope="AT_END" %>
 
\ No newline at end of file

svn commit: r1777651 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 16:54:09 2017
New Revision: 1777651

URL: http://svn.apache.org/viewvc?rev=1777651=rev
Log:
 Revert try/finally for simple tags.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 16:54:09 2017
@@ -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,1681703,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,1702
 
742,1702744,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,1
 
726171-1726173,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,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213

svn commit: r1777650 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 16:53:34 2017
New Revision: 1777650

URL: http://svn.apache.org/viewvc?rev=1777650=rev
Log:
 Revert try/finally for simple tags.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 16:53:34 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014
-/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: r1777648 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 16:52:13 2017
New Revision: 1777648

URL: http://svn.apache.org/viewvc?rev=1777648=rev
Log:
 Revert try/finally for simple tags.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 16:52:13 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,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,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,1762168,176217

svn commit: r1777647 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 16:50:50 2017
New Revision: 1777647

URL: http://svn.apache.org/viewvc?rev=1777647=rev
Log:
Revert try/finally for simple tags.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1777647=1777646=1777647=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Jan  6 
16:50:50 2017
@@ -2659,9 +2659,6 @@ class Generator {
 String tagHandlerClassName = tagHandlerClass.getCanonicalName();
 writeNewInstance(tagHandlerVar, tagHandlerClassName);
 
-out.printil("try {");
-out.pushIndent();
-
 generateSetters(n, tagHandlerVar, handlerInfo, true);
 
 // JspIdConsumer (after context has been set)
@@ -2713,16 +2710,9 @@ class Generator {
 declareScriptingVars(n, VariableInfo.AT_END);
 syncScriptingVars(n, VariableInfo.AT_END);
 
-out.popIndent();
-out.printil("} finally {");
-out.pushIndent();
-
 // Resource injection
 writeDestroyInstance(tagHandlerVar);
 
-out.popIndent();
-out.printil("}");
-
 n.setEndJavaLine(out.getJavaLine());
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777647=1777646=1777647=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 16:50:50 2017
@@ -51,6 +51,9 @@
 60497: Follow up fix using a better variable name for the
 tag reuse flag. (remm)
   
+  
+Revert use of try/finally for simple tags. (remm)
+  
 
   
   



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

2017-01-06 Thread Rémy Maucherat

2017-01-06 16:52 GMT+01:00 Violeta Georgieva :

> With r1775598 changes, the declaration of the scripting variable now is in
> try/finally block and it is not visible outside this block.
>
> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/a
> pache/jasper/compiler/Generator.java?view=markup=1775598#l2713
>
> This is independent of the previous issue, so you can either remove the
try/finally for simple tags, or fix it if you have a test on hand,

Rémy

Re: svn commit: r1777619 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread Mark Thomas

On 06/01/2017 14:45, ma...@apache.org wrote:
> Author: markt
> Date: Fri Jan  6 14:45:03 2017
> New Revision: 1777619
> 
> URL: http://svn.apache.org/viewvc?rev=1777619=rev
> Log:
> Partial revert of r1534619.
> The caller has to be able to differentiate between no data and EOF.

While this fixed the looping issue, it appears to have broken multiple
Autobahn tests. I'm working on a better fix.

Mark


> 
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
> tomcat/trunk/webapps/docs/changelog.xml
> 
> Modified: 
> tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1777619=1777618=1777619=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
> Fri Jan  6 14:45:03 2017
> @@ -16,6 +16,7 @@
>   */
>  package org.apache.tomcat.websocket.server;
>  
> +import java.io.EOFException;
>  import java.io.IOException;
>  import java.nio.ByteBuffer;
>  
> @@ -61,7 +62,9 @@ public class WsFrameServer extends WsFra
>  
> inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
>  int read = socketWrapper.read(false, inputBuffer);
>  inputBuffer.limit(inputBuffer.position()).reset();
> -if (read <= 0) {
> +if (read < 0) {
> +throw new EOFException();
> +} else if (read == 0) {
>  return;
>  }
>  if (log.isDebugEnabled()) {
> 
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777619=1777618=1777619=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 14:45:03 2017
> @@ -53,6 +53,14 @@
>
>  
>
> +  
> +
> +  
> +Prevent potential processing loop on unexpected WebSocket connection
> +closure. (markt)
> +  
> +
> +  
>
>  
>
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Re: [VOTE] Release Apache Tomcat 8.5.10

2017-01-06 Thread Violeta Georgieva

2017-01-06 16:57 GMT+02:00 Violeta Georgieva :
>
>
>
> 2017-01-06 15:44 GMT+02:00 Violeta Georgieva :
> >
> >
> >
> > 2017-01-06 15:24 GMT+02:00 Rémy Maucherat :
> > >
> > > 2017-01-06 13:58 GMT+01:00 Violeta Georgieva :
> > >
> > > > I'm observing the exception below:
> > > >
> > >
> > > Maybe but I fail to see the actual problem in the generated code, and
it's
> > > not normal anyway that it makes a difference when the change is to
replace
> > >  with  .
> > > However, I should have used tagHandlerVar rather than
> > > n.getTagHandlerPoolName() for the boolean variable, for sure.
> >
> > Thanks with that change I do not see the exception anymore.
>
> Hm I see other issues now :(
>
> An error occurred at line: 8 in the jsp file: 
>  cannot be resolved to a variable
>
> I'll try to extract a simple test case ...

With r1775598 changes, the declaration of the scripting variable now is in
try/finally block and it is not visible outside this block.

http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=markup=1775598#l2713


>
> >
> > > Rémy
> > >
> > > >
> > > > [junit] An error occurred at line: 20 in the jsp file:
> > > > /bug48nnn/bug48616.jsp
> > > > [junit] Duplicate local variable
> > > > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > > > [junit] 17: <%@ taglib prefix="bugs" uri="
http://tomcat.apache.org/
> > > > bugs"
> > > > %>
> > > > [junit] 18: 
> > > > [junit] 19: 
> > > > [junit] 20:   
> > > > [junit] 21: 
> > > > [junit]
> > > > [junit]
> > > > [junit] Stacktrace:] with root cause
> > > > [junit]  org.apache.jasper.JasperException: Unable to compile
class
> > > > for
> > > > JSP:
> > > > [junit]
> > > > [junit] An error occurred at line: 20 in the jsp file:
> > > > /bug48nnn/bug48616.jsp
> > > > [junit] Duplicate local variable
> > > > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > > > [junit] 17: <%@ taglib prefix="bugs" uri="
http://tomcat.apache.org/
> > > > bugs"
> > > > %>
> > > > [junit] 18: 
> > > > [junit] 19: 
> > > > [junit] 20:   
> > > > [junit] 21: 
> > > > [junit]
> > > > [junit]
> > > > [junit] Stacktrace:
> > > > [junit] at
> > > > org.apache.jasper.compiler.DefaultErrorHandler.javacError(
> > > > DefaultErrorHandler.java:103)
> > > > [junit] at
> > > > org.apache.jasper.compiler.ErrorDispatcher.javacError(
> > > > ErrorDispatcher.java:212)
> > > > [junit] at
> > > >
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
> > > > [junit] at
> > > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
> > > > [junit] at
> > > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)
> > > >
> > > >
> > > > I succeeded to modify one of our tests in order to reproduce the
issue.
> > > >
> > > >
> > > > test.entry=org.apache.jasper.compiler.TestScriptingVariabler
> > > >
> > > >
> > > > Index: bug48616.jsp
> > > > ===
> > > > --- bug48616.jsp (revision 1777593)
> > > > +++ bug48616.jsp (working copy)
> > > > @@ -17,5 +17,5 @@
> > > >  <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
> > > >  
> > > >  
> > > > -  
> > > > +  
> > > >  
> > > > \ No newline at end of file
> > > >
> > > >
> > > >
> > > > >
-
> > > > > 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.10

2017-01-06 Thread Violeta Georgieva

2017-01-06 15:44 GMT+02:00 Violeta Georgieva :
>
>
>
> 2017-01-06 15:24 GMT+02:00 Rémy Maucherat :
> >
> > 2017-01-06 13:58 GMT+01:00 Violeta Georgieva :
> >
> > > I'm observing the exception below:
> > >
> >
> > Maybe but I fail to see the actual problem in the generated code, and
it's
> > not normal anyway that it makes a difference when the change is to
replace
> >  with  .
> > However, I should have used tagHandlerVar rather than
> > n.getTagHandlerPoolName() for the boolean variable, for sure.
>
> Thanks with that change I do not see the exception anymore.

Hm I see other issues now :(

An error occurred at line: 8 in the jsp file: 
 cannot be resolved to a variable

I'll try to extract a simple test case ...

>
> > Rémy
> >
> > >
> > > [junit] An error occurred at line: 20 in the jsp file:
> > > /bug48nnn/bug48616.jsp
> > > [junit] Duplicate local variable
> > > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > > [junit] 17: <%@ taglib prefix="bugs" uri="
http://tomcat.apache.org/
> > > bugs"
> > > %>
> > > [junit] 18: 
> > > [junit] 19: 
> > > [junit] 20:   
> > > [junit] 21: 
> > > [junit]
> > > [junit]
> > > [junit] Stacktrace:] with root cause
> > > [junit]  org.apache.jasper.JasperException: Unable to compile
class
> > > for
> > > JSP:
> > > [junit]
> > > [junit] An error occurred at line: 20 in the jsp file:
> > > /bug48nnn/bug48616.jsp
> > > [junit] Duplicate local variable
> > > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > > [junit] 17: <%@ taglib prefix="bugs" uri="
http://tomcat.apache.org/
> > > bugs"
> > > %>
> > > [junit] 18: 
> > > [junit] 19: 
> > > [junit] 20:   
> > > [junit] 21: 
> > > [junit]
> > > [junit]
> > > [junit] Stacktrace:
> > > [junit] at
> > > org.apache.jasper.compiler.DefaultErrorHandler.javacError(
> > > DefaultErrorHandler.java:103)
> > > [junit] at
> > > org.apache.jasper.compiler.ErrorDispatcher.javacError(
> > > ErrorDispatcher.java:212)
> > > [junit] at
> > >
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
> > > [junit] at
> > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
> > > [junit] at
> > > org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)
> > >
> > >
> > > I succeeded to modify one of our tests in order to reproduce the
issue.
> > >
> > >
> > > test.entry=org.apache.jasper.compiler.TestScriptingVariabler
> > >
> > >
> > > Index: bug48616.jsp
> > > ===
> > > --- bug48616.jsp (revision 1777593)
> > > +++ bug48616.jsp (working copy)
> > > @@ -17,5 +17,5 @@
> > >  <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
> > >  
> > >  
> > > -  
> > > +  
> > >  
> > > \ No newline at end of file
> > >
> > >
> > >
> > > >
-
> > > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > > > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > > >
> > >

svn commit: r1777620 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 14:47:17 2017
New Revision: 1777620

URL: http://svn.apache.org/viewvc?rev=1777620=rev
Log:
Partial revert of r1534619.
The caller has to be able to differentiate between no data and EOF.

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

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 14:47:17 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,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,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,1762168,176217

svn commit: r1777619 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsFrameServer.java webapps/docs/changelog.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 14:45:03 2017
New Revision: 1777619

URL: http://svn.apache.org/viewvc?rev=1777619=rev
Log:
Partial revert of r1534619.
The caller has to be able to differentiate between no data and EOF.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1777619=1777618=1777619=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Fri 
Jan  6 14:45:03 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.websocket.server;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
@@ -61,7 +62,9 @@ public class WsFrameServer extends WsFra
 
inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
 int read = socketWrapper.read(false, inputBuffer);
 inputBuffer.limit(inputBuffer.position()).reset();
-if (read <= 0) {
+if (read < 0) {
+throw new EOFException();
+} else if (read == 0) {
 return;
 }
 if (log.isDebugEnabled()) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777619=1777618=1777619=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 14:45:03 2017
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+Prevent potential processing loop on unexpected WebSocket connection
+closure. (markt)
+  
+
+  
   
 
   



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

2017-01-06 Thread Rémy Maucherat

2017-01-06 14:44 GMT+01:00 Violeta Georgieva :

> 2017-01-06 15:24 GMT+02:00 Rémy Maucherat :
> >
> > 2017-01-06 13:58 GMT+01:00 Violeta Georgieva :
> >
> > > I'm observing the exception below:
> > >
> >
> > Maybe but I fail to see the actual problem in the generated code, and
> it's
> > not normal anyway that it makes a difference when the change is to
> replace
> >  with  .
> > However, I should have used tagHandlerVar rather than
> > n.getTagHandlerPoolName() for the boolean variable, for sure.
>
> Thanks with that change I do not see the exception anymore.
>
> Yes, it's much more logical with this more unique variable name (it's the
tag instance that gets reused, not the tag pool) and the compiler is no
longer complaining, but I still don't understand the error.

Rémy

svn commit: r1777609 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 13:47:21 2017
New Revision: 1777609

URL: http://svn.apache.org/viewvc?rev=1777609=rev
Log:
60497: Follow up fix using a better variable name for the tag reuse flag.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 13:47:21 2017
@@ -1,4 +1,4 @@
 
/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001
 
,1664176,1665087,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016
 
/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565,1767653,1767656,1776543,1777015
 
/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578,1765591,1765596,1767370,1772175,1772230,1773419,1774137,1774250,1774306-1774307,1774309,1774342,1777014

svn commit: r1777608 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 13:45:42 2017
New Revision: 1777608

URL: http://svn.apache.org/viewvc?rev=1777608=rev
Log:
60497: Follow up fix using a better variable name for the tag reuse flag.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 13:45:42 2017
@@ -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,1681703,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,1702
 
742,1702744,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,1
 
726171-1726173,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,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213

Re: [VOTE] Release Apache Tomcat 8.5.10

2017-01-06 Thread Violeta Georgieva

2017-01-06 15:24 GMT+02:00 Rémy Maucherat :
>
> 2017-01-06 13:58 GMT+01:00 Violeta Georgieva :
>
> > I'm observing the exception below:
> >
>
> Maybe but I fail to see the actual problem in the generated code, and it's
> not normal anyway that it makes a difference when the change is to replace
>  with  .
> However, I should have used tagHandlerVar rather than
> n.getTagHandlerPoolName() for the boolean variable, for sure.

Thanks with that change I do not see the exception anymore.

> Rémy
>
> >
> > [junit] An error occurred at line: 20 in the jsp file:
> > /bug48nnn/bug48616.jsp
> > [junit] Duplicate local variable
> > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/
> > bugs"
> > %>
> > [junit] 18: 
> > [junit] 19: 
> > [junit] 20:   
> > [junit] 21: 
> > [junit]
> > [junit]
> > [junit] Stacktrace:] with root cause
> > [junit]  org.apache.jasper.JasperException: Unable to compile class
> > for
> > JSP:
> > [junit]
> > [junit] An error occurred at line: 20 in the jsp file:
> > /bug48nnn/bug48616.jsp
> > [junit] Duplicate local variable
> > _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> > [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/
> > bugs"
> > %>
> > [junit] 18: 
> > [junit] 19: 
> > [junit] 20:   
> > [junit] 21: 
> > [junit]
> > [junit]
> > [junit] Stacktrace:
> > [junit] at
> > org.apache.jasper.compiler.DefaultErrorHandler.javacError(
> > DefaultErrorHandler.java:103)
> > [junit] at
> > org.apache.jasper.compiler.ErrorDispatcher.javacError(
> > ErrorDispatcher.java:212)
> > [junit] at
> >
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
> > [junit] at
> > org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
> > [junit] at
> > org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)
> >
> >
> > I succeeded to modify one of our tests in order to reproduce the issue.
> >
> >
> > test.entry=org.apache.jasper.compiler.TestScriptingVariabler
> >
> >
> > Index: bug48616.jsp
> > ===
> > --- bug48616.jsp (revision 1777593)
> > +++ bug48616.jsp (working copy)
> > @@ -17,5 +17,5 @@
> >  <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
> >  
> >  
> > -  
> > +  
> >  
> > \ No newline at end of file
> >
> >
> >
> > > -
> > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > > For additional commands, e-mail: dev-h...@tomcat.apache.org
> > >
> >

svn commit: r1777607 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 13:44:05 2017
New Revision: 1777607

URL: http://svn.apache.org/viewvc?rev=1777607=rev
Log:
60497: Follow up fix using a better variable name for the tag reuse flag.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 13:44:05 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014
-/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: r1777606 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 13:42:09 2017
New Revision: 1777606

URL: http://svn.apache.org/viewvc?rev=1777606=rev
Log:
60497: Follow up fix using a better variable name for the tag reuse flag.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 13:42:09 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,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,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,1762168,176217

svn commit: r1777605 - in /tomcat/trunk: java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2017-01-06 Thread remm

Author: remm
Date: Fri Jan  6 13:28:40 2017
New Revision: 1777605

URL: http://svn.apache.org/viewvc?rev=1777605=rev
Log:
Follow up for 60497: use the tag variable as the base for the reused flag.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1777605=1777604=1777605=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Jan  6 
13:28:40 2017
@@ -2396,7 +2396,7 @@ class Generator {
 out.print(tagHandlerClassName);
 out.println(".class);");
 out.printin("boolean ");
-out.print(n.getTagHandlerPoolName());
+out.print(tagHandlerVar);
 out.println("_reused = false;");
 } else {
 writeNewInstance(tagHandlerVar, tagHandlerClassName);
@@ -2609,7 +2609,7 @@ class Generator {
 out.print(".reuse(");
 out.print(tagHandlerVar);
 out.println(");");
-out.printin(n.getTagHandlerPoolName());
+out.printin(tagHandlerVar);
 out.println("_reused = true;");
 }
 
@@ -2619,7 +2619,7 @@ class Generator {
 out.pushIndent();
 if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
 out.printin("if (!");
-out.print(n.getTagHandlerPoolName());
+out.print(tagHandlerVar);
 out.println("_reused) {");
 out.pushIndent();
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777605=1777604=1777605=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 13:28:40 2017
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+60497: Follow up fix using a better variable name for the
+tag reuse flag. (remm)
+  
+
+  
   
 
   



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

Wrong type of the value of javax.servlet.error.exception_type

2017-01-06 Thread Martin Grigorov

Hi,

I've just upgraded my local/development Tomcat to 8.5.10 and I've hit a
problem in Apache Wicket:

java.lang.ClassCastException: java.lang.String cannot be cast to
java.lang.Class
at
org.apache.wicket.protocol.http.servlet.ErrorAttributes.of(ErrorAttributes.java:152)


line 152 is:
Class type = (Class)request.getAttribute("javax.servlet.error.exception_type");

In a debugger I see that the value is the class name, not the class itself.

According to
http://download.oracle.com/otn-pub/jcp/servlet-3.0-fr-eval-oth-JSpec/servlet-3_0-final-spec.pdf,
p.10.9.1, table 10-1 the type of the value should be:

Request Attributes  Type
javax.servlet.error.status_code java.lang.Integer
javax.servlet.error.exception_type java.lang.Class   <<< a Class
javax.servlet.error.message java.lang.String
javax.servlet.error.exception java.lang.Throwable
javax.servlet.error.request_uri java.lang.String
javax.servlet.error.servlet_name java.lang.String


I didn't see any change related to this between 8.5.8 and 8.5.10 so I'm not
sure whether this should be a stopper for the release of 8.5.10.

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

Re: [VOTE] Release Apache Tomcat 8.5.10

2017-01-06 Thread Rémy Maucherat

2017-01-06 13:58 GMT+01:00 Violeta Georgieva :

> I'm observing the exception below:
>

Maybe but I fail to see the actual problem in the generated code, and it's
not normal anyway that it makes a difference when the change is to replace
 with  .
However, I should have used tagHandlerVar rather than
n.getTagHandlerPoolName() for the boolean variable, for sure.

Rémy

>
> [junit] An error occurred at line: 20 in the jsp file:
> /bug48nnn/bug48616.jsp
> [junit] Duplicate local variable
> _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/
> bugs"
> %>
> [junit] 18: 
> [junit] 19: 
> [junit] 20:   
> [junit] 21: 
> [junit]
> [junit]
> [junit] Stacktrace:] with root cause
> [junit]  org.apache.jasper.JasperException: Unable to compile class
> for
> JSP:
> [junit]
> [junit] An error occurred at line: 20 in the jsp file:
> /bug48nnn/bug48616.jsp
> [junit] Duplicate local variable
> _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/
> bugs"
> %>
> [junit] 18: 
> [junit] 19: 
> [junit] 20:   
> [junit] 21: 
> [junit]
> [junit]
> [junit] Stacktrace:
> [junit] at
> org.apache.jasper.compiler.DefaultErrorHandler.javacError(
> DefaultErrorHandler.java:103)
> [junit] at
> org.apache.jasper.compiler.ErrorDispatcher.javacError(
> ErrorDispatcher.java:212)
> [junit] at
> org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
> [junit] at
> org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
> [junit] at
> org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)
>
>
> I succeeded to modify one of our tests in order to reproduce the issue.
>
>
> test.entry=org.apache.jasper.compiler.TestScriptingVariabler
>
>
> Index: bug48616.jsp
> ===
> --- bug48616.jsp (revision 1777593)
> +++ bug48616.jsp (working copy)
> @@ -17,5 +17,5 @@
>  <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
>  
>  
> -  
> +  
>  
> \ No newline at end of file
>
>
>
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>

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

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 13:13:46 2017
New Revision: 1777602

URL: http://svn.apache.org/viewvc?rev=1777602=rev
Log:
Fix typo

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=1777602=1777601=1777602=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan  6 13:13:46 2017
@@ -145,14 +145,14 @@
   
 
   
-  
+  
 
   
 Correctly handle blocking WebSocket writes when the write times out 
just
 before the write is attempted. (markt)
   
 
-  
+  
   
 
   



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

svn commit: r1777603 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 13:14:19 2017
New Revision: 1777603

URL: http://svn.apache.org/viewvc?rev=1777603=rev
Log:
Fix typo

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

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=1777603=1777602=1777603=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Jan  6 13:14:19 2017
@@ -128,14 +128,14 @@
   
 
   
-  
+  
 
   
 Correctly handle blocking WebSocket writes when the write times out 
just
 before the write is attempted. (markt)
   
 
-  
+  
   
 
   



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

2017-01-06 Thread Mark Thomas

On 06/01/2017 12:58, Violeta Georgieva wrote:
> Hi,
> 
> 2017-01-06 1:38 GMT+02:00 Mark Thomas :
>>
>> The proposed Apache Tomcat 8.5.10 release is now available for voting.
>>
>> The major changes compared to the 8.5.9 release are:
>>
>> - HTTP/2 fixes and improvements
>>
>> - Simpler JSP file encoding detector that delegates XML prolog
>>   encoding detection to the JRE rather than using a custom XML
>>   parser.
>>
>> - Improve the logic that selects an address to use to unlock the
>>   Acceptor to take account of platforms what do not listen on all
>>   local addresses when configured with an address of 0.0.0.0 or ::
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.10/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-/
>> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_10/
>>
>> The proposed 8.5.10 release is:
>> [ ] Broken - do not release
>> [ ] Stable - go ahead and release as 8.5.10
> 
> I'm observing the exception below:

Is this new in 8.5.10 or does 8.5.9 have the same issue?

Mark


> 
> [junit] An error occurred at line: 20 in the jsp file:
> /bug48nnn/bug48616.jsp
> [junit] Duplicate local variable
> _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs;
> %>
> [junit] 18: 
> [junit] 19: 
> [junit] 20:   
> [junit] 21: 
> [junit]
> [junit]
> [junit] Stacktrace:] with root cause
> [junit]  org.apache.jasper.JasperException: Unable to compile class for
> JSP:
> [junit]
> [junit] An error occurred at line: 20 in the jsp file:
> /bug48nnn/bug48616.jsp
> [junit] Duplicate local variable
> _005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
> [junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs;
> %>
> [junit] 18: 
> [junit] 19: 
> [junit] 20:   
> [junit] 21: 
> [junit]
> [junit]
> [junit] Stacktrace:
> [junit] at
> org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:103)
> [junit] at
> org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:212)
> [junit] at
> org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
> [junit] at
> org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
> [junit] at
> org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)
> 
> 
> I succeeded to modify one of our tests in order to reproduce the issue.
> 
> 
> test.entry=org.apache.jasper.compiler.TestScriptingVariabler
> 
> 
> Index: bug48616.jsp
> ===
> --- bug48616.jsp (revision 1777593)
> +++ bug48616.jsp (working copy)
> @@ -17,5 +17,5 @@
>  <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
>  
>  
> -  
> +  
>  
> \ No newline at end of file
> 
> 
> 
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 


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

Re: [VOTE] Release Apache Tomcat 8.5.10

2017-01-06 Thread Violeta Georgieva

Hi,

2017-01-06 1:38 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.5.10 release is now available for voting.
>
> The major changes compared to the 8.5.9 release are:
>
> - HTTP/2 fixes and improvements
>
> - Simpler JSP file encoding detector that delegates XML prolog
>   encoding detection to the JRE rather than using a custom XML
>   parser.
>
> - Improve the logic that selects an address to use to unlock the
>   Acceptor to take account of platforms what do not listen on all
>   local addresses when configured with an address of 0.0.0.0 or ::
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.10/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_10/
>
> The proposed 8.5.10 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.10

I'm observing the exception below:

[junit] An error occurred at line: 20 in the jsp file:
/bug48nnn/bug48616.jsp
[junit] Duplicate local variable
_005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
[junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs;
%>
[junit] 18: 
[junit] 19: 
[junit] 20:   
[junit] 21: 
[junit]
[junit]
[junit] Stacktrace:] with root cause
[junit]  org.apache.jasper.JasperException: Unable to compile class for
JSP:
[junit]
[junit] An error occurred at line: 20 in the jsp file:
/bug48nnn/bug48616.jsp
[junit] Duplicate local variable
_005fjspx_005ftagPool_005fbugs_005fBug48616b_005fnobody_reused
[junit] 17: <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs;
%>
[junit] 18: 
[junit] 19: 
[junit] 20:   
[junit] 21: 
[junit]
[junit]
[junit] Stacktrace:
[junit] at
org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:103)
[junit] at
org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:212)
[junit] at
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:457)
[junit] at
org.apache.jasper.compiler.Compiler.compile(Compiler.java:377)
[junit] at
org.apache.jasper.compiler.Compiler.compile(Compiler.java:349)


I succeeded to modify one of our tests in order to reproduce the issue.


test.entry=org.apache.jasper.compiler.TestScriptingVariabler


Index: bug48616.jsp
===
--- bug48616.jsp (revision 1777593)
+++ bug48616.jsp (working copy)
@@ -17,5 +17,5 @@
 <%@ taglib prefix="bugs" uri="http://tomcat.apache.org/bugs; %>
 
 
-  
+  
 
\ No newline at end of file



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

2017-01-06 Thread Martin Grigorov

[ X ] Stable - go ahead and release as 8.5.10

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

On Fri, Jan 6, 2017 at 12:38 AM, Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.10 release is now available for voting.
>
> The major changes compared to the 8.5.9 release are:
>
> - HTTP/2 fixes and improvements
>
> - Simpler JSP file encoding detector that delegates XML prolog
>   encoding detection to the JRE rather than using a custom XML
>   parser.
>
> - Improve the logic that selects an address to use to unlock the
>   Acceptor to take account of platforms what do not listen on all
>   local addresses when configured with an address of 0.0.0.0 or ::
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.10/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_10/
>
> The proposed 8.5.10 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.10
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 60555] run by ssl and port:443 close_wait

2017-01-06 Thread bugzilla

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

--- Comment #3 from hiki  ---
(In reply to Mark Thomas from comment #1)
> 
> *** This bug has been marked as a duplicate of bug 60035 ***

Thanks ,the problem is solved,
but I don't think the relationship with r1746551 is direct
I think the main solution to this problem is the following code

org.apache.tomcat.util.net.NioEndpoint

if (socket.isHandshakeComplete()) {
// No TLS handshaking required. Let the handler
// process this socket / event combination.
handshake = 0;
} else if (event == SocketEvent.STOP || event ==
SocketEvent.DISCONNECT ||
event == SocketEvent.ERROR) {
// Unable to complete the TLS handshake. Treat it
as
// if the handshake failed.
handshake = -1;
} else {
handshake = socket.handshake(key.isReadable(),
key.isWritable());
// The handshake process reads/writes from/to the
// socket. status may therefore be OPEN_WRITE once
// the handshake completes. However, the handshake
// happens when the socket is opened so the status
// must always be OPEN_READ after it completes. It
// is OK to always set this as it is only used if
// the handshake completes.
event = SocketEvent.OPEN_READ;
}

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-trunk

2017-01-06 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1777579 - /tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 10:30:15 2017
New Revision: 1777579

URL: http://svn.apache.org/viewvc?rev=1777579=rev
Log:
Trivial ws change to trigger CI build.

Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1777579=1777578=1777579=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Fri Jan  6 10:30:15 
2017
@@ -177,8 +177,5 @@ public class AsyncFileHandler extends Fi
 return true;
 }
 }
-
 }
-
-
 }



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

Remaining poller thread properties of Nio2Endpoint in tomcat 8

2017-01-06 Thread Huxing Zhang

Hi there,

I have observed that there are some poller thread properties, e.g. 
pollerThreadPriority still remaining in org.apache.tomcat.util.net.Nio2Endpoint 
(line 148-150).

I do not see any place that is referring it, and it has been dropped in 8.5.x 
and 9.x.

Any ideas why it is still remaining? If not, I would like to remove them from 
8.0.x branch.

Thanks,
Huxing

Re: [VOTE] Release Apache Tomcat 8.5.10

2017-01-06 Thread Rémy Maucherat

2017-01-06 0:38 GMT+01:00 Mark Thomas :

> The proposed Apache Tomcat 8.5.10 release is now available for voting.
>
> The major changes compared to the 8.5.9 release are:
>
> - HTTP/2 fixes and improvements
>
> - Simpler JSP file encoding detector that delegates XML prolog
>   encoding detection to the JRE rather than using a custom XML
>   parser.
>
> - Improve the logic that selects an address to use to unlock the
>   Acceptor to take account of platforms what do not listen on all
>   local addresses when configured with an address of 0.0.0.0 or ::
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.10/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_10/
>
> The proposed 8.5.10 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.10
>
> Rémy

[Bug 60555] run by ssl and port:443 close_wait

2017-01-06 Thread bugzilla

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

hiki  changed:

   What|Removed |Added

 Resolution|DUPLICATE   |FIXED
 Status|RESOLVED|CLOSED

--- Comment #2 from hiki  ---
Thanks. Has been upgraded to 8.5.6 and the problem is solved

-- 
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 60554] Update language style in whichversion.xml

2017-01-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks. Patch applied with a minor change:
Release -> Released

-- 
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: r1777555 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 09:55:17 2017
New Revision: 1777555

URL: http://svn.apache.org/viewvc?rev=1777555=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60554
Better table headings
Based on a patch by Michael Osipov

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1777555=1777554=1777555=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Jan  6 09:55:17 2017
@@ -233,8 +233,8 @@ mapping between the specifications and t
   EL Spec
   WebSocket Spec
   JASPIC Spec
-  Apache Tomcat version
-  Actual release revision
+  Apache Tomcat Version
+  Latest Released Version
   Supported Java Versions
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1777555=1777554=1777555=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Fri Jan  6 09:55:17 2017
@@ -25,8 +25,8 @@ mapping between the specifications and t
   EL Spec
   WebSocket Spec
   JASPIC Spec
-  Apache Tomcat version
-  Actual release revision
+  Apache Tomcat Version
+  Latest Released Version
   Supported Java Versions
 
 



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

svn commit: r1777554 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

2017-01-06 Thread huxing

Author: huxing
Date: Fri Jan  6 09:53:38 2017
New Revision: 1777554

URL: http://svn.apache.org/viewvc?rev=1777554=rev
Log:
Fix javadoc, there is no poller thread in NIO2.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1777554=1777553=1777554=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri 
Jan  6 09:53:38 2017
@@ -165,7 +165,7 @@ public class Nio2Endpoint extends Abstra
 
 
 /**
- * Start the NIO endpoint, creating acceptor, poller threads.
+ * Start the NIO2 endpoint, creating acceptor.
  */
 @Override
 public void startInternal() throws Exception {



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

svn commit: r1777552 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

2017-01-06 Thread huxing

Author: huxing
Date: Fri Jan  6 09:50:30 2017
New Revision: 1777552

URL: http://svn.apache.org/viewvc?rev=1777552=rev
Log:
Fix javadoc, there is no poller thread in NIO2.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1777552=1777551=1777552=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan  6 
09:50:30 2017
@@ -161,7 +161,7 @@ public class Nio2Endpoint extends Abstra
 
 
 /**
- * Start the NIO endpoint, creating acceptor, poller threads.
+ * Start the NIO2 endpoint, creating acceptor.
  */
 @Override
 public void startInternal() throws Exception {



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

Re: [VOTE] Release Apache Tomcat 9.0.0.M16

2017-01-06 Thread Rémy Maucherat

2017-01-06 0:37 GMT+01:00 Mark Thomas :

> The proposed Apache Tomcat 9.0.0.M16 release is now available for voting.
>
> This is a milestone release for the 9.0.x branch. It should be
> noted that, as a milestone release:
> - Servlet 4.0 is not finalised
> - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0
>
> The major changes compared to the 9.0.0.M15 release are:
>
> - HTTP/2 fixes and improvements
>
> - Simpler JSP file encoding detector that delegates XML prolog
>   encoding detection to the JRE rather than using a custom XML
>   parser.
>
> - Improve the logic that selects an address to use to unlock the
>   Acceptor to take account of platforms what do not listen on all
>   local addresses when configured with an address of 0.0.0.0 or ::
>
> Along with lots of other bug fixes and improvements
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M16/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1110/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M16/
>
> The proposed 9.0.0.M16 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 9.0.0.M16
>
> Rémy

svn commit: r1777549 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/FileHandler.java

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 09:42:15 2017
New Revision: 1777549

URL: http://svn.apache.org/viewvc?rev=1777549=rev
Log:
Simplify

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 09:42:15 2017
@@ -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,1681703,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,1702
 
742,1702744,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,1
 
726171-1726173,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,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213

svn commit: r1777547 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/juli/FileHandler.java

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 09:41:41 2017
New Revision: 1777547

URL: http://svn.apache.org/viewvc?rev=1777547=rev
Log:
Simplify

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  6 09:41:41 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,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,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,1762168,176217

svn commit: r1777546 - /tomcat/trunk/java/org/apache/juli/FileHandler.java

2017-01-06 Thread markt

Author: markt
Date: Fri Jan  6 09:40:45 2017
New Revision: 1777546

URL: http://svn.apache.org/viewvc?rev=1777546=rev
Log:
Simplify

Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1777546=1777545=1777546=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Fri Jan  6 09:40:45 2017
@@ -166,8 +166,7 @@ public class FileHandler
 
 // Construct the timestamp we will use, if requested
 Timestamp ts = new Timestamp(System.currentTimeMillis());
-String tsString = ts.toString().substring(0, 19);
-String tsDate = tsString.substring(0, 10);
+String tsDate = ts.toString().substring(0, 10);
 
 writerLock.readLock().lock();
 try {



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

2017-01-06 Thread Huxing Zhang

Hi,

The proposed 8.5.10 release is:
[ ] Broken - do not release
[ X ] Stable - go ahead and release as 8.5.10

All test cases passed.
Test web application works fine.
--
From:Mark Thomas 
Time:2017 Jan 6 (Fri) 07:39
To:dev@tomcat.apache.org 
Subject:[VOTE] Release Apache Tomcat 8.5.10


The proposed Apache Tomcat 8.5.10 release is now available for voting.

The major changes compared to the 8.5.9 release are:

- HTTP/2 fixes and improvements

- Simpler JSP file encoding detector that delegates XML prolog
  encoding detection to the JRE rather than using a custom XML
  parser.

- Improve the logic that selects an address to use to unlock the
  Acceptor to take account of platforms what do not listen on all
  local addresses when configured with an address of 0.0.0.0 or ::

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.10/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_10/

The proposed 8.5.10 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.10

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

50 matches

Mail list logo