svn commit: r1807289 - in /tomcat/trunk/java/org/apache: coyote/AbstractProtocol.java tomcat/util/net/AbstractEndpoint.java

[markt]

Author: markt
Date: Mon Sep  4 19:17:00 2017
New Revision: 1807289

URL: http://svn.apache.org/viewvc?rev=1807289=rev
Log:
Refactor
There is no need to pass this protocol attribute to the endpoint

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1807289=1807288=1807289=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Sep  4 
19:17:00 2017
@@ -193,6 +193,15 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1807289=1807288=1807289=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Sep  
4 19:17:00 2017
@@ -557,17 +557,6 @@ public abstract class AbstractEndpoint

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

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

--- Comment #12 from J Fernandez  ---
Created attachment 35289
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35289=edit
Authentication support

Please find below additional changes.

Added support for Basic and Digest Authentication.
Added support for dynamic loading of other Authentication Schemes.
Cleared redirectSet after invocation to allow for Container reuse.

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

svn commit: r1807288 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java

[rjung]

Author: rjung
Date: Mon Sep  4 19:03:14 2017
New Revision: 1807288

URL: http://svn.apache.org/viewvc?rev=1807288=rev
Log:
Fix IDE nags

Backport of r1805612 from trunk.

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

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java

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

svn commit: r1807283 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/openssl/

[rjung]

Author: rjung
Date: Mon Sep  4 18:50:51 2017
New Revision: 1807283

URL: http://svn.apache.org/viewvc?rev=1807283=rev
Log:
Remove checks for UnsatisfiedLinkError, now
that we require tcnative 1.2.14.

Backport of r1807282 from trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

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

svn commit: r1807282 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java LocalStrings.properties openssl/LocalStrings.properties openssl/OpenSSLConf.java openssl/OpenSSLContext.java

[rjung]

Author: rjung
Date: Mon Sep  4 18:49:35 2017
New Revision: 1807282

URL: http://svn.apache.org/viewvc?rev=1807282=rev
Log:
Remove checks for UnsatisfiedLinkError, now
that we require tcnative 1.2.14.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1807282=1807281=1807282=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Sep  4 
18:49:35 2017
@@ -561,9 +561,6 @@ public class AprEndpoint extends Abstrac
 SSL.SSL_CONF_FLAG_SERVER |
 SSL.SSL_CONF_FLAG_CERTIFICATE |
 SSL.SSL_CONF_FLAG_SHOW_ERRORS);
-} catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("endpoint.apr.missingOpenSSLConfSupport"), e);
-throw new Exception(sm.getString("endpoint.apr.errMakeConf"), 
e);
 } catch (Exception e) {
 throw new Exception(sm.getString("endpoint.apr.errMakeConf"), 
e);
 }
@@ -634,11 +631,7 @@ public class AprEndpoint extends Abstrac
 }
 Long cctx = sslHostConfig.getOpenSslConfContext();
 if (cctx != null) {
-try {
-SSLConf.free(cctx.longValue());
-} catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("endpoint.apr.missingOpenSSLConfSupport"), e);
-}
+SSLConf.free(cctx.longValue());
 sslHostConfig.setOpenSslConfContext(null);
 }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1807282=1807281=1807282=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon 
Sep  4 18:49:35 2017
@@ -81,7 +81,6 @@ endpoint.apr.errCheckConf=Error during O
 endpoint.apr.assignConf=Assigning SSL context to OpenSSLConfCmd context
 endpoint.apr.applyConf=Applying OpenSSLConfCmd to SSL context
 endpoint.apr.errApplyConf=Could not apply OpenSSLConf to SSL context
-endpoint.apr.missingOpenSSLConfSupport=Your tcnative library has no support 
for OpenSSLConf, version 1.2.13 or higher is required.
 endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
 endpoint.nio.registerFail=Failed to register socket with selector from poller
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1807282=1807281=1807282=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
Mon Sep  4 18:49:35 2017
@@ -27,7 +27,6 @@ openssl.errCheckConf=Error during OpenSS
 openssl.assignConf=Assigning SSL context to OpenSSLConfCmd context
 openssl.applyConf=Applying OpenSSLConfCmd to SSL context
 openssl.errApplyConf=Could not apply OpenSSLConf to SSL context
-openssl.missingOpenSSLConfSupport=Your tcnative library has no support for 
OpenSSLConf, version 1.2.13 or higher is required.
 
 opensslconf.checkCommand=OpenSSLConf checking command (name [{0}], value [{1}])
 opensslconf.checkFailed=Failure while checking OpenSSLConf
@@ -37,7 +36,6 @@ opensslconf.failedCommand=OpenSSLConf fa
 opensslconf.failedFinish=OpenSSLConf finish failed with result [{2}]
 opensslconf.noCommandName=OpenSSLConf no command name - will be ignored 
(command value [{0}])
 opensslconf.resultCommand=OpenSSLConf command (name [{0}], value [{1}]) 
returned [{2}]
-opensslconf.missingOpenSSLConfSupport=Your tcnative library has no support for 
OpenSSLConf, version 1.2.13 or higher is required.
 
 engine.engineClosed=Engine is closed
 engine.renegotiationUnsupported=Renegotiation is not supported

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
URL: 

svn commit: r1807277 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/storeconfig/SSLHostConfigSF.java java/org/apache/catalina/storeconfig/server-registry.xml java/org/apache/tomcat/util/net/o

[rjung]

Author: rjung
Date: Mon Sep  4 18:27:11 2017
New Revision: 1807277

URL: http://svn.apache.org/viewvc?rev=1807277=rev
Log:
Add support for OpenSSLConf to storeconfig.

Backport of r1805550 from trunk.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/server-registry.xml

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java

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

svn commit: r1807276 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/jni/SSLContext.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/SSLHostConfig.java java/

[rjung]

Author: rjung
Date: Mon Sep  4 18:25:11 2017
New Revision: 1807276

URL: http://svn.apache.org/viewvc?rev=1807276=rev
Log:
Add access to new native API SSLContext.getCiphers().

Update enabledProtocols and enabledCiphers
in SSLHostConfig after OpenSSLConf has been
applied.

This is needed, because the Manager webapp
feature of listing the current enabled ciphers
relies on SSLHostConfig.

Unfortunately the setters in SSLHostConfig
are not public and OpenSSLContext which needs
to call it is in a sub package.

For now I made the two setters public, any
better suggestions welcome.

Backport of r1805526 and r1805529 from trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

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

svn commit: r1807273 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/tomcat/jni/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/openssl/ webapps/docs

[rjung]

Author: rjung
Date: Mon Sep  4 18:20:15 2017
New Revision: 1807273

URL: http://svn.apache.org/viewvc?rev=1807273=rev
Log:
Add access to the new tcnative SSL_CONF API
and some constants used by it.

Add support for the OpenSSL SSL_CONF API when
using TLS with OpenSSL implementation.

It can be used by adding OpenSSLConf elements
underneath SSLHostConfig. The new element
contains a list of OpenSSLConfCmd elements,
each with the attributes "name" and "value".

Example:









Tone down log message for new OpenSSLConf
from info to debug.

Backport of r1805527, r1805528 and r1805530
from trunk.

Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSLConf.java
  - copied unchanged from r1805527, 
tomcat/trunk/java/org/apache/tomcat/jni/SSLConf.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
  - copied unchanged from r1805528, 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConfCmd.java
  - copied unchanged from r1805528, 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConfCmd.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep  4 18:20:15 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 

svn commit: r1807267 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/TestClientCert.java test/org/apache/tomcat/util/net/TestCustomSsl.java test/org/apache/tomcat/util/net/TestSsl.java

[rjung]

Author: rjung
Date: Mon Sep  4 18:04:35 2017
New Revision: 1807267

URL: http://svn.apache.org/viewvc?rev=1807267=rev
Log:
Improve some existing test cases with a check,
whether client certificates from the right CA
was demanded during the TLS handshake.

Especially detect, if no CA was announced during
the handshake.

Backport of r1804917 from trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java

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

[Bug 60523] Reduce number of network packets that server sends to client via WebSocket connection

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #10 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M27 onwards
- 8.5.x for 8.5.21 onwards

Fixing this for 8.0.x and earlier would require significant refactoring -
effectively the refactoring that took place for 8.5.x.

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

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

[markt]

Author: markt
Date: Mon Sep  4 16:43:24 2017
New Revision: 1807253

URL: http://svn.apache.org/viewvc?rev=1807253=rev
Log:
ws police

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

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1807253=1807252=1807253=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Sep  4 16:43:24 2017
@@ -97,7 +97,7 @@
   
 60900: Avoid a NullPointerException in the APR
 Poller if a connection is closed at the same time as new data arrives 
on
-that connection. (markt) 
+that connection. (markt)
   
 
   



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

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

[markt]

Author: markt
Date: Mon Sep  4 16:36:36 2017
New Revision: 1807252

URL: http://svn.apache.org/viewvc?rev=1807252=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60523
Reduce the number of packets used to send WebSocket messages by not flushing 
between the header and the payload when the two are written together.

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

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

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

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

[markt]

Author: markt
Date: Mon Sep  4 16:35:21 2017
New Revision: 1807251

URL: http://svn.apache.org/viewvc?rev=1807251=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60523
Reduce the number of packets used to send WebSocket messages by not flushing 
between the header and the payload when the two are written together.

Modified:

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

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1807251=1807250=1807251=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Mon Sep  4 16:35:21 2017
@@ -74,29 +74,29 @@ public class WsRemoteEndpointImplServer
 onWritePossible(true);
 } else {
 // Blocking
-for (ByteBuffer buffer : buffers) {
-long timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
-if (timeout <= 0) {
-SendResult sr = new SendResult(new 
SocketTimeoutException());
-handler.onResult(sr);
-return;
-}
-socketWrapper.setWriteTimeout(timeout);
-try {
-socketWrapper.write(true, buffer);
-timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
+try {
+for (ByteBuffer buffer : buffers) {
+long timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
 if (timeout <= 0) {
 SendResult sr = new SendResult(new 
SocketTimeoutException());
 handler.onResult(sr);
 return;
 }
 socketWrapper.setWriteTimeout(timeout);
-socketWrapper.flush(true);
-handler.onResult(SENDRESULT_OK);
-} catch (IOException e) {
-SendResult sr = new SendResult(e);
+socketWrapper.write(true, buffer);
+}
+long timeout = blockingWriteTimeoutExpiry - 
System.currentTimeMillis();
+if (timeout <= 0) {
+SendResult sr = new SendResult(new 
SocketTimeoutException());
 handler.onResult(sr);
+return;
 }
+socketWrapper.setWriteTimeout(timeout);
+socketWrapper.flush(true);
+handler.onResult(SENDRESULT_OK);
+} catch (IOException e) {
+SendResult sr = new SendResult(e);
+handler.onResult(sr);
 }
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1807251=1807250=1807251=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep  4 16:35:21 2017
@@ -167,6 +167,15 @@
   
 
   
+  
+
+  
+60523: Reduce the number of packets used to send WebSocket
+messages by not flushing between the header and the payload when the
+two are written together. (markt)
+  
+
+  
   
 
   



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

Re: Draft EOL announcement for Tomcat Native 1.1.x

[Konstantin Kolinko]

2017-09-04 14:52 GMT+03:00 Mark Thomas :
> This one is a little different since we haven't had a 1.1.x release in a
> while and are unlikely to before the EOL date.
>
> Comments, feedback etc welcome.
>
>
>
> The Apache Tomcat Team announces that support for Apache Tomcat Native
> 1.1.x will end on 30 September 2018.
>

Two points to note:

1. We are talking about "source code" releases here.

Existing binary releases of 1.1.x for Windows are already obsolete:
they are not built with current versions of OpenSSL.

I expect that using those binaries may be unsafe.  Maybe remove them
from mirrors?


2. We may add info that this only affects users of Tomcat 7.0 and 8.0.

In AprLifecycleListener.java  7.0 and 8.0 require 1.1.32, recommend >= 1.2.8

8.5 requires 1.2.x.

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: r1807243 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/LocalStrings.properties java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

[rjung]

Author: rjung
Date: Mon Sep  4 15:16:38 2017
New Revision: 1807243

URL: http://svn.apache.org/viewvc?rev=1807243=rev
Log:
Remove obsolete try/catch for UnsatisfiedLinkError
now that we require tcnative 1.2.14.

Backport of r1807242 from trunk.

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

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

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

svn commit: r1807242 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl: LocalStrings.properties OpenSSLContext.java

[rjung]

Author: rjung
Date: Mon Sep  4 15:15:26 2017
New Revision: 1807242

URL: http://svn.apache.org/viewvc?rev=1807242=rev
Log:
Remove obsolete try/catch for UnsatisfiedLinkError
now that we require tcnative 1.2.14.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1807242=1807241=1807242=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
Mon Sep  4 15:15:26 2017
@@ -18,7 +18,6 @@ openssl.errorSSLCtxInit=Error initializi
 openssl.doubleInit=SSL context already initialized, ignoring
 openssl.certificateVerificationFailed=Certificate verification failed
 openssl.keyManagerMissing=No key manager found
-openssl.incompleteClientCASupport=Incomplete support for client CAs, please 
update your tcnative version
 openssl.trustManagerMissing=No trust manager found
 openssl.addedClientCaCert=Added client CA cert: [{0}]
 openssl.makeConf=Creating OpenSSLConf context

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1807242=1807241=1807242=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Mon Sep  4 15:15:26 2017
@@ -350,15 +350,9 @@ public class OpenSSLContext implements o
 // by the server during the handshake to allow the client 
choosing
 // an acceptable certificate
 for (X509Certificate caCert : manager.getAcceptedIssuers()) {
-// try/catch can be removed once tcnative 1.2.13 was 
released
-// and the required version was updated to it.
-try {
-SSLContext.addClientCACertificateRaw(ctx, 
caCert.getEncoded());
-if (log.isDebugEnabled())
-
log.debug(sm.getString("openssl.addedClientCaCert", caCert.toString()));
-} catch (UnsatisfiedLinkError e) {
-
log.warn(sm.getString("openssl.incompleteClientCASupport"), e);
-}
+SSLContext.addClientCACertificateRaw(ctx, 
caCert.getEncoded());
+if (log.isDebugEnabled())
+log.debug(sm.getString("openssl.addedClientCaCert", 
caCert.toString()));
 }
 } else {
 // Client certificate verification based on trusted CA files 
and dirs



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

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

[rjung]

Author: rjung
Date: Mon Sep  4 15:12:13 2017
New Revision: 1807239

URL: http://svn.apache.org/viewvc?rev=1807239=rev
Log:
Increase the minimum required Tomcat Native
version to 1.2.14.

This version includes a new API needed for
correct client certificate support when using
a Java connector with OpenSSL TLS implementation
and support for the OpenSSL SSL_CONF API.

Backport of r1807237 from trunk.

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

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

Re: svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

[Mark Thomas]

On 04/09/17 13:17, Rainer Jung wrote:
> Sorry, forgot to backport those fixes you already applied to trunk. I
> was only looking for my commits and forgot your fixes.

No problem.

> I will add the backports that depend on 1.2.14 (checking successful
> client cert handshake and new OpenSSLConfCmd feature) this evening or
> tomorrow (and hope to find some time for docs and tests).

Sounds great.

Mark


> 
> Thanks!
> 
> Rainer
> 
> Am 04.09.2017 um 13:55 schrieb ma...@apache.org:
>> Author: markt
>> Date: Mon Sep  4 11:55:32 2017
>> New Revision: 1807213
>>
>> URL: http://svn.apache.org/viewvc?rev=1807213=rev
>> Log:
>> Fix some IDE nags
>>
>> Modified:
>>
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
>>
>> Modified:
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213=1807212=1807213=diff
>>
>> ==
>>
>> ---
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
>> (original)
>>
>> +++
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon
>> Sep  4 11:55:32 2017
>> @@ -253,8 +253,8 @@ public final class TesterSupport {
>>  return clientAuthExpectedIssuer;
>>  }
>>
>> -protected static void trackTrackingKeyManagers(KeyManager
>> wrapper, KeyManager wrapped,
>> -   String usage,
>> Principal[] issuers) {
>> +protected static void
>> trackTrackingKeyManagers(@SuppressWarnings("unused") KeyManager wrapper,
>> +@SuppressWarnings("unused") KeyManager wrapped, String
>> usage, Principal[] issuers) {
>>  lastUsage = usage;
>>  lastRequestedIssuers = issuers;
>>  }
>> @@ -268,7 +268,7 @@ public final class TesterSupport {
>>  }
>>
>>  protected static Principal getLastClientAuthRequestedIssuer(int
>> index) {
>> -return lastRequestedIssuers[0];
>> +return lastRequestedIssuers[index];
>>  }
>>
>>  protected static boolean checkLastClientAuthRequestedIssuers() {
> 
> -
> 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: r1807237 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Mon Sep  4 15:09:34 2017
New Revision: 1807237

URL: http://svn.apache.org/viewvc?rev=1807237=rev
Log:
Increase the minimum required Tomcat Native
version to 1.2.14.

This version includes a new API needed for
correct client certificate support when using
a Java connector with OpenSSL TLS implementation
and support for the OpenSSL SSL_CONF API.

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

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1807237=1807236=1807237=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon 
Sep  4 15:09:34 2017
@@ -66,9 +66,9 @@ public class AprLifecycleListener
 
 protected static final int TCN_REQUIRED_MAJOR = 1;
 protected static final int TCN_REQUIRED_MINOR = 2;
-protected static final int TCN_REQUIRED_PATCH = 6;
+protected static final int TCN_REQUIRED_PATCH = 14;
 protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 8;
+protected static final int TCN_RECOMMENDED_PV = 14;
 
 
 // -- Properties

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1807237=1807236=1807237=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep  4 15:09:34 2017
@@ -79,13 +79,18 @@
   
   
 
+  
+The minimum required Tomcat Native version has been increased to 
1.2.14.
+This version includes a new API needed for correct client certificate
+support when using a Java connector with OpenSSL TLS implementation and
+support for the SSL_CONF OpenSSL API. (rjung)
+  
   
-Add support for the OpenSSL SSL_CONF API when using TLS with
-OpenSSL implementation. This will need tcnative 1.2.13.
-It can be used by adding OpenSSLConf elements
-underneath SSLHostConfig. The new element contains
-a list of OpenSSLConfCmd elements, each with
-the attributes name and value.
+Add support for the OpenSSL SSL_CONF API when using
+TLS with OpenSSL implementation. It can be used by adding
+OpenSSLConf elements underneath 
SSLHostConfig.
+The new element contains a list of OpenSSLConfCmd 
elements,
+each with the attributes name and value.
 (rjung)
   
   



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

Re: svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

[Rainer Jung]

Sorry, forgot to backport those fixes you already applied to trunk. I 
was only looking for my commits and forgot your fixes.


I will add the backports that depend on 1.2.14 (checking successful 
client cert handshake and new OpenSSLConfCmd feature) this evening or 
tomorrow (and hope to find some time for docs and tests).


Thanks!

Rainer

Am 04.09.2017 um 13:55 schrieb ma...@apache.org:

Author: markt
Date: Mon Sep  4 11:55:32 2017
New Revision: 1807213

URL: http://svn.apache.org/viewvc?rev=1807213=rev
Log:
Fix some IDE nags

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

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213=1807212=1807213=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon 
Sep  4 11:55:32 2017
@@ -253,8 +253,8 @@ public final class TesterSupport {
 return clientAuthExpectedIssuer;
 }

-protected static void trackTrackingKeyManagers(KeyManager wrapper, 
KeyManager wrapped,
-   String usage, Principal[] 
issuers) {
+protected static void trackTrackingKeyManagers(@SuppressWarnings("unused") 
KeyManager wrapper,
+@SuppressWarnings("unused") KeyManager wrapped, String usage, 
Principal[] issuers) {
 lastUsage = usage;
 lastRequestedIssuers = issuers;
 }
@@ -268,7 +268,7 @@ public final class TesterSupport {
 }

 protected static Principal getLastClientAuthRequestedIssuer(int index) {
-return lastRequestedIssuers[0];
+return lastRequestedIssuers[index];
 }

 protected static boolean checkLastClientAuthRequestedIssuers() {


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

svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

[markt]

Author: markt
Date: Mon Sep  4 11:55:32 2017
New Revision: 1807213

URL: http://svn.apache.org/viewvc?rev=1807213=rev
Log:
Fix some IDE nags

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

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213=1807212=1807213=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon 
Sep  4 11:55:32 2017
@@ -253,8 +253,8 @@ public final class TesterSupport {
 return clientAuthExpectedIssuer;
 }
 
-protected static void trackTrackingKeyManagers(KeyManager wrapper, 
KeyManager wrapped,
-   String usage, Principal[] 
issuers) {
+protected static void trackTrackingKeyManagers(@SuppressWarnings("unused") 
KeyManager wrapper,
+@SuppressWarnings("unused") KeyManager wrapped, String usage, 
Principal[] issuers) {
 lastUsage = usage;
 lastRequestedIssuers = issuers;
 }
@@ -268,7 +268,7 @@ public final class TesterSupport {
 }
 
 protected static Principal getLastClientAuthRequestedIssuer(int index) {
-return lastRequestedIssuers[0];
+return lastRequestedIssuers[index];
 }
 
 protected static boolean checkLastClientAuthRequestedIssuers() {



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

Draft EOL announcement for Tomcat Native 1.1.x

[Mark Thomas]

This one is a little different since we haven't had a 1.1.x release in a
while and are unlikely to before the EOL date.

Comments, feedback etc welcome.



The Apache Tomcat Team announces that support for Apache Tomcat Native
1.1.x will end on 30 September 2018.

This means that after 30 September 2018:
- releases from the 1.1.x branch are highly unlikely
- bugs affecting only the 1.1.x branch will not be addressed
- security vulnerability reports will not be checked against the 1.1.x
  branch
- Apache Tomcat releases of 7.0.x after this date may require 1.2.x as a
  minimum

Three months later (i.e. after 31 December 2018)
- the 1.1.x download pages will be removed
- the latest 1.1.x release will be removed from the mirror system
- the links to the 1.1.x documentation will be removed from
  tomcat.apache.org

Note that all 1.1.x releases will always be available from the archive.

Tomcat Native 1.2.x is a drop-in replacement for 1.1.x although it does
require OpenSSL 1.0.2 as a minimum.

All Tomcat Native releases from 1.1.34 onwards have indicated that users
should use 1.2.x in preference to 1.1.x.

The most recent release of 1.1.x (1.1.34) was released in December 2015.
It is likely that 1.1.34 will be the final 1.1.x release unless a
security vulnerability is discovered in 1.1.x that cannot be worked
around without a new release.

-- 
The Apache Tomcat Team

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

svn commit: r21432 - /release/tomcat/tomcat-connectors/native/README.html

[markt]

Author: markt
Date: Mon Sep  4 11:31:37 2017
New Revision: 21432

Log:
Update latest version info

Modified:
release/tomcat/tomcat-connectors/native/README.html

Modified: release/tomcat/tomcat-connectors/native/README.html
==
--- release/tomcat/tomcat-connectors/native/README.html (original)
+++ release/tomcat/tomcat-connectors/native/README.html Mon Sep  4 11:31:37 2017
@@ -1,7 +1,7 @@
 The Apache Tomcat Native
 
-The latest release version is 1.2.10.
+The latest release version is 1.2.14.
 The latest release version for 1.1.x is 1.1.34
 
 
-Note that 1.1.x branch is deprecated and no more releases for it are 
planned.
\ No newline at end of file
+Note that 1.1.x branch is deprecated and no more releases for it are 
planned.



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

[Bug 61280] Support characters sets other than ISO 8859-1 in HTTP Basic authentication

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M27 onwards
- 8.5.x for 8.5.21 onwards
- 8.0.x for 8.0.47 onwards
- 7.0.x for 7.0.82 onwards

Note that it is disabled by default for all versions since browser support for
RFC 7617 is very patchy.

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

svn commit: r1807211 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/authenticator/BasicAuthenticator.java java/org/apache/catalina/authenticator/LocalStrings.properties webapps/docs/changelog.xm

[markt]

Author: markt
Date: Mon Sep  4 11:28:06 2017
New Revision: 1807211

URL: http://svn.apache.org/viewvc?rev=1807211=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
Add RFC 7617 support to the BasicAuthenticator

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1807211=1807210=1807211=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 Mon Sep  4 11:28:06 2017
@@ -5,9 +5,9 @@
  * 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.
@@ -17,6 +17,7 @@
 package org.apache.catalina.authenticator;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.security.Principal;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,17 +39,14 @@ import org.apache.tomcat.util.codec.bina
  */
 public class BasicAuthenticator extends AuthenticatorBase {
 
-   // - Instance Variables
-
-
 /**
  * Descriptive information about this implementation.
  */
-protected static final String info =
-"org.apache.catalina.authenticator.BasicAuthenticator/1.0";
+protected static final String info = 
"org.apache.catalina.authenticator.BasicAuthenticator/1.0";
 
 
-// - Properties
+private Charset charset = B2CConverter.ISO_8859_1;
+private String charsetString = null;
 
 
 /**
@@ -56,28 +54,28 @@ public class BasicAuthenticator extends
  */
 @Override
 public String getInfo() {
+return info;
+}
 
-return (info);
 
+public String getCharset() {
+return charsetString;
 }
 
 
-// - Public Methods
+public void setCharset(String charsetString) {
+// Only acceptable options are null, "" or "UTF-8" (case insensitive)
+if (charsetString == null || charsetString.isEmpty()) {
+charset = B2CConverter.ISO_8859_1;
+} else if ("UTF-8".equalsIgnoreCase(charsetString)) {
+charset = B2CConverter.UTF_8;
+} else {
+throw new 
IllegalArgumentException(sm.getString("basicAuthenticator.invalidCharset"));
+}
+this.charsetString = charsetString;
+}
 
 
-/**
- * Authenticate the user making this request, based on the specified
- * login configuration.  Return true if any specified
- * constraint has been satisfied, or false if we have
- * created a response challenge already.
- *
- * @param request Request we are processing
- * @param response Response we are creating
- * @param configLogin configuration describing how authentication
- *  should be performed
- *
- * @exception IOException if an input/output error occurs
- */
 @Override
 public boolean authenticate(Request request,
 HttpServletResponse response,
@@ -92,21 +90,21 @@ public class BasicAuthenticator extends
 String username = null;
 String password = null;
 
-MessageBytes authorization = 
+MessageBytes authorization =
 request.getCoyoteRequest().getMimeHeaders()
 .getValue("authorization");
-
+
 if (authorization != null) {
 authorization.toBytes();
 ByteChunk authorizationBC = authorization.getByteChunk();
 if (authorizationBC.startsWithIgnoreCase("basic ", 0)) {
 authorizationBC.setOffset(authorizationBC.getOffset() + 6);
-
+
 byte[] decoded = Base64.decodeBase64(
 authorizationBC.getBuffer(),
 authorizationBC.getOffset(),
 authorizationBC.getLength());
-
+
 // Get username and password
 int colon = -1;
 for 

svn commit: r1807208 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Mon Sep  4 11:02:21 2017
New Revision: 1807208

URL: http://svn.apache.org/viewvc?rev=1807208=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
Add RFC 7617 support to the BasicAuthenticator

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties

tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep  4 11:02:21 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
-/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
 

svn commit: r1807207 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Mon Sep  4 10:59:16 2017
New Revision: 1807207

URL: http://svn.apache.org/viewvc?rev=1807207=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
Add RFC 7617 support to the BasicAuthenticator

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties

tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

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

Re: svn commit: r1807004 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/

[Rémy Maucherat]

On Mon, Sep 4, 2017 at 11:07 AM, Mark Thomas  wrote:

> On 04/09/17 06:25, Rémy Maucherat wrote:
> > On Fri, Sep 1, 2017 at 10:18 PM, Mark Thomas  wrote:
> >
> >> On 01/09/17 20:51, ma...@apache.org wrote:
> >>> Author: markt
> >>> Date: Fri Sep  1 19:51:42 2017
> >>> New Revision: 1807004
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1807004=rev
> >>> Log:
> >>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
> >>> Add RFC 7617 support to the BasicAuthenticator
> >>
> >> I'd like to back-port this but before I do I wanted to get some feedback
> >> on the default.
> >>
> >> The options are:
> >>
> >> a) UTF-8 (the default for 9.0.x)
> >>
> >> b) "" or null (the current behaviour)
> >>
> >> The advantage of a) is that we'll support i18n user names and passwords
> >> out of the box (assuming the browser does).
> >>
> >> The disadvantage of a) is that we'll break authentication for any user
> >> name or password using ISO-8859-1 characters in the 128-255 range where
> >> the browser uses ISO-8859-1 by default and doesn't support RFC 7617.
> >>
> >> A quick test suggests that this varies between browsers.
> >>
> >> Chrome appears to use UTF-8 by default. I can't tell if Chrome supports
> >> RFC 7617 since it always uses UTF-8.
> >>
> >> Firefox appears to use ISO-8859-1 by default. It also appears that
> >> Firefox doesn't support RFC 7617.
> >>
> >> IE is the same as Firefox.
> >>
> >> Hmm. This is a lot messier than I thought it would be. Given what I have
> >> observed, there is no combination I can see that will allow BASIC auth
> >> to work with a user name or password that contains non ASCII characters
> >> with both IE, Firefox and Chrome.
> >>
> >> Thoughts?
> >>
> >
> > Huuum, since this doesn't work properly yet, I think the default should
> > remain ISO-8859-1 in all cases for now.
>
> Fair enough. I'll change the default for 9.0.x and then back-port.
>
> We can revisit the default once (if?) the browsers implement RFC 7617.
>

+1 I think it's the most reasonable option.

Rémy


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

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

[markt]

Author: markt
Date: Mon Sep  4 10:56:59 2017
New Revision: 1807206

URL: http://svn.apache.org/viewvc?rev=1807206=rev
Log:
Correct order

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=1807206=1807205=1807206=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep  4 10:56:59 2017
@@ -58,6 +58,11 @@
 warning about not being able to read a logging configuration file when
 that file does not exist. (markt)
   
+  
+61280: Add RFC 7617 support to the
+BasicAuthenticator. Note that the default configuration
+does not change the existin behaviour. (markt)
+  
   
 61424: Avoid a possible StackOverflowError when
 running under a SecurityManager and using
@@ -70,11 +75,6 @@
 added in Java 9 to only disable the caching for JAR URL connections.
 (markt)
   
-  
-61280: Add RFC 7617 support to the
-BasicAuthenticator. Note that the default configuration
-does not change the existin behaviour. (markt)
-  
 
   
   



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

svn commit: r1807205 - in /tomcat/trunk: java/org/apache/catalina/authenticator/BasicAuthenticator.java webapps/docs/changelog.xml webapps/docs/config/valve.xml

[markt]

Author: markt
Date: Mon Sep  4 10:48:50 2017
New Revision: 1807205

URL: http://svn.apache.org/viewvc?rev=1807205=rev
Log:
Given poor browser support for RFC 7617, default to current behaviour.

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1807205=1807204=1807205=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
Mon Sep  4 10:48:50 2017
@@ -47,8 +47,8 @@ public class BasicAuthenticator extends
 
 private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
 
-private Charset charset = StandardCharsets.UTF_8;
-private String charsetString = "UTF-8";
+private Charset charset = StandardCharsets.ISO_8859_1;
+private String charsetString = null;
 
 
 public String getCharset() {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1807205=1807204=1807205=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep  4 10:48:50 2017
@@ -72,7 +72,8 @@
   
   
 61280: Add RFC 7617 support to the
-BasicAuthenticator. (markt)
+BasicAuthenticator. Note that the default configuration
+does not change the existin behaviour. (markt)
   
 
   

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1807205=1807204=1807205=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Mon Sep  4 10:48:50 2017
@@ -1108,7 +1108,7 @@
 from bytes to characters using UTF-8. Otherwise, no 
charset
 authentication parameter will be sent and the provided user name and
 optional password will be converted from bytes to characters using
-ISO-8859-1. The default value is UTF-8
+ISO-8859-1. The default value is null
   
 
   



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

[Bug 61367] NPE exception in org.apache.catalina.connector.CoyoteAdapter.service

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #3 from Mark Thomas  ---
It has been over a month with no steps provided to reproduce this and no
information regarding testing with the latest 7.0.x.

Resolving this as WORKSFORME on the basis that I can't reproduce it and and
assumption that an upgrade to the latest 7.0.x fixes it.

If this is still an issue, feel free to re-open and provide the steps necessary
to reproduce it.

-- 
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: r1807004 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/

[Mark Thomas]

On 04/09/17 06:25, Rémy Maucherat wrote:
> On Fri, Sep 1, 2017 at 10:18 PM, Mark Thomas  wrote:
> 
>> On 01/09/17 20:51, ma...@apache.org wrote:
>>> Author: markt
>>> Date: Fri Sep  1 19:51:42 2017
>>> New Revision: 1807004
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1807004=rev
>>> Log:
>>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
>>> Add RFC 7617 support to the BasicAuthenticator
>>
>> I'd like to back-port this but before I do I wanted to get some feedback
>> on the default.
>>
>> The options are:
>>
>> a) UTF-8 (the default for 9.0.x)
>>
>> b) "" or null (the current behaviour)
>>
>> The advantage of a) is that we'll support i18n user names and passwords
>> out of the box (assuming the browser does).
>>
>> The disadvantage of a) is that we'll break authentication for any user
>> name or password using ISO-8859-1 characters in the 128-255 range where
>> the browser uses ISO-8859-1 by default and doesn't support RFC 7617.
>>
>> A quick test suggests that this varies between browsers.
>>
>> Chrome appears to use UTF-8 by default. I can't tell if Chrome supports
>> RFC 7617 since it always uses UTF-8.
>>
>> Firefox appears to use ISO-8859-1 by default. It also appears that
>> Firefox doesn't support RFC 7617.
>>
>> IE is the same as Firefox.
>>
>> Hmm. This is a lot messier than I thought it would be. Given what I have
>> observed, there is no combination I can see that will allow BASIC auth
>> to work with a user name or password that contains non ASCII characters
>> with both IE, Firefox and Chrome.
>>
>> Thoughts?
>>
> 
> Huuum, since this doesn't work properly yet, I think the default should
> remain ISO-8859-1 in all cases for now.

Fair enough. I'll change the default for 9.0.x and then back-port.

We can revisit the default once (if?) the browsers implement RFC 7617.

Mark

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

svn commit: r21426 - /dev/tomcat/tomcat-connectors/native/1.2.14/ /release/tomcat/tomcat-connectors/native/1.2.14/

[markt]

Author: markt
Date: Mon Sep  4 08:42:11 2017
New Revision: 21426

Log:
Release 1.2.14 after vote passed

Added:
release/tomcat/tomcat-connectors/native/1.2.14/
  - copied from r21425, dev/tomcat/tomcat-connectors/native/1.2.14/
Removed:
dev/tomcat/tomcat-connectors/native/1.2.14/


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

[RESULT][VOTE] Release Apache Tomcat Native 1.2.14

[Mark Thomas]

The following votes were cast:

Binding:
+1: remm, markt, rjung

No other voters were cast.

The vote therefore passes.

Thanks to everyone who contributed towards this release.

Mark

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

[Bug 61484] hheheh

[bugzilla]

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

--- Comment #2 from Mark Thomas  ---
Another idiot trying to demonstrate a security hole that does not exist.

I'll disable the account and delete this issue.

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

[Bug 61484] hheheh

[bugzilla]

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

mgrigorov  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #1 from mgrigorov  ---
BugZilla is not a playground.

-- 
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 61484] New: hheheh

[bugzilla]

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

Bug ID: 61484
   Summary: hheheh
   Product: Tomcat Native
   Version: 1.2.7
  Hardware: PC
OS: Windows NT
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: mrf4k3sm...@gmail.com
  Target Milestone: ---

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

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