svn commit: r1827435 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Parser.java java/org/apache/coyote/http2/LocalStrings.properties

[remm]

Author: remm
Date: Wed Mar 21 19:39:47 2018
New Revision: 1827435

URL: http://svn.apache.org/viewvc?rev=1827435&view=rev
Log:
i18n

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

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

svn commit: r1827429 - in /tomcat/tc8.5.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml webapps/docs/config/listeners.xml

[schultz]

Author: schultz
Date: Wed Mar 21 18:33:03 2018
New Revision: 1827429

URL: http://svn.apache.org/viewvc?rev=1827429&view=rev
Log:
Back-port r1827428 to always report the OS's umask to the JVM.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/bin/catalina.sh
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml

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

svn commit: r1827428 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml webapps/docs/config/listeners.xml

[schultz]

Author: schultz
Date: Wed Mar 21 18:28:59 2018
New Revision: 1827428

URL: http://svn.apache.org/viewvc?rev=1827428&view=rev
Log:
Always send the OS's umask to the JVM.

Modified:
tomcat/trunk/bin/catalina.sh
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1827428&r1=1827427&r2=1827428&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Mar 21 18:28:59 2018
@@ -284,9 +284,8 @@ if [ -d "$CATALINA_HOME/endorsed" ]; the
 ENDORSED_PROP=java.endorsed.dirs
 fi
 
-# Uncomment the following line to make the umask available when using the
-# org.apache.catalina.security.SecurityListener
-#JAVA_OPTS="$JAVA_OPTS 
-Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"
+# Make the umask available when using the 
org.apache.catalina.security.SecurityListener
+JAVA_OPTS="$JAVA_OPTS 
-Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"
 
 if [ -z "$USE_NOHUP" ]; then
 if $hpux; then

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1827428&r1=1827427&r2=1827428&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 21 18:28:59 2018
@@ -147,6 +147,9 @@
 SourceForge and Maven Central to avoid failures due to HTTP to HTTPS
 redirects. (markt)
   
+  
+Always report the OS's umask when launching the JVM. (schultz)
+  
 
   
 

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1827428&r1=1827427&r2=1827428&view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Mar 21 18:28:59 2018
@@ -298,9 +298,11 @@
 The Security Lifecycle Listener performs a number of
 security checks when Tomcat starts and prevents Tomcat from starting if 
they
 fail. The listener is not enabled by default. To enabled it uncomment the
-listener in $CATALINA_BASE/conf/server.xml. If the operating system 
supports
-umask then the line in $CATALINA_HOME/bin/catalina.sh that obtains the 
umask
-also needs to be uncommented.
+listener in $CATALINA_BASE/conf/server.xml. For Tomcat versions before 
9.0.7,
+if the operating system supports umask then the line in
+$CATALINA_HOME/bin/catalina.sh that obtains the umask also needs to be
+uncommented. For Tomcat 9.0.7 and later, the umask is automatically
+passed-into Tomcat.
 
 This listener must only be nested within Server
 elements.



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

svn commit: r1827419 - /tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java

[remm]

Author: remm
Date: Wed Mar 21 16:12:23 2018
New Revision: 1827419

URL: http://svn.apache.org/viewvc?rev=1827419&view=rev
Log:
No actual change but a cleanup as I've given up on something "better" for now.

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

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1827419&r1=1827418&r2=1827419&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Wed 
Mar 21 16:12:23 2018
@@ -157,18 +157,13 @@ public class Http2AsyncUpgradeHandler ex
 void writeHeaders(Stream stream, int pushedStreamId, MimeHeaders 
mimeHeaders,
 boolean endOfStream, int payloadSize) throws IOException {
 // This ensures the Stream processing thread has control of the socket.
-ByteBuffer[] bufs = null;
 synchronized (socketWrapper) {
 AsyncHeaderFrameBuffers headerFrameBuffers = 
(AsyncHeaderFrameBuffers)
 doWriteHeaders(stream, pushedStreamId, mimeHeaders, 
endOfStream, payloadSize);
 if (headerFrameBuffers != null) {
-bufs = headerFrameBuffers.bufs.toArray(BYTEBUFFER_ARRAY);
-}
-// FIXME: look again at more optimized syncs, remove due to the 
need to write header frames in order with push
-if (bufs != null) {
 socketWrapper.write(BlockingMode.SEMI_BLOCK, 
protocol.getWriteTimeout(),
 TimeUnit.MILLISECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE,
-applicationErrorCompletion, bufs);
+applicationErrorCompletion, 
headerFrameBuffers.bufs.toArray(BYTEBUFFER_ARRAY));
 handleAsyncException();
 }
 }



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

Re: [Git migration] Commit message format

[Coty Sutherland]

On Tue, Mar 20, 2018 at 4:07 PM, Mark Thomas  wrote:
> On 21/02/18 16:48, Mark Thomas wrote:
>> On 21/02/18 16:10, Rainer Jung wrote:
>>> Am 21.02.2018 um 16:53 schrieb Mark Thomas:
 The next issue on the list is the format of commit messages.

 The commit messages we are seeing for the tomcat-training repository
 have the same format as the commit message for the main tomcat repo will
 have.

 Does anyone have any concerns regarding the format?
>>>
>>> Would we be able to determine the branch from the subject line, e.g.
>>> would it be part of what is written between the square brackets? I
>>> personally find it very convenient to be able to easily filter commit
>>> mails by branch.
>>
>> Where there are new files described in subsequent commits, those commits
>> don't have a branch in the subject. You can see how this works in
>> practice on comm...@infra.apache.org
>
> Coming back to this.
>
> Having seen some of the messages for the tomcat-training repo what are
> people's thoughts?

I have a couple small things.

1) The third block's formatting looks weird on my end. Example:

"The following commit(s) were added to refs/heads/master by this push:
 new b13e925  First draft of logging module
b13e925 is described below"

I'm not sure the first few lines are necessary (the automated message
bit and repository link), so they could be removed/cleaned up.

2) Can we add a link to the commit somehow so that it closer resembles
the svn commit emails?

Other than those things, I think it's OK.

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

[GitHub] tomcat pull request #103: Use initSQL instead of Validator on connection ini...

[jihor]

GitHub user jihor opened a pull request:

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

Use initSQL instead of Validator on connection initialization

As of now, if Validator (not to be confused with validationQuery) is 
defined for the connection pool, initSQL will not be used on connection 
initialization, which I think is a bug, not a feature.

This commit changes this behavior so if initSQL is present, it will be used 
on connection initialization (and only then) instead of Validator.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/jihor/tomcat trunk

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/103.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #103


commit 970b4ce0afb8a90d7dc1c4bbe921dc3e1e4fbb78
Author: jihor 
Date:   2018-03-21T12:51:04Z

Use initSQL instead of Validator on connection initialization if initSQL is 
present




---

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

svn commit: r1827408 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2Parser.java LocalStrings.properties

[remm]

Author: remm
Date: Wed Mar 21 12:34:23 2018
New Revision: 1827408

URL: http://svn.apache.org/viewvc?rev=1827408&view=rev
Log:
i18n

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

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1827408&r1=1827407&r2=1827408&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Wed Mar 21 
12:34:23 2018
@@ -183,7 +183,8 @@ class Http2Parser {
 if (dest.remaining() < dataLength) {
 swallow(streamId, dataLength, false, buffer);
 // Client has sent more data than permitted by Window size
-throw new StreamException("Client sent more data than 
stream window allowed", Http2Error.FLOW_CONTROL_ERROR, streamId);
+throw new 
StreamException(sm.getString("http2Parser.processFrameData.window", 
connectionId),
+Http2Error.FLOW_CONTROL_ERROR, streamId);
 }
 if (buffer == null) {
 input.fill(true, dest, dataLength);

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1827408&r1=1827407&r2=1827408&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Wed Mar 
21 12:34:23 2018
@@ -56,6 +56,7 @@ http2Parser.processFrame.tooMuchPadding=
 http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received 
frame type [{1}]
 http2Parser.processFrameContinuation.notExpected=Connection [{0}], 
Continuation frame received for stream [{1}] when no headers were in progress
 http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data 
length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.window=Connection [{0}], Client sent more data 
than stream window allowed
 http2Parser.processFrameGoaway.payloadTooSmall=Connection [{0}]: Goaway 
payload size was [{1}] which is less than the minimum 8
 http2Parser.processFrameHeaders.decodingFailed=There was an error during the 
HPACK decoding of HTTP headers
 http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK 
decoding - it should have been consumed



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

Release Announcement: General Availability of JDK 10

[Rory O'Donnell]

Hi Mark,

A number of items to share with you today :

*1) JDK 10 General Availability *

JDK 10, the first release produced under the six-month rapid-cadence 
release model [1][2], is now Generally Available.
We've identified no P1 bugs since we promoted build 46 almost two weeks 
ago, so that is the official GA release, ready for production use.

GPL'd binaries from Oracle are available here: http://jdk.java.net/10

This release includes twelve features:

 * 286: Local-Variable Type Inference 
 * 296: Consolidate the JDK Forest into a Single Repository
   
 * 304: Garbage-Collector Interface 
 * 307: Parallel Full GC for G1 
 * 310: Application Class-Data Sharing 
 * 312: Thread-Local Handshakes 
 * 313: Remove the Native-Header Generation Tool (javah)
   
 * 314: Additional Unicode Language-Tag Extensions
   
 * 316: Heap Allocation on Alternative Memory Devices
   
 * 317: Experimental Java-Based JIT Compiler
   
 * 319: Root Certificates 
 * 322: Time-Based Release Versioning 


*2) JDK 11 EA build 5, under both the GPL and Oracle EA licenses, are 
now available at **http://jdk.java.net/11**.*


 * Schedule, status & features
 o http://openjdk.java.net/projects/jdk/11/
 * Release Notes:
 o http://jdk.java.net/11/release-notes
 * Summary of changes
 o https://download.java.net/java/early_access/jdk11/5/jdk-11+5.html

*3) The Z Garbage Collector Project, early access builds available : *

The first EA binary from from The Z Garbage Collector Project, also 
known as ZGC, is now available. ZGC is a scalable low latency garbage 
collector. For information on how to enable and use ZGC, please see the 
project wiki.


 * Project page: http://openjdk.java.net/projects/zgc/
 * Wiki: https://wiki.openjdk.java.net/display/zgc/Main

*4) Quality Outreach Report for **March 2018 **is available
*

 * 
https://wiki.openjdk.java.net/display/quality/Quality+Outreach+report+March+2018

*5) **Java Client Roadmap Update
*

 * We posted a blog [3] and related white paper [4] detailing our plans
   for the Java Client.

Rgds,Rory

[1] https://mreinhold.org/blog/forward-faster
[2] 
http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
[3] Blog: 
https://blogs.oracle.com/java-platform-group/the-future-of-javafx-and-other-java-client-roadmap-updates
[4] Whitepaper: 
http://www.oracle.com/technetwork/java/javase/javaclientroadmapupdate2018mar-4414431.pdf


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

[Bug 62163] Tomcat Setup section of docs does not take into account new dependency on Java 8

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
The release notes do not need editing. They correctly state that Java 8 is
required to run Tomcat 9.x.

The file that needs fixing is setup.html and the source for that can be found
here:
https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/setup.xml
or here
https://github.com/apache/tomcat/blob/trunk/webapps/docs/setup.xml

-- 
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 62163] Tomcat Setup section of docs does not take into account new dependency on Java 8

[bugzilla]

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

--- Comment #2 from mhkarunarat...@gmail.com ---
I would like to fix that documentation. How can I edit "Apache Tomcat Version
9.0.5 Release Note'

-- 
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 62163] Tomcat Setup section of docs does not take into account new dependency on Java 8

[bugzilla]

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

--- Comment #1 from mhkarunarat...@gmail.com ---
I would like to fix that documentation. How can I edit "Apache Tomcat Version
9.0.5 Release Note'

-- 
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: r1827399 - in /tomcat/trunk: java/org/apache/catalina/tribes/tipis/ java/org/apache/coyote/http2/ java/org/apache/jasper/compiler/ java/org/apache/jasper/runtime/ java/org/apache/tomcat/we

[markt]

Author: markt
Date: Wed Mar 21 10:10:48 2018
New Revision: 1827399

URL: http://svn.apache.org/viewvc?rev=1827399&view=rev
Log:
SpotBugs
Avoid catching Exception

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java

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

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Wed Mar 21 10:10:48 2018
@@ -1033,7 +1033,7 @@ public abstract class AbstractReplicated
 entry.setCopy(false);
 if ( getMapOwner()!=null ) 
getMapOwner().objectMadePrimary(key, entry.getValue());
 
-} catch (Exception x) {
+} catch (RuntimeException | ChannelException | 
ClassNotFoundException | IOException x) {
 log.error(sm.getString("abstractReplicatedMap.unable.get"), x);
 return null;
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java Wed Mar 21 
10:10:48 2018
@@ -228,7 +228,7 @@ class Http2AsyncParser extends Http2Pars
 }
 }
 } while (continueParsing);
-} catch (Exception e) {
+} catch (RuntimeException | IOException | Http2Exception e) {
 error = e;
 }
 if (payload.hasRemaining()) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Mar 21 
10:10:48 2018
@@ -268,7 +268,7 @@ public abstract class Compiler {
 + " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
 }
 
-} catch (Exception e) {
+} catch (RuntimeException e) {
 // Remove the generated .java file
 File file = new File(javaFileName);
 if (file.exists()) {

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Wed Mar 
21 10:10:48 2018
@@ -20,6 +20,7 @@ package org.apache.jasper.compiler;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FilePermission;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -517,7 +518,7 @@ public final class JspRuntimeContext {
 // Allow the JSP to access 
org.apache.jasper.runtime.HttpJspBase
 permissions.add( new RuntimePermission(
 "accessClassInPackage.org.apache.jasper.runtime") );
-} catch(Exception e) {
+} catch(RuntimeException | IOException e) {
 context.log("Security Init for context failed",e);
 }
 }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/

svn commit: r1827398 - /tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

[markt]

Author: markt
Date: Wed Mar 21 09:51:22 2018
New Revision: 1827398

URL: http://svn.apache.org/viewvc?rev=1827398&view=rev
Log:
SpotBugs
Improve exception handling

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1827398&r1=1827397&r2=1827398&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Wed 
Mar 21 09:51:22 2018
@@ -17,6 +17,7 @@
 package org.apache.catalina.tribes.group;
 
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
@@ -267,9 +268,8 @@ public class GroupChannel extends Channe
 }
 
 return new UniqueId(data.getUniqueId());
-}catch ( Exception x ) {
-if ( x instanceof ChannelException ) throw (ChannelException)x;
-throw new ChannelException(x);
+} catch (RuntimeException | IOException e) {
+throw new ChannelException(e);
 } finally {
 if ( buffer != null ) 
BufferPool.getBufferPool().returnBuffer(buffer);
 }



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

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

[markt]

Author: markt
Date: Wed Mar 21 09:29:37 2018
New Revision: 1827397

URL: http://svn.apache.org/viewvc?rev=1827397&view=rev
Log:
MaxProtocol doesn't seem to impact TLSv1.3 ciphers suites. Use an alternative 
way to disable them for this test.

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

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

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

svn commit: r1827396 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java

[markt]

Author: markt
Date: Wed Mar 21 09:27:35 2018
New Revision: 1827396

URL: http://svn.apache.org/viewvc?rev=1827396&view=rev
Log:
MaxProtocol doesn't seem to impact TLSv1.3 ciphers suites. Use an alternative 
way to disable them for this test.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java?rev=1827396&r1=1827395&r2=1827396&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/TestOpenSSLConf.java 
Wed Mar 21 09:27:35 2018
@@ -80,7 +80,7 @@ public class TestOpenSSLConf extends Tom
 public void testOpenSSLConfCmdCipher() throws Exception {
 // Ensure TLSv1.3 ciphers aren't returned
 SSLHostConfig sslHostConfig = initOpenSSLConfCmdCipher("CipherString", 
ENABLED_CIPHER,
-"MaxProtocol", "TLSv1.2");
+"CipherSuites", "");
 String[] ciphers = sslHostConfig.getEnabledCiphers();
 Assert.assertThat("Wrong HostConfig ciphers", ciphers,
 CoreMatchers.is(EXPECTED_CIPHERS));



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

Re: umask and SecurityListener

[Mark Thomas]

On 21/03/18 03:43, Christopher Schultz wrote:
> All,
> 
> The SecurityLogger seems to want a umask in environments where it makes
> sense. But the line of catalina.sh that sets the JVM system property to
> pass the umask into the launching JVM is commented-out.
> 
> It would be best not to have to modify one's own catalina.sh file in
> order to enable the UMASK value-transfer.
> 
> So I started writing a patch for catalina.sh with another environment
> variable that /enables/ sending the umask.
> 
> But it seems that bin/catalina.sh already requires umask (from 8.5.29):
> 
> [269] # Set UMASK unless it has been overridden
> [270] if [ -z "$UMASK" ]; then
> [271]UMASK="0027"
> [272] fi
> [273] umask $UMASK
> 
> The umask program is expected to be present.
> 
> Then, later:
> 
> [287] # Uncomment the following line to make the umask available when
> using the
> [288] # org.apache.catalina.security.SecurityListener
> [289] #JAVA_OPTS="$JAVA_OPTS
> -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`"
> 
> It's been like this for 7 years since the listener was first added. Any
> reason not to unconditionally set this JVM system property on startup?

Lines 287-289 pre-date lines 269-273.

>From memory lines 287-289 were left commented out as we didn't want to
break working configurations in a point release.

With the addition of lines 269-273 I agree with uncommenting lines 287-289.

Mark

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