Re: [VOTE] Release Apache Tomcat 8.5.24

2017-11-28 Thread Violeta Georgieva
Hi Mark,

2017-11-27 15:46 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.5.24 release is now available for voting.
>
> The major changes compared to the 8.5.23 release are:
>
> - Java 9 is fully supported
>
> - Fixed a number of HTTP/2 issues
>
> - Fixed numerous JASPIC issues with patches from Lazar
>
> - Update the packaged version of the Tomcat Native Library to
>   1.2.16 to pick up the latest Windows binaries built with
>   APR 1.6.3 and OpenSSL 1.0.2m
>
>
> Along with lots of other bug fixes and improvements.
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1161/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
>
> The proposed 8.5.24 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.24

I'm still testing but I noticed that we miss some files with sha512 checksum
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/bin/embed/

The same is for Tomcat 9 artifacts.

Violeta


svn commit: r1816538 - in /tomcat/trunk/java/org/apache/coyote/http11: OutputFilter.java filters/ChunkedOutputFilter.java filters/GzipOutputFilter.java filters/IdentityOutputFilter.java filters/VoidOu

2017-11-28 Thread markt
Author: markt
Date: Tue Nov 28 11:38:48 2017
New Revision: 1816538

URL: http://svn.apache.org/viewvc?rev=1816538&view=rev
Log:
Refactoring (with a longer term aim of aligning HTTP/1.1 and HTTP/2 to enable 
reuse)
- Remove unused return value from end()
- Remove duplicated Javadoc
- Clean-up extra blank lines

Modified:
tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java?rev=1816538&r1=1816537&r2=1816538&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java Tue Nov 28 
11:38:48 2017
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.coyote.http11;
 
 import java.io.IOException;
@@ -29,7 +28,6 @@ import org.apache.coyote.Response;
  */
 public interface OutputFilter extends OutputBuffer {
 
-
 /**
  * Some filters need additional parameters from the response. All the
  * necessary reading can occur in that method, as this method is called
@@ -58,12 +56,7 @@ public interface OutputFilter extends Ou
  * End the current request. It is acceptable to write extra bytes using
  * buffer.doWrite during the execution of this method.
  *
- * @return Should return 0 unless the filter does some content length
- * delimitation, in which case the number is the amount of extra bytes or
- * missing bytes, which would indicate an error.
- * Note: It is recommended that extra bytes be swallowed by the filter.
- *
  * @throws IOException If an I/O error occurs while writing to the client
  */
-public long end() throws IOException;
+public void end() throws IOException;
 }

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=1816538&r1=1816537&r2=1816538&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java 
Tue Nov 28 11:38:48 2017
@@ -139,32 +139,20 @@ public class ChunkedOutputFilter impleme
 
 // --- OutputFilter Methods
 
-/**
- * Some filters need additional parameters from the response. All the
- * necessary reading can occur in that method, as this method is called
- * after the response header processing is complete.
- */
 @Override
 public void setResponse(Response response) {
 this.response = response;
 }
 
 
-/**
- * Set the next buffer in the filter pipeline.
- */
 @Override
 public void setBuffer(OutputBuffer buffer) {
 this.buffer = buffer;
 }
 
 
-/**
- * End the current request. It is acceptable to write extra bytes using
- * buffer.doWrite during the execution of this method.
- */
 @Override
-public long end() throws IOException {
+public void end() throws IOException {
 
 Supplier> trailerFieldsSupplier = 
response.getTrailerFields();
 Map trailerFields = null;
@@ -201,14 +189,9 @@ public class ChunkedOutputFilter impleme
 buffer.doWrite(crlfChunk);
 crlfChunk.position(0).limit(crlfChunk.capacity());
 }
-
-return 0;
 }
 
 
-/**
- * Make the filter ready to process the next request.
- */
 @Override
 public void recycle() {
 response = null;

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1816538&r1=1816537&r2=1816538&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java 
Tue Nov 28 11:38:48 2017
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.coyote.http11.filters;
 
 import java.io.IOException;
@@ -35,13 +34,11 @@ import org.apache.juli.logging.LogFactor
  

svn commit: r1816541 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml

2017-11-28 Thread remm
Author: remm
Date: Tue Nov 28 12:47:00 2017
New Revision: 1816541

URL: http://svn.apache.org/viewvc?rev=1816541&view=rev
Log:
Add NPEs to ServletContext to match the javadoc.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1816541&r1=1816540&r2=1816541&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Nov 
28 12:47:00 2017
@@ -690,9 +690,10 @@ public class ApplicationContext implemen
 @Override
 public void setAttribute(String name, Object value) {
 // Name cannot be null
-if (name == null)
-throw new IllegalArgumentException
+if (name == null) {
+throw new NullPointerException
 (sm.getString("applicationContext.setAttribute.namenull"));
+}
 
 // Null value is the same as removeAttribute()
 if (value == null) {
@@ -1053,6 +1054,11 @@ public class ApplicationContext implemen
 
 @Override
 public boolean setInitParameter(String name, String value) {
+// Name cannot be null
+if (name == null) {
+throw new NullPointerException
+(sm.getString("applicationContext.setAttribute.namenull"));
+}
 if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
 throw new IllegalStateException(
 sm.getString("applicationContext.setInitParam.ise",

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816541&r1=1816540&r2=1816541&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 28 12:47:00 2017
@@ -45,6 +45,13 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Add some missing NPEs to ServletContext. (remm)
+  
+
+  
 
 
   



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



svn commit: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread huxing
Author: huxing
Date: Tue Nov 28 13:52:58 2017
New Revision: 1816544

URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
Log:
Change file encoding to UTF-8

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=1816544&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
Tue Nov 28 13:52:58 2017
@@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
 SecurityCollection collection = new SecurityCollection();
 collection.addPatternDecoded("/");
 String utf8User = "test";
-String utf8Pass = "123£";
+String utf8Pass = "123£";
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);



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



svn commit: r1816545 - in /tomcat/trunk: java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml webapps/docs/co

2017-11-28 Thread remm
Author: remm
Date: Tue Nov 28 13:53:25 2017
New Revision: 1816545

URL: http://svn.apache.org/viewvc?rev=1816545&view=rev
Log:
The system property replacement from the property source is best done using a 
system property of its own rather than a listener. Embedded can call the static 
method directly. Deprecate the (useless) listener.

Modified:

tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java?rev=1816545&r1=1816544&r2=1816545&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java 
Tue Nov 28 13:53:25 2017
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.D
 
 /**
  * Helper class used to do property replacement on system properties.
+ * @deprecated
  */
 public class SystemPropertyReplacerListener
 implements LifecycleListener {

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1816545&r1=1816544&r2=1816545&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Nov 28 
13:53:25 2017
@@ -108,6 +108,9 @@ public class Digester extends DefaultHan
 propertySource = source;
 propertySourceSet = true;
 }
+if 
(Boolean.getBoolean("org.apache.tomcat.util.digester.REPLACE_SYSTEM_PROPERTIES"))
 {
+replaceSystemProperties();
+}
 }
 
 public static void setPropertySource(IntrospectionUtils.PropertySource 
propertySource) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816545&r1=1816544&r2=1816545&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 28 13:53:25 2017
@@ -52,6 +52,14 @@
   
 
   
+  
+
+  
+Add an additional system property for the system property replacement.
+(remm)
+  
+
+  
 
 
   

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1816545&r1=1816544&r2=1816545&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Nov 28 13:53:25 2017
@@ -46,9 +46,13 @@
   Use this to add a property source, that will be invoked when 
${parameter}
  denoted parameters are found in the XML files that Tomcat parses.
   Property replacement from the specified property source on the JVM
- system properties can also be done by adding the
- org.apache.catalina.util.SystemPropertyReplacerListener
- listener as a Server listener in the container.
+ system properties can also be done using the
+ REPLACE_SYSTEM_PROPERTIES system property.
+
+
+  Set this boolean system property to true to cause
+ property replacement from the digester property source on the JVM
+ system properties.
 
   
 



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



svn commit: r1816546 - /tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java

2017-11-28 Thread remm
Author: remm
Date: Tue Nov 28 13:53:56 2017
New Revision: 1816546

URL: http://svn.apache.org/viewvc?rev=1816546&view=rev
Log:
Remove useless listener.

Removed:

tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java


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



svn commit: r1816547 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml

2017-11-28 Thread remm
Author: remm
Date: Tue Nov 28 13:59:48 2017
New Revision: 1816547

URL: http://svn.apache.org/viewvc?rev=1816547&view=rev
Log:
Add NPEs to ServletContext to match the javadoc.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 28 13:59:48 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1

svn commit: r1816548 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml weba

2017-11-28 Thread remm
Author: remm
Date: Tue Nov 28 14:01:32 2017
New Revision: 1816548

URL: http://svn.apache.org/viewvc?rev=1816548&view=rev
Log:
The system property replacement from the property source is best done using a 
system property of its own rather than a listener. Embedded can call the static 
method directly. Deprecate the (useless) listener.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 28 14:01:32 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1

Re: svn commit: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread Martin Grigorov
On Tue, Nov 28, 2017 at 3:52 PM,  wrote:

> Author: huxing
> Date: Tue Nov 28 13:52:58 2017
> New Revision: 1816544
>
> URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
> Log:
> Change file encoding to UTF-8
>
> Modified:
> tomcat/trunk/test/org/apache/tomcat/websocket/
> TestWebSocketFrameClient.java
>
> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/
> TestWebSocketFrameClient.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/
> tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=
> 1816544&view=diff
> 
> ==
> --- 
> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
> (original)
> +++ 
> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
> Tue Nov 28 13:52:58 2017
> @@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
>  SecurityCollection collection = new SecurityCollection();
>  collection.addPatternDecoded("/");
>  String utf8User = "test";
> -String utf8Pass = "123£";
> +String utf8Pass = "123£";
>

The old value looked better.


>
>  tomcat.addUser(utf8User, utf8Pass);
>  tomcat.addRole(utf8User, ROLE);
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


Re: svn commit: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread Mark Thomas
On 28/11/17 14:04, Martin Grigorov wrote:
> On Tue, Nov 28, 2017 at 3:52 PM,  wrote:
> 
>> Author: huxing
>> Date: Tue Nov 28 13:52:58 2017
>> New Revision: 1816544
>>
>> URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
>> Log:
>> Change file encoding to UTF-8
>>
>> Modified:
>> tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>>
>> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/
>> tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=
>> 1816544&view=diff
>> 
>> ==
>> --- 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> (original)
>> +++ 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> Tue Nov 28 13:52:58 2017
>> @@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
>>  SecurityCollection collection = new SecurityCollection();
>>  collection.addPatternDecoded("/");
>>  String utf8User = "test";
>> -String utf8Pass = "123£";
>> +String utf8Pass = "123£";
>>
> 
> The old value looked better.

It looks OK on my (UTF-8 by default) system. From memory something in
the svn diff -> mailing list process mangles UTF-8 text.

Mark


> 
> 
>>
>>  tomcat.addUser(utf8User, utf8Pass);
>>  tomcat.addRole(utf8User, ROLE);
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
> 


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



svn commit: r1816549 - in /tomcat/trunk/java/org/apache/coyote: CompressionConfig.java http11/AbstractHttp11Protocol.java http11/Http11Processor.java

2017-11-28 Thread markt
Author: markt
Date: Tue Nov 28 14:22:17 2017
New Revision: 1816549

URL: http://svn.apache.org/viewvc?rev=1816549&view=rev
Log:
Refactor: Move compression code to new class to allow re-use with HTTP/2

Added:
tomcat/trunk/java/org/apache/coyote/CompressionConfig.java   (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Added: tomcat/trunk/java/org/apache/coyote/CompressionConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/CompressionConfig.java?rev=1816549&view=auto
==
--- tomcat/trunk/java/org/apache/coyote/CompressionConfig.java (added)
+++ tomcat/trunk/java/org/apache/coyote/CompressionConfig.java Tue Nov 28 
14:22:17 2017
@@ -0,0 +1,274 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  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.
+ */
+package org.apache.coyote;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.MimeHeaders;
+
+public class CompressionConfig {
+
+private int compressionLevel = 0;
+private Pattern noCompressionUserAgents = null;
+private String compressibleMimeType = 
"text/html,text/xml,text/plain,text/css," +
+
"text/javascript,application/javascript,application/json,application/xml";
+private String[] compressibleMimeTypes = null;
+private int compressionMinSize = 2048;
+
+
+/**
+ * Set compression level.
+ *
+ * @param compression One of on, force,
+ *off or the minimum compression size in
+ *bytes which implies on
+ */
+public void setCompression(String compression) {
+if (compression.equals("on")) {
+this.compressionLevel = 1;
+} else if (compression.equals("force")) {
+this.compressionLevel = 2;
+} else if (compression.equals("off")) {
+this.compressionLevel = 0;
+} else {
+try {
+// Try to parse compression as an int, which would give the
+// minimum compression size
+setCompressionMinSize(Integer.parseInt(compression));
+this.compressionLevel = 1;
+} catch (Exception e) {
+this.compressionLevel = 0;
+}
+}
+}
+
+
+/**
+ * Return compression level.
+ *
+ * @return The current compression level in string form (off/on/force)
+ */
+public String getCompression() {
+switch (compressionLevel) {
+case 0:
+return "off";
+case 1:
+return "on";
+case 2:
+return "force";
+}
+return "off";
+}
+
+
+public int getCompressionLevel() {
+return compressionLevel;
+}
+
+
+/**
+ * Obtain the String form of the regular expression that defines the user
+ * agents to not use gzip with.
+ *
+ * @return The regular expression as a String
+ */
+public String getNoCompressionUserAgents() {
+if (noCompressionUserAgents == null) {
+return null;
+} else {
+return noCompressionUserAgents.toString();
+}
+}
+
+
+public Pattern getNoCompressionUserAgentsPattern() {
+return noCompressionUserAgents;
+}
+
+
+/**
+ * Set no compression user agent pattern. Regular expression as supported
+ * by {@link Pattern}. e.g.: gorilla|desesplorer|tigrus.
+ *
+ * @param noCompressionUserAgents The regular expression for user agent
+ *strings for which compression should not
+ *be applied
+ */
+public void setNoCompressionUserAgents(String noCompressionUserAgents) {
+if (noCompressionUserAgents == null || 
noCompressionUserAgents.length() == 0) {
+this.noCompressionUserAgents = null;
+} else {
+this.noCompressionUserAgents =
+Pattern.compile(noCompressionUserAgent

svn commit: r1816550 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java

2017-11-28 Thread markt
Author: markt
Date: Tue Nov 28 14:22:22 2017
New Revision: 1816550

URL: http://svn.apache.org/viewvc?rev=1816550&view=rev
Log:
Add compression config to HTTP/2 protocol

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1816550&r1=1816549&r2=1816550&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Tue Nov 28 
14:22:22 2017
@@ -25,10 +25,13 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 
 import org.apache.coyote.Adapter;
+import org.apache.coyote.CompressionConfig;
 import org.apache.coyote.Processor;
 import org.apache.coyote.Request;
+import org.apache.coyote.Response;
 import org.apache.coyote.UpgradeProtocol;
 import org.apache.coyote.UpgradeToken;
 import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
@@ -71,6 +74,8 @@ public class Http2Protocol implements Up
 private int maxTrailerSize = Constants.DEFAULT_MAX_TRAILER_SIZE;
 private boolean initiatePingDisabled = false;
 private boolean useSendfile = true;
+// Compression
+private final CompressionConfig compressionConfig = new 
CompressionConfig();
 
 @Override
 public String getHttpUpgradeName(boolean isSSLEnabled) {
@@ -282,4 +287,50 @@ public class Http2Protocol implements Up
 public boolean getInitiatePingDisabled() {
 return initiatePingDisabled;
 }
+
+
+public void setCompression(String compression) {
+compressionConfig.setCompression(compression);
+}
+public String getCompression() {
+return compressionConfig.getCompression();
+}
+protected int getCompressionLevel() {
+return compressionConfig.getCompressionLevel();
+}
+
+
+public String getNoCompressionUserAgents() {
+return compressionConfig.getNoCompressionUserAgents();
+}
+protected Pattern getNoCompressionUserAgentsPattern() {
+return compressionConfig.getNoCompressionUserAgentsPattern();
+}
+public void setNoCompressionUserAgents(String noCompressionUserAgents) {
+compressionConfig.setNoCompressionUserAgents(noCompressionUserAgents);
+}
+
+
+public String getCompressibleMimeType() {
+return compressionConfig.getCompressibleMimeType();
+}
+public void setCompressibleMimeType(String valueS) {
+compressionConfig.setCompressibleMimeType(valueS);
+}
+public String[] getCompressibleMimeTypes() {
+return compressionConfig.getCompressibleMimeTypes();
+}
+
+
+public int getCompressionMinSize() {
+return compressionConfig.getCompressionMinSize();
+}
+public void setCompressionMinSize(int compressionMinSize) {
+compressionConfig.setCompressionMinSize(compressionMinSize);
+}
+
+
+public boolean useCompression(Request request, Response response) {
+return compressionConfig.useCompression(request, response);
+}
 }



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

2017-11-28 Thread Huxing Zhang
Hi, 

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

Unit test passed on JDK8, but failed on JDK9:

Testsuite: org.apache.tomcat.util.scan.TestStandardJarScanner
Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.397 sec

Testcase: testWebappClassPath took 0.276 sec
FAILED
Unexpected class loader type: jdk.internal.loader.ClassLoaders$AppClassLoader
junit.framework.AssertionFailedError: Unexpected class loader type: 
jdk.internal.loader.ClassLoaders$AppClassLoader
at 
org.apache.tomcat.util.scan.TestStandardJarScanner.testWebappClassPath(TestStandardJarScanner.java:74)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)

Testcase: skipsInvalidClasspathURLNoFilePartNoFileScheme took 0.068 sec

This is because jdk.internal.loader.ClassLoaders$AppClassLoader is no longer a 
sub class or URLClassLoader from JDK9, I can't find a easy way to work it 
around except for using reflection.

Examples runs fine under both JDK8 and JDK9.

Our test web application runs fine on JDK8, but failed on JDK9 (it is not a 
tomcat issue.)

--
Mark Thomas 
2017 Nov 26 (Sun) 05:36
Tomcat Developers List 
[VOTE] Release Apache Tomcat 9.0.2


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

The major changes compared to the 9.0.1 release are:

- Java 9 is fully supported

- Fixed numerous JASPIC issues with patches from Lazar

- Update the packaged version of the Tomcat Native Library to
  1.2.16 to pick up the latest Windows binaries built with
  APR 1.6.3 and OpenSSL 1.0.2m

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.2/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1160/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/

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

-
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: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread Huxing Zhang
Hi Martin,

As Mark said, there is something wrong with the text in the mailing list.
I changed the encoding because my laptop (default encoding as UTF-8) complains 
with the following error when compiling this class:

Error:(148, 31) java: unmappable character (0xA3) for encoding UTF-8

--
Mark Thomas 
2017 Nov 28 (Tue) 22:16
Tomcat Developers List 
Re: svn commit: r1816544 - 
/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java


On 28/11/17 14:04, Martin Grigorov wrote:
> On Tue, Nov 28, 2017 at 3:52 PM,  wrote:
> 
>> Author: huxing
>> Date: Tue Nov 28 13:52:58 2017
>> New Revision: 1816544
>>
>> URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
>> Log:
>> Change file encoding to UTF-8
>>
>> Modified:
>> tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>>
>> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/
>> tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=
>> 1816544&view=diff
>> 
>> ==
>> --- 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> (original)
>> +++ 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> Tue Nov 28 13:52:58 2017
>> @@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
>>  SecurityCollection collection = new SecurityCollection();
>>  collection.addPatternDecoded("/");
>>  String utf8User = "test";
>> -String utf8Pass = "123£";
>> +String utf8Pass = "123£";
>>
> 
> The old value looked better.

It looks OK on my (UTF-8 by default) system. From memory something in
the svn diff -> mailing list process mangles UTF-8 text.

Mark


> 
> 
>>
>>  tomcat.addUser(utf8User, utf8Pass);
>>  tomcat.addRole(utf8User, ROLE);
>>
>>
>>
>> -
>> 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: [VOTE] Release Apache Tomcat 8.5.24

2017-11-28 Thread Huxing Zhang
Hi, 

I am wondering that is there any mirror of either of the following links:

https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/

Recently the download speed gets unbelievably slow, (sometimes <1KB/s)...

--
Mark Thomas 
2017 Nov 27 (Mon) 21:46
Tomcat Developers List 
[VOTE] Release Apache Tomcat 8.5.24


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

The major changes compared to the 8.5.23 release are:

- Java 9 is fully supported

- Fixed a number of HTTP/2 issues

- Fixed numerous JASPIC issues with patches from Lazar

- Update the packaged version of the Tomcat Native Library to
  1.2.16 to pick up the latest Windows binaries built with
  APR 1.6.3 and OpenSSL 1.0.2m


Along with lots of other bug fixes and improvements.


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

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

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

JDK 10 Early Access b33 and JDK 8u162 Early Access b03 are available on jdk.java.net

2017-11-28 Thread Rory O'Donnell

Hi Mark,

*JDK 10 Early Access  build 33 is available at : - **jdk.java.net/10/*


Notable changes since previous email.

JDK-8180019 
 - *javadoc treats 
failure to access a URL as an error , not a warning.*
If javadoc cannot access the contents of a URL provided with the -link 
or -linkoffline options,the tool will now report an error.
Previously, the tool continued with a warning, producing incorrect 
documentation output.


JDK-8175094 *- **The 
java.security.acl APIs are deprecated, for removal
* The deprecated java.security.acl APIs are now marked with 
forRemoval=true and are subject to removal in a future version of Java SE.


JDK-8175091  *- The 
java.security.{Certificate,Identity,IdentityScope,Signer} APIs are 
deprecated, for removal*
The deprecated java.security.{Certificate, Identity, IdentityScope, 
Signer} classes are now marked with forRemoval=true and are subject to 
removal in a future version of Java SE.


JDK 10 Schedule, Status & Features are available [1]


 Notes

 * OpenJDK EA binaries will be available at a later date.
 * Oracle has proposed: Newer version-string scheme for the Java SE
   Platform and the JDK
 o Please see Mark Reinhold's proposal [2]

*JDK 8u162 Early Access build 03 is available at :- http://jdk.java.net/8/*



*Feedback* - If you have suggestions or encounter bugs, please submit 
them using the usual Java SE bug-reporting channel.
Be sure to include complete version information from the output of the 
|java --version| command.


Regards,
Rory

[1] http://openjdk.java.net/projects/jdk/10/
[2] http://mail.openjdk.java.net/pipermail/jdk-dev/2017-November/89.html

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland



[Bug 61825] Tomcat8.0.30 Async request happend memory leak

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

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #4 from Christopher Schultz  ---
If you are actually running Tomcat 8.0.30, please upgrade to latest Tomcat
8.0.47. There have been MANY improvements to async features, including a few
that max fix memory leaks like the one you describe.

Please note that the Tomcat project does not issue patches for individual
issues; instead, we produce new releases with new version numbers. Tomcat
8.0.47 should be drop-in compatible with Tomcat 8.0.30.

You should also consider upgrading to Tomcat 8.5.x for longer-term support.

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



Re: svn commit: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread Konstantin Kolinko
2017-11-28 17:04 GMT+03:00 Martin Grigorov :
> On Tue, Nov 28, 2017 at 3:52 PM,  wrote:
>
>> Author: huxing
>> Date: Tue Nov 28 13:52:58 2017
>> New Revision: 1816544
>>
>> URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
>> Log:
>> Change file encoding to UTF-8
>>
>> Modified:
>> tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>>
>> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/
>> tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=
>> 1816544&view=diff
>> 
>> ==
>> --- 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> (original)
>> +++ 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> Tue Nov 28 13:52:58 2017
>> @@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
>>  SecurityCollection collection = new SecurityCollection();
>>  collection.addPatternDecoded("/");
>>  String utf8User = "test";
>> -String utf8Pass = "123£";
>> +String utf8Pass = "123£";
>>
>
> The old value looked better.

It would be safer to use \u for non-ASCII characters in strings to
avoid depending on IDE encoding preference.
(\u00A3 for the pound currency character here.)

Though it is likely that we have already used UTF-8 chars elsewhere.

>>  tomcat.addUser(utf8User, utf8Pass);
>>  tomcat.addRole(utf8User, ROLE);
>>

Best regards,
Konstantin Kolinko

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

2017-11-28 Thread Konstantin Kolinko
2017-11-28 18:08 GMT+03:00 Huxing Zhang :
> Hi,
>
> I am wondering that is there any mirror of either of the following links:
>
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/

dist/dev has no mirrors, dist/release has many mirrors

> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/

svn-us.apache.org, svn-eu.apache.org  (usable with https:),
formerly svn.us.apache.org, svn.eu.apache.org (causes certificate name
mismatch warning with https)

Tomcat 8.5 is also mirrored to Git

> Recently the download speed gets unbelievably slow, (sometimes <1KB/s)...


Best regards,
Konstantin Kolinko

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

2017-11-28 Thread Violeta Georgieva
2017-11-27 15:46 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.5.24 release is now available for voting.
>
> The major changes compared to the 8.5.23 release are:
>
> - Java 9 is fully supported
>
> - Fixed a number of HTTP/2 issues
>
> - Fixed numerous JASPIC issues with patches from Lazar
>
> - Update the packaged version of the Tomcat Native Library to
>   1.2.16 to pick up the latest Windows binaries built with
>   APR 1.6.3 and OpenSSL 1.0.2m
>
>
> Along with lots of other bug fixes and improvements.
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1161/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/
>
> The proposed 8.5.24 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.24

+1

Regards,
Violeta


Re: [VOTE] Release Apache Tomcat 9.0.2

2017-11-28 Thread Violeta Georgieva
2017-11-25 23:36 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 9.0.2 release is now available for voting.
>
> The major changes compared to the 9.0.1 release are:
>
> - Java 9 is fully supported
>
> - Fixed numerous JASPIC issues with patches from Lazar
>
> - Update the packaged version of the Tomcat Native Library to
>   1.2.16 to pick up the latest Windows binaries built with
>   APR 1.6.3 and OpenSSL 1.0.2m
>
> 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.2/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1160/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_2/
>
> The proposed 9.0.2 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 9.0.2
> [X] Beta   - go ahead and release as 9.0.2
> [ ] Stable - go ahead and release as 9.0.2

+1

Regards,
Violeta


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

2017-11-28 Thread violetagg
Author: violetagg
Date: Tue Nov 28 18:36:04 2017
New Revision: 1816563

URL: http://svn.apache.org/viewvc?rev=1816563&view=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=1816563&r1=1816562&r2=1816563&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 28 18:36:04 2017
@@ -266,7 +266,7 @@
   
 Improve handling of endorsed directories. The endorsed directory
 mechanism will only be used if the JAVA_ENDORSED_DIRS
-system property is explictly set or if
+system property is explicitly set or if
 $CATALINA_HOME/endorsed exists. When running on Java 9, 
any
 such attempted use of the endorsed directory mechanism will trigger an
 error and Tomcat will fail to start. (rjung)



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



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

2017-11-28 Thread violetagg
Author: violetagg
Date: Tue Nov 28 18:39:31 2017
New Revision: 1816564

URL: http://svn.apache.org/viewvc?rev=1816564&view=rev
Log:
Fix typo

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 28 18:39:31 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-176

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

2017-11-28 Thread violetagg
Author: violetagg
Date: Tue Nov 28 18:42:36 2017
New Revision: 1816565

URL: http://svn.apache.org/viewvc?rev=1816565&view=rev
Log:
Fix typo

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 28 18:42:36 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,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956
-/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
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,16

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

2017-11-28 Thread violetagg
Author: violetagg
Date: Tue Nov 28 18:46:40 2017
New Revision: 1816567

URL: http://svn.apache.org/viewvc?rev=1816567&view=rev
Log:
Fix typo

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 28 18:46:40 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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143
 
/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1

svn commit: r1816570 - in /tomcat/trunk/java/org/apache/coyote/http2: Stream.java StreamProcessor.java

2017-11-28 Thread markt
Author: markt
Date: Tue Nov 28 20:25:07 2017
New Revision: 1816570

URL: http://svn.apache.org/viewvc?rev=1816570&view=rev
Log:
Refactor header preparation with adding compression support in mind.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1816570&r1=1816569&r2=1816570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Tue Nov 28 20:25:07 
2017
@@ -39,7 +39,6 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.ApplicationBufferHandler;
 import org.apache.tomcat.util.res.StringManager;
@@ -59,7 +58,7 @@ class Stream extends AbstractStream impl
 static {
 Response response =  new Response();
 response.setStatus(100);
-prepareHeaders(response);
+StreamProcessor.prepareHeaders(response);
 ACK_HEADERS = response.getMimeHeaders();
 }
 
@@ -407,7 +406,6 @@ class Stream extends AbstractStream impl
 
 
 final void writeHeaders() throws IOException {
-prepareHeaders(coyoteResponse);
 boolean endOfStream = getOutputBuffer().hasNoBody() &&
 coyoteResponse.getTrailerFields() == null;
 // TODO: Is 1k the optimal value?
@@ -665,33 +663,6 @@ class Stream extends AbstractStream impl
 }
 }
 
-
-private static void prepareHeaders(Response coyoteResponse) {
-MimeHeaders headers = coyoteResponse.getMimeHeaders();
-int statusCode = coyoteResponse.getStatus();
-
-// Add the pseudo header for status
-headers.addValue(":status").setString(Integer.toString(statusCode));
-
-// Check to see if a response body is present
-if (!(statusCode < 200 || statusCode == 205 || statusCode == 304)) {
-String contentType = coyoteResponse.getContentType();
-if (contentType != null) {
-headers.setValue("content-type").setString(contentType);
-}
-String contentLanguage = coyoteResponse.getContentLanguage();
-if (contentLanguage != null) {
-
headers.setValue("content-language").setString(contentLanguage);
-}
-}
-
-// Add date header unless it is an informational response or the
-// application has already set one
-if (statusCode >= 200 && headers.getValue("date") == null) {
-
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
-}
-}
-
 
 private static class PrivilegedPush implements 
PrivilegedExceptionAction {
 

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1816570&r1=1816569&r2=1816570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Nov 28 
20:25:07 2017
@@ -25,9 +25,12 @@ import org.apache.coyote.Adapter;
 import org.apache.coyote.ContainerThreadMarker;
 import org.apache.coyote.ErrorState;
 import org.apache.coyote.Request;
+import org.apache.coyote.Response;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
+import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.DispatchType;
 import org.apache.tomcat.util.net.SendfileState;
@@ -98,10 +101,38 @@ class StreamProcessor extends AbstractPr
 @Override
 protected final void prepareResponse() throws IOException {
 response.setCommitted(true);
+prepareHeaders(response);
 stream.writeHeaders();
 }
 
 
+static void prepareHeaders(Response coyoteResponse) {
+MimeHeaders headers = coyoteResponse.getMimeHeaders();
+int statusCode = coyoteResponse.getStatus();
+
+// Add the pseudo header for status
+headers.addValue(":status").setString(Integer.toString(statusCode));
+
+// Check to see if a response body is present
+if (!(statusCode < 200 || statusCode == 205 || statusCode == 304)) {
+String contentType = coyoteResponse.getContentType();
+if (contentTy

svn commit: r1816571 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2AsyncUpgradeHandler.java Http2UpgradeHandler.java SendfileData.java StreamProcessor.java

2017-11-28 Thread markt
Author: markt
Date: Tue Nov 28 20:49:45 2017
New Revision: 1816571

URL: http://svn.apache.org/viewvc?rev=1816571&view=rev
Log:
Refactor sendfile with compression support in mind. Use an approach similar to 
HTTP/1.1 so the StreamProcessor will have visibility of whether sendfile is in 
use when deciding whether or not to compress.

Added:
tomcat/trunk/java/org/apache/coyote/http2/SendfileData.java   (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1816571&r1=1816570&r2=1816571&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Tue 
Nov 28 20:49:45 2017
@@ -16,10 +16,8 @@
  */
 package org.apache.coyote.http2;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
 import java.nio.channels.CompletionHandler;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
@@ -264,47 +262,37 @@ public class Http2AsyncUpgradeHandler ex
 }
 
 @Override
-protected SendfileState processSendfile(Stream stream) {
-String fileName = (String) stream.getCoyoteRequest().getAttribute(
-org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
-if (fileName != null) {
-java.nio.file.Path path = new File(fileName).toPath();
-SendfileData sendfile = new SendfileData();
-sendfile.pos = ((Long) stream.getCoyoteRequest().getAttribute(
-
org.apache.coyote.Constants.SENDFILE_FILE_START_ATTR)).longValue();
-sendfile.end = ((Long) stream.getCoyoteRequest().getAttribute(
-
org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue();
-sendfile.left = sendfile.end - sendfile.pos;
+protected SendfileState processSendfile(SendfileData sendfile) {
+if (sendfile != null) {
 try {
-try (FileChannel channel = FileChannel.open(path, 
StandardOpenOption.READ)) {
+try (FileChannel channel = FileChannel.open(sendfile.path, 
StandardOpenOption.READ)) {
 sendfile.mappedBuffer = channel.map(MapMode.READ_ONLY, 
sendfile.pos, sendfile.end - sendfile.pos);
-sendfile.stream = stream;
 }
 // Reserve as much as possible right away
 int reservation = (sendfile.end - sendfile.pos > 
Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) (sendfile.end - sendfile.pos);
-sendfile.streamReservation  = 
stream.reserveWindowSize(reservation, true);
-sendfile.connectionReservation = reserveWindowSize(stream, 
sendfile.streamReservation);
+sendfile.streamReservation  = 
sendfile.stream.reserveWindowSize(reservation, true);
+sendfile.connectionReservation = 
reserveWindowSize(sendfile.stream, sendfile.streamReservation);
 } catch (IOException e) {
 return SendfileState.ERROR;
 }
 // Actually perform the write
 int frameSize = Integer.min(getMaxFrameSize(), 
sendfile.connectionReservation);
-boolean finished = (frameSize == sendfile.left) && 
stream.getCoyoteResponse().getTrailerFields() == null;
+boolean finished = (frameSize == sendfile.left) && 
sendfile.stream.getCoyoteResponse().getTrailerFields() == null;
 
 // Need to check this now since sending end of stream will change 
this.
-boolean writeable = stream.canWrite();
+boolean writeable = sendfile.stream.canWrite();
 byte[] header = new byte[9];
 ByteUtil.setThreeBytes(header, 0, frameSize);
 header[3] = FrameType.DATA.getIdByte();
 if (finished) {
 header[4] = FLAG_END_OF_STREAM;
-stream.sentEndOfStream();
-if (!stream.isActive()) {
+sendfile.stream.sentEndOfStream();
+if (!sendfile.stream.isActive()) {
 activeRemoteStreamCount.decrementAndGet();
 }
 }
 if (writeable) {
-ByteUtil.set31Bits(header, 5, 
stream.getIdentifier().intValue());
+ByteUtil.set31Bits(header, 5, 
sendfile.stream.getIdentifier().intValue());
 sendfile.mappedBuffer.limit(sendfile.mappedBuffer.position() + 
frameSize);
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
prot

Refactoring heads up

2017-11-28 Thread Mark Thomas
Hi,

As you might have worked out from my commits, I'm working on a fix for
bug 60276 [1] to add gzip compression support to HTTP/2. As usual, I
want to reduce duplication / copy/paste so I am looking to re-use the
GzipOutputFilter from HTTP/1.1.

As I have been working on this it has become apparent that there is a
set of existing classes that are potentially common to HTTP/1.1 and
HTTP/2 and that the HTTP/2 compression implementation will introduce a
few new classes / interfaces that are HTTP specific but not HTTP version
specific. I have therefore been thinking about the following refactoring:

Plan A:
- Create a new package org.apache.coyote.http
- Move org.apache.coyote.http11.filters.* to
  org.apache.coyote.http.filters.*
- Move org.apache.coyote.http11.(In|Out)putFilter to
  org.apache.coyote.http
- Put the new HTTP version neutral classes in org.apache.coyote.http

My current response compression solution means HTTP/2 only needs the
GzipOutputFilter. I think there is scope to use some of the other
filters as well.

Thoughts? Is this too much refactoring (and potential disruption) for
too little benefit?

Plan B is too leave the existing classes where they are and put the new
classes common to HTTP/1.1 and HTTP/2 in org.apache.coyote.http11 (since
the existing classes common to both are under that package).

I do like the idea of having the HTTP version neutral classes in a
separate package. That said, the chunking filters aren't version
neutral. They only apply to HTTP/1.1. While we could keep them in their
existing package splitting the filters across multiple packages really
does seem wrong.

As I have been typing this e-mail I think I have convinced myself that
plan B is the better option. I'll look at this again tomorrow with a
fresh pair of eyes but I'd appreciate some community feedback on the two
options above (or a suggestion of an alternative approach).

Thanks,

Mark



[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=60276

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



[Bug 61831] New: NIO2 connector becomes intermittently unresponsive after some period of time

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

Bug ID: 61831
   Summary: NIO2 connector becomes intermittently unresponsive
after some period of time
   Product: Tomcat 8
   Version: 8.0.47
  Hardware: All
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: yaol...@gmail.com
  Target Milestone: 

Created attachment 35564
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35564&action=edit
jstack thread dump

We are observing a scenario when NIO2 connector on tomcat becomes unresponsive
after some period of time, at the same time NIO connector running on the same
host is still able to process the same requests and serves traffic. Only server
restart helps in this case.
This issue is intermittent and with the current infrastructure we have few
nodes behind LB and it happens from time to time (like once per week) for each
node, so it seems to be not a node or hardware specific in our case.
Below is our server.xml:




  

  
  


  
  

Also below is an example of the behavior we observe:

curl -verbose 'http://localhost:8080/rs?id=nio2issue'
* About to connect() to localhost port 8080 (#0)
*   Trying 127.0.0.1... connected
* Connected to localhost (127.0.0.1) port 8080 (#0)
> GET /rs?id=nio2issue HTTP/1.1
> User-Agent: curl/7.19.7 (x86_64-redhat-linux-gnu) libcurl/7.19.7 NSS/3.15.3 
> zlib/1.2.3 libidn/1.18 libssh2/1.4.2
> Host: localhost:8080
> Accept: */*
> Referer: rbose
>
* Closing connection #0
* Failure when receiving data from the peer
curl: (56) Failure when receiving data from the peer

at the same time:

curl -i 'http://localhost:8443/rs?id=nio2issue'
HTTP/1.1 302 Found

Also, no unusual errors are logged to catalina.out at the time of the accident.
Enclosed is thread dump from the server.
Also, we have observed the same behavior on tomcat 8.0.18 and upgraded to the
latest version in the same release 8.0.47 but it didn't help.

Please let me know what else might be helpful as we keep one of the servers in
this state, for now, to be able to gather any data as the issue is intermittent
and we were not able to reproduce with a simple load test.

Regards,
Oleg.

-- 
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 61831] NIO2 connector becomes intermittently unresponsive after some period of time

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

Oleg  changed:

   What|Removed |Added

 CC||yaol...@gmail.com

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



Re: [VOTE] Release Apache Tomcat 8.5.24

2017-11-28 Thread Huxing Zhang
Thanks, I will give it a try.

--
Konstantin Kolinko 
2017 Nov 29 (Wed) 00:30
Tomcat Developers List ; Huxing 

Re: [VOTE] Release Apache Tomcat 8.5.24


2017-11-28 18:08 GMT+03:00 Huxing Zhang :
> Hi,
>
> I am wondering that is there any mirror of either of the following links:
>
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.24/

dist/dev has no mirrors, dist/release has many mirrors

> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_24/

svn-us.apache.org, svn-eu.apache.org  (usable with https:),
formerly svn.us.apache.org, svn.eu.apache.org (causes certificate name
mismatch warning with https)

Tomcat 8.5 is also mirrored to Git

> Recently the download speed gets unbelievably slow, (sometimes <1KB/s)...


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



Re: svn commit: r1816544 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread Huxing Zhang
> It would be safer to use \u for non-ASCII characters in strings to
> avoid depending on IDE encoding preference.
> (\u00A3 for the pound currency character here.)

I agree. I will take that change.

--
Konstantin Kolinko 
2017 Nov 29 (Wed) 00:25
Tomcat Developers List 
Re: svn commit: r1816544 - 
/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java


2017-11-28 17:04 GMT+03:00 Martin Grigorov :
> On Tue, Nov 28, 2017 at 3:52 PM,  wrote:
>
>> Author: huxing
>> Date: Tue Nov 28 13:52:58 2017
>> New Revision: 1816544
>>
>> URL: http://svn.apache.org/viewvc?rev=1816544&view=rev
>> Log:
>> Change file encoding to UTF-8
>>
>> Modified:
>> tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>>
>> Modified: tomcat/trunk/test/org/apache/tomcat/websocket/
>> TestWebSocketFrameClient.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/
>> tomcat/websocket/TestWebSocketFrameClient.java?rev=1816544&r1=1816543&r2=
>> 1816544&view=diff
>> 
>> ==
>> --- 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> (original)
>> +++ 
>> tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
>> Tue Nov 28 13:52:58 2017
>> @@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
>>  SecurityCollection collection = new SecurityCollection();
>>  collection.addPatternDecoded("/");
>>  String utf8User = "test";
>> -String utf8Pass = "123£";
>> +String utf8Pass = "123£";
>>
>
> The old value looked better.

It would be safer to use \u for non-ASCII characters in strings to
avoid depending on IDE encoding preference.
(\u00A3 for the pound currency character here.)

Though it is likely that we have already used UTF-8 chars elsewhere.

>>  tomcat.addUser(utf8User, utf8Pass);
>>  tomcat.addRole(utf8User, ROLE);
>>

Best regards,
Konstantin Kolinko

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

svn commit: r1816591 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread huxing
Author: huxing
Date: Wed Nov 29 03:12:14 2017
New Revision: 1816591

URL: http://svn.apache.org/viewvc?rev=1816591&view=rev
Log:
Use \u00A3 to avoid ide encoding preference

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1816591&r1=1816590&r2=1816591&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
Wed Nov 29 03:12:14 2017
@@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
 SecurityCollection collection = new SecurityCollection();
 collection.addPatternDecoded("/");
 String utf8User = "test";
-String utf8Pass = "123£";
+String utf8Pass = "123\u00A3"; // pound sign
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);



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



svn commit: r1816592 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread huxing
Author: huxing
Date: Wed Nov 29 03:13:40 2017
New Revision: 1816592

URL: http://svn.apache.org/viewvc?rev=1816592&view=rev
Log:
Use \u00A3 to avoid ide encoding preference

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1816592&r1=1816591&r2=1816592&view=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Wed Nov 29 03:13:40 2017
@@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
 SecurityCollection collection = new SecurityCollection();
 collection.addPatternDecoded("/");
 String utf8User = "test";
-String utf8Pass = "123£";
+String utf8Pass = "123\u00A3"; // pound sign
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);



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



svn commit: r1816593 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread huxing
Author: huxing
Date: Wed Nov 29 03:15:01 2017
New Revision: 1816593

URL: http://svn.apache.org/viewvc?rev=1816593&view=rev
Log:
Use \u00A3 to avoid ide encoding preference

Modified:

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1816593&r1=1816592&r2=1816593&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Wed Nov 29 03:15:01 2017
@@ -145,7 +145,7 @@ public class TestWebSocketFrameClient ex
 SecurityCollection collection = new SecurityCollection();
 collection.addPatternDecoded("/");
 String utf8User = "test";
-String utf8Pass = "123£";
+String utf8Pass = "123\u00A3"; // pound sign
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);



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



svn commit: r1816594 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2017-11-28 Thread huxing
Author: huxing
Date: Wed Nov 29 03:16:29 2017
New Revision: 1816594

URL: http://svn.apache.org/viewvc?rev=1816594&view=rev
Log:
Use \u00A3 to avoid ide encoding preference

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1816594&r1=1816593&r2=1816594&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Wed Nov 29 03:16:29 2017
@@ -144,7 +144,7 @@ public class TestWebSocketFrameClient ex
 SecurityCollection collection = new SecurityCollection();
 collection.addPattern("/");
 String utf8User = "test";
-String utf8Pass = "123�";
+String utf8Pass = "123\u00A3"; // pound sign
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);



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



svn commit: r1816595 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

2017-11-28 Thread huxing
Author: huxing
Date: Wed Nov 29 03:40:32 2017
New Revision: 1816595

URL: http://svn.apache.org/viewvc?rev=1816595&view=rev
Log:
Fix typo

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1816595&r1=1816594&r2=1816595&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
Wed Nov 29 03:40:32 2017
@@ -3167,7 +3167,7 @@ public abstract class WebappClassLoaderB
 return null;
 
 JarEntry jarEntry = null;
-// Need to skip the leading / to find resoucres in JARs
+// Need to skip the leading / to find resources in JARs
 String jarEntryPath = path.substring(1);
 
 ResourceEntry entry = resourceEntries.get(path);



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



[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2017-11-28 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 71 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 21 mins 3 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20171129-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20171129.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20171129-native-src
 .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20171129/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/buil

[Bug 61825] Tomcat8.0.30 Async request happend memory leak

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

--- Comment #5 from Gavin.peng  ---
Thanks Christopher Schultz,I have a question,if i use 8.0.47,if the async is
timeout,I need to invoke complete method ? i understand is not ,tomcat contain
is end the async request if timeout is happend,thanks you

-- 
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 61831] NIO2 connector becomes intermittently unresponsive after some period of time

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

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #1 from Remy Maucherat  ---
The thread dump looks perfect: acceptor thread blocking on the accept, all
threads idle and ready to execute something. Please investigate on the user
list to get at least some idea on how to reproduce it.
If possible, try to avoid using a custom executor, it makes things more complex
and the benefit is usually not obvious.

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