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

[remm]

Author: remm
Date: Fri Nov 30 22:49:06 2018
New Revision: 1847859

URL: http://svn.apache.org/viewvc?rev=1847859=rev
Log:
Typo

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847859=1847858=1847859=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 30 22:49:06 2018
@@ -137,7 +137,7 @@
   
   
 Avoid a potential hang when a client connects using TLS 1.0 to a Tomcat
-HTTPS connector configured to use NIO or NIO with OpenSSL 1.1.1 or
+HTTPS connector configured to use NIO or NIO2 with OpenSSL 1.1.1 or
 later. (markt)
   
 



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

svn commit: r1847858 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

[remm]

Author: remm
Date: Fri Nov 30 22:48:10 2018
New Revision: 1847858

URL: http://svn.apache.org/viewvc?rev=1847858=rev
Log:
After compiling a list of non i18ed items, fix obvious ooops.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1847858=1847857=1847858=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Nov 30 
22:48:10 2018
@@ -2032,7 +2032,7 @@ public class StandardContext extends Con
 oldNamingResources.stop();
 oldNamingResources.destroy();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.destroy.fail", e);
+
log.warn(sm.getString("standardContext.namingResource.destroy.fail"), e);
 }
 }
 if (namingResources != null) {
@@ -2040,7 +2040,7 @@ public class StandardContext extends Con
 namingResources.init();
 namingResources.start();
 } catch (LifecycleException e) {
-log.warn("standardContext.namingResource.init.fail", e);
+
log.warn(sm.getString("standardContext.namingResource.init.fail"), e);
 }
 }
 }



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

[Bug 62968] Avoid unnecessary call to WebResourceRoot.getResource in Mapper.internalMapWrapper

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards

(7.0.x has a different resources implementation)

-- 
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: r1847855 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/mapper/Mapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Nov 30 21:01:09 2018
New Revision: 1847855

URL: http://svn.apache.org/viewvc?rev=1847855=rev
Log:
Avoid unnecessary (and relatively expensive) getResources() call 
in the Mapper when processing rule 7.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 30 21:01:09 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
 

svn commit: r1847854 - /tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java

[markt]

Author: markt
Date: Fri Nov 30 20:59:37 2018
New Revision: 1847854

URL: http://svn.apache.org/viewvc?rev=1847854=rev
Log:
Clean-up file created during test

Modified:

tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java

Modified: 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java?rev=1847854=1847853=1847854=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 Fri Nov 30 20:59:37 2018
@@ -25,6 +25,7 @@ import java.util.Collection;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
 
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
@@ -51,6 +52,8 @@ import org.apache.catalina.tribes.io.XBy
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestEncryptInterceptor {
+private static final String MESSAGE_FILE = "message.bin";
+
 private static final String encryptionKey128 = 
"cafebabedeadbeefbeefcafecafebabe";
 private static final String encryptionKey192 = 
"cafebabedeadbeefbeefcafecafebabedeadbeefbeefcafe";
 private static final String encryptionKey256 = 
"cafebabedeadbeefcafebabedeadbeefcafebabedeadbeefcafebabedeadbeef";
@@ -58,6 +61,15 @@ public class TestEncryptInterceptor {
 EncryptInterceptor src;
 EncryptInterceptor dest;
 
+
+@AfterClass
+public static void cleanup() {
+File f = new File(MESSAGE_FILE);
+if (f.isFile()) {
+Assert.assertTrue(f.delete());
+}
+}
+
 @Before
 public void setup() {
 src = new EncryptInterceptor();
@@ -294,7 +306,7 @@ public class TestEncryptInterceptor {
 
 byte[] bytes = ((ValueCaptureInterceptor)src.getNext()).getValue();
 
-try (FileOutputStream out = new FileOutputStream("message.bin")) {
+try (FileOutputStream out = new FileOutputStream(MESSAGE_FILE)) {
 out.write(bytes);
 }
 
@@ -303,7 +315,7 @@ public class TestEncryptInterceptor {
 bytes = new byte[8192];
 int read;
 
-try (FileInputStream in = new FileInputStream("message.bin")) {
+try (FileInputStream in = new FileInputStream(MESSAGE_FILE)) {
 read = in.read(bytes);
 }
 
@@ -339,7 +351,7 @@ public class TestEncryptInterceptor {
 
 @Test
 public void testPickup() throws Exception {
-File file = new File("message.bin");
+File file = new File(MESSAGE_FILE);
 if(!file.exists()) {
 System.err.println("File message.bin does not exist. Skipping 
test.");
 return;
@@ -350,7 +362,7 @@ public class TestEncryptInterceptor {
 byte[] bytes = new byte[8192];
 int read;
 
-try (FileInputStream in = new FileInputStream("message.bin")) {
+try (FileInputStream in = new FileInputStream(file)) {
 read = in.read(bytes);
 }
 



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

svn commit: r1847853 - in /tomcat/trunk: java/org/apache/catalina/mapper/Mapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Nov 30 20:52:26 2018
New Revision: 1847853

URL: http://svn.apache.org/viewvc?rev=1847853=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62968
Avoid unnecessary (and relatively expensive) getResources() call 
in the Mapper when processing rule 7.

Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1847853=1847852=1847853=diff
==
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Fri Nov 30 
20:52:26 2018
@@ -1028,22 +1028,28 @@ public final class Mapper {
 char[] buf = path.getBuffer();
 if (contextVersion.resources != null && buf[pathEnd -1 ] != '/') {
 String pathStr = path.toString();
-WebResource file;
-// Handle context root
-if (pathStr.length() == 0) {
-file = contextVersion.resources.getResource("/");
-} else {
-file = contextVersion.resources.getResource(pathStr);
-}
-if (file != null && file.isDirectory() &&
-
contextVersion.object.getMapperDirectoryRedirectEnabled()) {
-// Note: this mutates the path: do not do any processing
-// after this (since we set the redirectPath, there
-// shouldn't be any)
-path.setOffset(pathOffset);
-path.append('/');
-mappingData.redirectPath.setChars
-(path.getBuffer(), path.getStart(), path.getLength());
+// Note: Check redirect first to save unnecessary getResource()
+//   call. See BZ 62968.
+if (contextVersion.object.getMapperDirectoryRedirectEnabled()) 
{
+WebResource file;
+// Handle context root
+if (pathStr.length() == 0) {
+file = contextVersion.resources.getResource("/");
+} else {
+file = contextVersion.resources.getResource(pathStr);
+}
+if (file != null && file.isDirectory()) {
+// Note: this mutates the path: do not do any 
processing
+// after this (since we set the redirectPath, there
+// shouldn't be any)
+path.setOffset(pathOffset);
+path.append('/');
+mappingData.redirectPath.setChars
+(path.getBuffer(), path.getStart(), 
path.getLength());
+} else {
+mappingData.requestPath.setString(pathStr);
+mappingData.wrapperPath.setString(pathStr);
+}
 } else {
 mappingData.requestPath.setString(pathStr);
 mappingData.wrapperPath.setString(pathStr);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847853=1847852=1847853=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 30 20:52:26 2018
@@ -106,6 +106,11 @@
 Add periodic event notification for lifecycle listeners configured on
 the Server. (remm)
   
+  
+62968: Avoid unnecessary (and relatively expensive)
+getResources() call in the Mapper when processing rule 7.
+(markt)
+  
 
   
   



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

svn commit: r1847852 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Fri Nov 30 20:50:11 2018
New Revision: 1847852

URL: http://svn.apache.org/viewvc?rev=1847852=rev
Log:
Fix a false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1847852=1847851=1847852=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Nov 30 20:50:11 
2018
@@ -191,6 +191,13 @@
 
   
   
+
+
+
+
+
+  
+  
 
 
 



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

[Bug 62911] Add support for proxying ocsp requests via ProxyHost and ProxyPort in TomcAt

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

  Component|Connectors  |Library
Version|7.0.70  |1.2.18
Product|Tomcat 7|Tomcat Native

--- Comment #1 from Mark Thomas  ---
Moving to correct project

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

[VOTE] Release Apache Tomcat Native 1.2.19

[Mark Thomas]

Version 1.2.19 includes the following changes compared to 1.2.18:

- Windows binaries built with OpenSSL 1.0.2q and APR 1.6.5
- Windows binaries built with OpenSSL 1.1.1a and APR 1.6.5
- Fixed memory leak associated with OCSP
- Fix an error that prevented the use of TLS 1.0 and 1.1 if 1.3 was
  available

Various other fixes and improvements. See the changelog for details.

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.19 release is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.19/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_19

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

svn commit: r31265 - in /dev/tomcat/tomcat-connectors/native/1.2.19: ./ binaries/ source/

[markt]

Author: markt
Date: Fri Nov 30 19:51:28 2018
New Revision: 31265

Log:
Upload 1.2.19 for voting

Added:
dev/tomcat/tomcat-connectors/native/1.2.19/
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-ocsp-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.1.1a-win32-bin.zip.sha512
dev/tomcat/tomcat-connectors/native/1.2.19/source/

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-src.tar.gz
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-src.tar.gz.asc

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-src.tar.gz.sha512

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-win32-src.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-win32-src.zip.sha512

Added: 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.asc
 Fri Nov 30 19:51:28 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlwBlHkACgkQEMAcWi9g
+Wefg6A//dyxiBi9eJf9xaQuOg+hvE1nkxLoKyEqlY6+0T9lhEqNmkkFsUEXLmMo/
+A+saoLKHlvzZ4HrmqFshh+2DHppf/ay3XloZOOORMB8fVf0vm6R0d0uj2+MPWFbv
+6C7MAQtdN5QqOaCdC+Cl857LHtBA2GmiJuUOSReFqXw4zY9svdubx3eocPGQ39D5
+7q7FlCVrZYMUHS2/VbB7zlX7K9oyHgRB60HY0dvKcCTR6rY9GAf3bTxjo68mOVVv
+cOUGbk4ZIx6RGOy3A98Jx2MV0HZ61hi1MzMHqrE1UJFUIzzrsmMeT0fx3NRSU2OJ
+NlXIGBVBtVfx13kqb4xJg3lmzOxiDX5Pq0VzgVKP8kMJZtKTXSjFr6Uw0amQdTH7
+Nh5Xf5n1PPRjFldJnf51Vils6BySbBZB5MLHU20Uak/jSzz3/zCT1okdh3LbeyKr
+0gkUGN6oBllxsWRQxj2BTkaZTvCAlHG0GkBxGa8UA9gTedZl+5bJWxZ6jWmA0aFz
+dE7wdrrZmdnzB3wZsA35tm2QGrceY5Ae6Va+WK6EfV+LQlO1WwWGEfEIsM/rjW5x
+nfGq2n3vES5Sb0ifWXIvscwJjQgBmsOKsYaHf6vJTNJkQvNT49+n667VUtYgvwex
+yT898O/tdFKgMOaUFxd1g9fpBgaiRvvdddFNwcRzI5CSmWkus50=
+=BlxS
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.19/binaries/tomcat-native-1.2.19-openssl-1.0.2q-ocsp-win32-bin.zip.sha512
 Fri Nov 30 19:51:28 2018
@@ -0,0 +1 @@
+5a80bdd90325830e0f36434f7d173c2aa03944654d2ebd0646cbc26ff199973d03283f574ad30fb11c833439c18a825203a083dfa7821d8dfb94d6f3ab2f055f
 

svn commit: r31263 - /release/tomcat/tomcat-connectors/native/1.2.17/

[markt]

Author: markt
Date: Fri Nov 30 19:48:04 2018
New Revision: 31263

Log:
Drop 1.2.17 from mirrors

Removed:
release/tomcat/tomcat-connectors/native/1.2.17/


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

svn commit: r1847846 - /tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch

[markt]

Author: markt
Date: Fri Nov 30 19:44:21 2018
New Revision: 1847846

URL: http://svn.apache.org/viewvc?rev=1847846=rev
Log:
Remove fixes that are included in OpenSSL 1.1.1a

Modified:
tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch

Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch?rev=1847846=1847845=1847846=diff
==
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch 
(original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch Fri 
Nov 30 19:44:21 2018
@@ -19,16 +19,6 @@
  #include 
  #include "internal/cryptlib.h"
  #include "internal/engine.h"
 crypto/sm2/sm2_sign.c
-+++ crypto/sm2/sm2_sign.c
-@@ -12,6 +12,7 @@
- #include "internal/sm2.h"
- #include "internal/sm2err.h"
- #include "internal/ec_int.h" /* ec_group_do_inverse_ord() */
-+#include "internal/numbers.h"
- #include 
- #include 
- #include 
 --- crypto/o_time.c
 +++ crypto/o_time.c
 @@ -41,10 +41,6 @@
@@ -62,19 +52,6 @@
  
  #include 
  #include 
 test/ct_test.c
-+++ test/ct_test.c
-@@ -500,8 +500,8 @@
- {
- int success = 0;
- CT_POLICY_EVAL_CTX *ct_policy_ctx = CT_POLICY_EVAL_CTX_new();
--const time_t default_time = CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) /
--1000;
-+const time_t default_time =
-+(time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000);
- const time_t time_tolerance = 600;  /* 10 minutes */
- 
- if (!TEST_time_t_le(abs((int)difftime(time(NULL), default_time)),
 --- e_os.h
 +++ e_os.h
 @@ -149,7 +149,7 @@



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

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

[Rémy Maucherat]

On Wed, Nov 28, 2018 at 4:52 PM Mark Thomas  wrote:

> Indeed. I saw that and started to mentally draft a "Ignore my last"
> email while I scrolled to the end to see which test had failed.
>
> Looks really fixed to me now. Outstanding !

Rémy

[Bug 62968] Avoid unnecessary call to WebResourceRoot.getResource in Mapper.internalMapWrapper

[bugzilla]

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

pradeep singarakannan  changed:

   What|Removed |Added

 CC||it4prad...@gmail.com

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

svn commit: r1847826 - in /tomcat/trunk/java/org/apache/catalina/storeconfig: LocalStrings.properties StoreRegistry.java

[remm]

Author: remm
Date: Fri Nov 30 14:23:41 2018
New Revision: 1847826

URL: http://svn.apache.org/viewvc?rev=1847826=rev
Log:
Add another missed string, and cleanups

Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties?rev=1847826=1847825=1847826=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] Fri Nov 30 14:23:41 2018
@@ -22,6 +22,8 @@ config.storeServerError=Error storing se
 factory.storeNoDescriptor=Descriptor for element class [{0}] not configured!
 factory.storeTag=store tag [{0}] ( Object: [{1}] )
 
+registry.loadClassFailed=Failed to load class [{0}]
+
 storeConfigListener.loadError=Error loading StoreConfig
 storeConfigListener.notServer=The listener was added to component other than 
the Server and will therefore be ignored
 storeConfigListener.registerError=Error registering StoreConfig MBean

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java?rev=1847826=1847825=1847826=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java Fri 
Nov 30 14:23:41 2018
@@ -44,12 +44,14 @@ import org.apache.coyote.UpgradeProtocol
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.http.CookieProcessor;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Central StoreRegistry for all server.xml elements
  */
 public class StoreRegistry {
 private static Log log = LogFactory.getLog(StoreRegistry.class);
+private static StringManager sm = 
StringManager.getManager(StoreRegistry.class);
 
 private Map descriptors = new HashMap<>();
 
@@ -71,30 +73,28 @@ public class StoreRegistry {
 CookieProcessor.class };
 
 /**
- * @return Returns the name.
+ * @return the name
  */
 public String getName() {
 return name;
 }
 
 /**
- * @param name
- *The name to set.
+ * @param name The name to set.
  */
 public void setName(String name) {
 this.name = name;
 }
 
 /**
- * @return Returns the version.
+ * @return the version
  */
 public String getVersion() {
 return version;
 }
 
 /**
- * @param version
- *The version to set.
+ * @param version The version to set
  */
 public void setVersion(String version) {
 this.version = version;
@@ -105,19 +105,19 @@ public class StoreRegistry {
  * found.
  *
  * @param id The class name
- * @return The description
+ * @return the description
  */
 public StoreDescription findDescription(String id) {
-if (log.isDebugEnabled())
+if (log.isDebugEnabled()) {
 log.debug("search descriptor " + id);
+}
 StoreDescription desc = descriptors.get(id);
 if (desc == null) {
 Class aClass = null;
 try {
-aClass = Class.forName(id, true, this.getClass()
-.getClassLoader());
+aClass = Class.forName(id, true, 
this.getClass().getClassLoader());
 } catch (ClassNotFoundException e) {
-log.error("ClassName:" + id, e);
+log.error(sm.getString("registry.loadClassFailed", id), e);
 }
 if (aClass != null) {
 desc = descriptors.get(aClass.getName());
@@ -128,12 +128,14 @@ public class StoreRegistry {
 }
 }
 }
-if (log.isDebugEnabled())
-if (desc != null)
+if (log.isDebugEnabled()) {
+if (desc != null) {
 log.debug("find descriptor " + id + "#" + desc.getTag() + "#"
 + desc.getStoreFactoryClass());
-else
+} else {
 log.debug(("Can't find descriptor for key " + id));
+}
+}
 return desc;
 }
 
@@ -141,7 +143,7 @@ public class StoreRegistry {
  * Find Description by class.
  *
  * @param aClass The class
- * @return The description
+ * @return the description
  */
 public StoreDescription findDescription(Class aClass) {
 return findDescription(aClass.getName());
@@ -151,14 +153,15 @@ public 

Cleaning up 8.0.x

[Mark Thomas]

Hi,

As you will have seen I've been cleaning up now 8.0.x is EOL. Everything
is done apart from the svn move. I have requested INFRA disable the
svn->git sync and remove the git mirrors[1]. Once that task is complete,
I'll move the 8.0.x code in svn.

Mark

[1] https://issues.apache.org/jira/browse/INFRA-17341

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

svn commit: r31250 - /release/tomcat/tomcat-8/v8.0.53/

[markt]

Author: markt
Date: Fri Nov 30 13:40:47 2018
New Revision: 31250

Log:
Drop 8.0.x from mirrors as it has reached EOL

Removed:
release/tomcat/tomcat-8/v8.0.53/


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

svn commit: r31249 - /release/tomcat/tomcat-8/v8.5.34/

[markt]

Author: markt
Date: Fri Nov 30 13:40:21 2018
New Revision: 31249

Log:
Drop 8.5.34 from mirrors now 8.5.35 is available

Removed:
release/tomcat/tomcat-8/v8.5.34/


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

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

[markt]

Author: markt
Date: Fri Nov 30 13:39:32 2018
New Revision: 1847821

URL: http://svn.apache.org/viewvc?rev=1847821=rev
Log:
As per 8.0.x EOL announcement, remove 8.0.x download and documentation links
Note: docs are available, just not linked from the menu

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

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1847821=1847820=1847821=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri Nov 30 13:39:32 2018
@@ -86,9 +86,6 @@
 Tomcat 8.5
 
 
-Tomcat 8.0
-
-
 Tomcat 7.0
 
 

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1847821=1847820=1847821=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri Nov 30 13:39:32 2018
@@ -85,9 +85,6 @@
 Tomcat 8.5
 
 
-Tomcat 8.0
-
-
 Tomcat 7.0
 
 

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1847821=1847820=1847821=diff
==
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Fri Nov 30 13:39:32 2018
@@ -85,9 +85,6 @@
 Tomcat 8.5
 
 
-Tomcat 8.0
-
-
 Tomcat 7.0
 
 

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1847821=1847820=1847821=diff
==
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Fri Nov 30 13:39:32 2018
@@ -85,9 +85,6 @@
 Tomcat 8.5
 
 
-Tomcat 8.0
-
-
 Tomcat 7.0
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1847821=1847820=1847821=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Fri Nov 30 13:39:32 2018
@@ -85,9 +85,6 @@
 Tomcat 8.5
 
 
-Tomcat 8.0
-
-
 Tomcat 7.0
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1847821=1847820=1847821=diff

[Bug 62968] New: Avoid unnecessary call to WebResourceRoot.getResource in Mapper.internalMapWrapper

[bugzilla]

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

Bug ID: 62968
   Summary: Avoid unnecessary call to WebResourceRoot.getResource
in Mapper.internalMapWrapper
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: awilkin...@pivotal.io
  Target Milestone: -

When considering rule 7, Mapper.internalMapWrapper makes a call to
WebResourceRoot.getResource(String) that is only necessary if
Context.getMapperDirectoryRedirectEnabled() returns true. It looks like the
logic could be reworked so that enablement of the redirect is checked first,
and the getResource(String) call is then only made when it is enabled.

This was originally discussed with Mark Thomas in the context of a Spring Boot
issue. Please see
https://github.com/spring-projects/spring-boot/issues/8522#issuecomment-443177285
for further details.

-- 
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: r1847819 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_19: ./ build.properties.default native/include/tcn_version.h

[markt]

Author: markt
Date: Fri Nov 30 13:11:27 2018
New Revision: 1847819

URL: http://svn.apache.org/viewvc?rev=1847819=rev
Log:
Tag 1.2.19

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/
  - copied from r1847818, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default?rev=1847819=1847818=1847819=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default Fri Nov 30 
13:11:27 2018
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=19
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h?rev=1847819=1847818=1847819=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h Fri 
Nov 30 13:11:27 2018
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r1847817 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Fri Nov 30 13:05:39 2018
New Revision: 1847817

URL: http://svn.apache.org/viewvc?rev=1847817=rev
Log:
Bump version info

Modified:
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1847817=1847816=1847817=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Nov 30 13:05:39 
2018
@@ -48,6 +48,9 @@
   Include OpenSSL licensing information in the Tomcat Native binaries for
   Windows that are built with OpenSSL. (markt)
 
+
+  Update recommended OpenSSL version to 1.0.2q or later. (markt)
+
   
 
 



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

svn commit: r1847816 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_19/

[markt]

Author: markt
Date: Fri Nov 30 13:05:32 2018
New Revision: 1847816

URL: http://svn.apache.org/viewvc?rev=1847816=rev
Log:
Drop tag to allow re-tagging

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/


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

svn commit: r1847815 - /tomcat/native/trunk/native/srclib/VERSIONS

[markt]

Author: markt
Date: Fri Nov 30 13:04:18 2018
New Revision: 1847815

URL: http://svn.apache.org/viewvc?rev=1847815=rev
Log:
Bump version info

Modified:
tomcat/native/trunk/native/srclib/VERSIONS

Modified: tomcat/native/trunk/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1847815=1847814=1847815=diff
==
--- tomcat/native/trunk/native/srclib/VERSIONS (original)
+++ tomcat/native/trunk/native/srclib/VERSIONS Fri Nov 30 13:04:18 2018
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
 - APR 1.6.5 or later, http://apr.apache.org
-- OpenSSL 1.0.2p or later, http://www.openssl.org
+- OpenSSL 1.0.2q or later, http://www.openssl.org



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

svn commit: r1847814 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_19: ./ build.properties.default native/include/tcn_version.h

[markt]

Author: markt
Date: Fri Nov 30 13:02:14 2018
New Revision: 1847814

URL: http://svn.apache.org/viewvc?rev=1847814=rev
Log:
Tag 1.2.19

Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/
  - copied from r1847811, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default
tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default?rev=1847814=1847811=1847814=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_19/build.properties.default Fri Nov 30 
13:02:14 2018
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=19
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h?rev=1847814=1847811=1847814=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_19/native/include/tcn_version.h Fri 
Nov 30 13:02:14 2018
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

JDK 12 build 22 is now available at : - jdk.java.net/12/

[Rory O'Donnell]

Hi Mark,

*NOTE:- *The JDK 12 schedule  
rampdown phase 1 of the release is coming up in a few weeks on Dec. 13, 
2018.


**

*JDK 12 Early Access build 22 **is now available **at : - jdk.java.net/12/*

 * Release Note updates since last email *
   *
 o Build 21 - Deprecating the default keytool -keyalg value
   (JDK-8212003)
 o Build 21 - Change to X25519 and X448 encoded private key format
   (JDK-8213363)
 o Build 20 - New command-line flag for more extensive error
   reporting in crash logs  (JDK-8211845)
 o Build 20 -Initial Value of user.timezone System Property Changed
   (JDK-8185496)

 * JEPs proposed for JDK 12 :
 o JEP 189: Shenandoah: A Low-Pause-Time Garbage
   Collector(Experimental) 
 o JEP 334: JVM Constants API 
 o JEP 344: Abortable Mixed Collections for G1
   
 o JEP 346: Promptly Return Unused Committed Memory from G1
   

 * JEPs targeted to JDK 12, so far
 o JEP 230: Microbenchmark Suite 
 o JEP 325: Switch Expressions (Preview)
   
 o JEP 326: Raw String Literals (Preview)
   
 o JEP 340: One AArch64 Port, Not Two
   
 o JEP 341: Default CDS Archives 

Rgds,Rory

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

svn commit: r1847806 - in /tomcat/native/trunk: native/LICENSE.bin.win native/NOTICE.bin.win xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Fri Nov 30 11:46:52 2018
New Revision: 1847806

URL: http://svn.apache.org/viewvc?rev=1847806=rev
Log:
Add a LICENCE and NOTICE file for use with the binary distributions for Windows.

Added:
tomcat/native/trunk/native/LICENSE.bin.win
  - copied, changed from r1847489, tomcat/native/trunk/LICENSE
tomcat/native/trunk/native/NOTICE.bin.win
  - copied, changed from r1847489, tomcat/native/trunk/NOTICE
Modified:
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Copied: tomcat/native/trunk/native/LICENSE.bin.win (from r1847489, 
tomcat/native/trunk/LICENSE)
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/LICENSE.bin.win?p2=tomcat/native/trunk/native/LICENSE.bin.win=tomcat/native/trunk/LICENSE=1847489=1847806=1847806=diff
==
--- tomcat/native/trunk/LICENSE (original)
+++ tomcat/native/trunk/native/LICENSE.bin.win Fri Nov 30 11:46:52 2018
@@ -199,3 +199,130 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+
+For OpenSSL:
+
+  LICENSE ISSUES
+  ==
+
+  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts.
+
+  OpenSSL License
+  ---
+
+/* 
+ * Copyright (c) 1998-2018 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *software must display the following acknowledgment:
+ *"This product includes software developed by the OpenSSL Project
+ *for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *endorse or promote products derived from this software without
+ *prior written permission. For written permission, please contact
+ *openssl-c...@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *nor may "OpenSSL" appear in their names without prior written
+ *permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *acknowledgment:
+ *"This product includes software developed by the OpenSSL Project
+ *for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (e...@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (t...@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ ---
+
+/* Copyright (C) 1995-1998 Eric Young (e...@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (e...@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (t...@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * 

svn commit: r1847805 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JniLifecycleListener.java

[kkolinko]

Author: kkolinko
Date: Fri Nov 30 11:45:21 2018
New Revision: 1847805

URL: http://svn.apache.org/viewvc?rev=1847805=rev
Log:
Set svn:eol-style=native

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JniLifecycleListener.java   
(props changed)

Propchange: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JniLifecycleListener.java
--
svn:eol-style = native



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

svn commit: r1847804 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/core/JniLifecycleListener.java res/ide-support/idea/tomcat.iml test/org/apache/tomcat/util/net/ca-cert.pem

[kkolinko]

Author: kkolinko
Date: Fri Nov 30 11:43:22 2018
New Revision: 1847804

URL: http://svn.apache.org/viewvc?rev=1847804=rev
Log:
Set svn:eol-style=native

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JniLifecycleListener.java   
(props changed)
tomcat/tc8.5.x/trunk/res/ide-support/idea/tomcat.iml   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca-cert.pem   (props 
changed)

Propchange: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JniLifecycleListener.java
--
svn:eol-style = native

Propchange: tomcat/tc8.5.x/trunk/res/ide-support/idea/tomcat.iml
--
svn:eol-style = native

Propchange: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/ca-cert.pem
--
svn:eol-style = native



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

svn commit: r1847803 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/jmx/ java/org/apache/catalina/valves/ java/org/apache/tomcat/dbcp/dbcp2/ ja

[kkolinko]

Author: kkolinko
Date: Fri Nov 30 11:39:59 2018
New Revision: 1847803

URL: http://svn.apache.org/viewvc?rev=1847803=rev
Log:
Set svn:eol-style=native

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
   (props changed)

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptorMBean.java
   (props changed)

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
   (props changed)
tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_fr.properties 
  (props changed)
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ru.properties   
(props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_fr.properties   
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ru.properties   
(props changed)

tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_fr.properties  
 (props changed)
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatStandalone.java   
(props changed)

tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
   (props changed)
tomcat/trunk/test/org/apache/tomcat/util/net/ca-cert.pem   (props changed)

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptorMBean.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_fr.properties
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ru.properties
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_fr.properties
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ru.properties
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_fr.properties
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatStandalone.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/tomcat/util/net/ca-cert.pem
--
svn:eol-style = native



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

svn commit: r1847802 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Fri Nov 30 11:33:40 2018
New Revision: 1847802

URL: http://svn.apache.org/viewvc?rev=1847802=rev
Log:
Correct bug reference

Modified:
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1847802=1847801=1847802=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Nov 30 11:33:40 
2018
@@ -37,7 +37,7 @@
 
   
 
-  62862: Fix memory leaks in OCSP handling. (jfclere)
+  62892: Fix memory leaks in OCSP handling. (jfclere)
 
 
   62944: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1



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

svn commit: r1847801 - in /tomcat/trunk/java: javax/servlet/LocalStrings_ko.properties org/apache/catalina/core/JniLifecycleListener.java org/apache/catalina/ha/context/LocalStrings_fr.properties

[kkolinko]

Author: kkolinko
Date: Fri Nov 30 11:33:06 2018
New Revision: 1847801

URL: http://svn.apache.org/viewvc?rev=1847801=rev
Log:
Set svn:eol-style=native

Modified:
tomcat/trunk/java/javax/servlet/LocalStrings_ko.properties   (props changed)
tomcat/trunk/java/org/apache/catalina/core/JniLifecycleListener.java   
(props changed)
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings_fr.properties 
  (props changed)

Propchange: tomcat/trunk/java/javax/servlet/LocalStrings_ko.properties
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/catalina/core/JniLifecycleListener.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings_fr.properties
--
svn:eol-style = native



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

svn commit: r1847800 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java

[markt]

Author: markt
Date: Fri Nov 30 11:30:32 2018
New Revision: 1847800

URL: http://svn.apache.org/viewvc?rev=1847800=rev
Log:
Fix auto-boxing warnings

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1847800=1847799=1847800=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Fri Nov 30 
11:30:32 2018
@@ -596,7 +596,7 @@ public class Catalina {
 
 long t2 = System.nanoTime();
 if(log.isInfoEnabled()) {
-log.info(sm.getString("catalina.init", ((t2 - t1) / 100)));
+log.info(sm.getString("catalina.init", Long.valueOf((t2 - t1) / 
100)));
 }
 }
 
@@ -647,7 +647,7 @@ public class Catalina {
 
 long t2 = System.nanoTime();
 if(log.isInfoEnabled()) {
-log.info(sm.getString("catalina.startup", ((t2 - t1) / 100)));
+log.info(sm.getString("catalina.startup", Long.valueOf((t2 - t1) / 
100)));
 }
 
 // Register shutdown hook



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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1847799 - in /tomcat/trunk: java/org/apache/catalina/storeconfig/StoreLoader.java webapps/docs/changelog.xml

[remm]

Author: remm
Date: Fri Nov 30 10:51:54 2018
New Revision: 1847799

URL: http://svn.apache.org/viewvc?rev=1847799=rev
Log:
Fix javadoc and update changelog

Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1847799=1847798=1847799=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Fri Nov 
30 10:51:54 2018
@@ -135,6 +135,7 @@ public class StoreLoader {
  *
  * @param path Path to the configuration file, may be null to use the 
default
  *  name server-registry.xml
+ * @throws Exception when the configuration file isn't found or a parse 
error occurs
  */
 public void load(String path) throws Exception {
 try (Resource resource = (path == null) ?

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847799=1847798=1847799=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 30 10:51:54 2018
@@ -81,9 +81,11 @@
 source, which will allow processing of core configuration. (remm)
   
   
-Refactor processing of server.xml, web.xml, context.xml and context
-configuration files using the ConfigurationSource API. JASPIC and
-storeconfig remain file based. (remm)
+Refactor processing of server.xml, web.xml, context.xml, other
+configuration files and resources using the ConfigurationSource API.
+JASPIC persistent providers load and store remains file based.
+StoreConfig Tomcat configuration files storing remains file based
+at their previous default locations. (remm)
   
   
 62897: Provide a property



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

svn commit: r1847798 - /tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

[markt]

Author: markt
Date: Fri Nov 30 10:38:32 2018
New Revision: 1847798

URL: http://svn.apache.org/viewvc?rev=1847798=rev
Log:
Remove unused term

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1847798=1847797=1847798=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8] 
Fri Nov 30 10:38:32 2018
@@ -60,7 +60,6 @@ applicationFilterRegistration.nullInitPa
 
 applicationPushBuilder.methodInvalid=The HTTP method for a push request must 
be both cacheable and safe but [{0}] is not
 applicationPushBuilder.methodNotToken=HTTP methods must be tokens but [{0}] 
contains a non-token character
-applicationPushBuilder.noCoyoteRequest=Unable to find the underlying Coyote 
request object (which is required to create a push request) from the request of 
type [{0}]
 
 applicationServletRegistration.setServletSecurity.iae=Null constraint 
specified for servlet [{0}] deployed to context with name [{1}]
 applicationServletRegistration.setServletSecurity.ise=Security constraints 
can''t be added to servlet [{0}] deployed to context with name [{1}] as the 
context has already been initialised



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

svn commit: r1847796 - in /tomcat/trunk/java/org/apache/catalina/storeconfig: LocalStrings.properties StoreConfig.java StoreConfigLifecycleListener.java StoreLoader.java

[remm]

Author: remm
Date: Fri Nov 30 10:33:49 2018
New Revision: 1847796

URL: http://svn.apache.org/viewvc?rev=1847796=rev
Log:
Started with a few i18n, but in the end fully refactored the storeconfig 
registry loading.

Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java

tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties?rev=1847796=1847795=1847796=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties 
[UTF-8] Fri Nov 30 10:33:49 2018
@@ -13,10 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+config.emptyObjectName=Invalid null or empty object name
+config.missingContextFile=Missing configuration file of context [{0}] to store
+config.objectNameNotFound=Object name [{0}] not found
 config.storeContextError=Error storing context [{0}]
 config.storeServerError=Error storing server
 
 factory.storeNoDescriptor=Descriptor for element class [{0}] not configured!
 factory.storeTag=store tag [{0}] ( Object: [{1}] )
 
+storeConfigListener.loadError=Error loading StoreConfig
 storeConfigListener.notServer=The listener was added to component other than 
the Server and will therefore be ignored
+storeConfigListener.registerError=Error registering StoreConfig MBean

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java?rev=1847796=1847795=1847796=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java Fri Nov 
30 10:33:49 2018
@@ -29,6 +29,7 @@ import org.apache.catalina.Server;
 import org.apache.catalina.Service;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.mbeans.MBeanUtils;
+import org.apache.catalina.startup.Bootstrap;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
@@ -119,8 +120,7 @@ public class StoreConfig implements ISto
 public synchronized void storeServer(String aServerName, boolean backup,
 boolean externalAllowed) throws MalformedObjectNameException {
 if (aServerName == null || aServerName.length() == 0) {
-if (log.isErrorEnabled())
-log.error("Please, call with a correct server ObjectName!");
+log.error(sm.getString("config.emptyObjectName"));
 return;
 }
 MBeanServer mserver = MBeanUtils.createServer();
@@ -149,12 +149,11 @@ public class StoreConfig implements ISto
 store(aServer);
 }
 } catch (Exception e) {
-if (log.isInfoEnabled())
-log.info("Object " + aServerName
-+ " is no a Server instance or store exception", 
e);
+log.error(sm.getString("config.storeServerError"), e);
 }
-} else if (log.isInfoEnabled())
-log.info("Server " + aServerName + " not found!");
+} else {
+log.info(sm.getString("config.objectNameNotFound", aServerName));
+}
 }
 
 /**
@@ -171,8 +170,7 @@ public class StoreConfig implements ISto
 public synchronized void storeContext(String aContextName, boolean backup,
 boolean externalAllowed) throws MalformedObjectNameException {
 if (aContextName == null || aContextName.length() == 0) {
-if (log.isErrorEnabled())
-log.error("Please, call with a correct context ObjectName!");
+log.error(sm.getString("config.emptyObjectName"));
 return;
 }
 MBeanServer mserver = MBeanUtils.createServer();
@@ -183,44 +181,35 @@ public class StoreConfig implements ISto
 "managedResource");
 URL configFile = aContext.getConfigFile();
 if (configFile != null) {
-try {
-StoreDescription desc = null;
-desc = getRegistry().findDescription(
-aContext.getClass());
-if (desc != null) {
-boolean oldSeparate = desc.isStoreSeparate();
- 

svn commit: r1847795 - /tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java

[remm]

Author: remm
Date: Fri Nov 30 10:17:54 2018
New Revision: 1847795

URL: http://svn.apache.org/viewvc?rev=1847795=rev
Log:
Code cleanup, no change.

Modified:

tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java?rev=1847795=1847794=1847795=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
 Fri Nov 30 10:17:54 2018
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -55,12 +56,13 @@ public class CatalinaBaseConfigurationSo
 ioe = e;
 }
 if (result == null) {
-InputStream inputStream = 
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
-if (inputStream != null) {
+// Compatibility with legacy server-embed.xml location
+InputStream stream = 
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+if (stream != null) {
 try {
-result = new Resource(inputStream, 
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+result = new Resource(stream, 
getClass().getClassLoader().getResource("server-embed.xml").toURI());
 } catch (URISyntaxException e) {
-// Ignore
+stream.close();
 }
 }
 }
@@ -87,12 +89,13 @@ public class CatalinaBaseConfigurationSo
 
 // Try classloader
 InputStream stream = 
getClass().getClassLoader().getResourceAsStream(name);
-try {
-if (stream != null) {
+if (stream != null) {
+try {
 return new Resource(stream, 
getClass().getClassLoader().getResource(name).toURI());
+} catch (URISyntaxException e) {
+stream.close();
+throw new 
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name), 
e);
 }
-} catch (URISyntaxException e) {
-throw new 
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name), 
e);
 }
 
 // Then try URI.
@@ -102,7 +105,7 @@ public class CatalinaBaseConfigurationSo
 try {
 URL url = uri.toURL();
 return new Resource(url.openConnection().getInputStream(), uri);
-} catch (IllegalArgumentException e) {
+} catch (MalformedURLException e) {
 throw new 
IOException(sm.getString("catalinaConfigurationSource.cannotObtainURL", name), 
e);
 }
 }



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

Re: Tagging Tomcat Native 1.2.19

[Mark Thomas]

On 29/11/2018 23:39, Christopher Schultz wrote:
> Mark,
> 
> On 11/29/18 16:29, Mark Thomas wrote:
>> I think the issues are resolved now so I plan to review the
>> current state of the code and then tag either later today or early
>> tomorrow.
> 
> +1

I've just realised that we aren't including the correct license info in
the Tomcat Native binary distribution for Windows. The OpenSSL info is
missing.

It should just be a case of creating a appropriate LICENSE and NOTICE
file and including them in the build so it shouldn't take too long to fix.

Mark

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