[Bug 62920] New: Maven Plugin For Tomcat 9.0.x

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62920

Bug ID: 62920
   Summary: Maven Plugin For Tomcat 9.0.x
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: All
OS: All
Status: NEW
  Severity: blocker
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: ankurpat...@live.in
  Target Milestone: -

Currently I can can only see maven plugin for Apcahe Tomcat
8.0.x on Maven at url:
https://mvnrepository.com/artifact/org.apache.tomcat.maven/tomcat8-maven-plugin
And on Github at url:
https://github.com/apache/tomcat-maven-plugin/tree/trunk/tomcat8-maven-plugin
But I can't find plugin for Tomcat 9.0.x neither on mavne or github.
We should have a plugin for Tomcat 9.0.x. And This should be in sync with
Tomcat release. For each new Tomcat release we should have supporting maven
plugin. This creates problems for developers and blocks them in developing
application on top of Tomcat. This should be like jetty, for each new version
of tomcat we relesae a corresponding maven plugin.

-- 
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 62919] New: Maven Plugin For Tomcat 8.5.x

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62919

Bug ID: 62919
   Summary: Maven Plugin For Tomcat 8.5.x
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: blocker
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: ankurpat...@live.in
  Target Milestone: 

Currently I can can only see maven plugin for Apcahe Tomcat
8.0.x on Maven at url:
https://mvnrepository.com/artifact/org.apache.tomcat.maven/tomcat8-maven-plugin
And on Github at url:
https://github.com/apache/tomcat-maven-plugin/tree/trunk/tomcat8-maven-plugin
But I can't find plugin for Tomcat 8.5.x neither on mavne or github.
We should have a plugin for Tomcat 8.5.x. And This should be in sync with
Tomcat release. For each new Tomcat release we should have supporting maven
plugin.

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



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

2018-11-16 Thread Bill Barker
To whom it may engage...

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

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


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

That said, some information snippets are provided here.

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



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

buildbot success in on tomcat-trunk

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

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] 1846750
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: r1846757 - /tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 19:58:16 2018
New Revision: 1846757

URL: http://svn.apache.org/viewvc?rev=1846757=rev
Log:
Correct version info returned by the ServletContext implementation used by JspC

Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1846757=1846756=1846757=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Fri Nov 
16 19:58:16 2018
@@ -257,7 +257,7 @@ public class JspCServletContext implemen
  */
 @Override
 public int getMajorVersion() {
-return 3;
+return 4;
 }
 
 
@@ -277,7 +277,7 @@ public class JspCServletContext implemen
  */
 @Override
 public int getMinorVersion() {
-return 1;
+return 0;
 }
 
 
@@ -406,7 +406,7 @@ public class JspCServletContext implemen
  */
 @Override
 public String getServerInfo() {
-return "JspC/ApacheTomcat8";
+return "JspC/ApacheTomcat9";
 }
 
 



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



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

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 19:47:06 2018
New Revision: 1846754

URL: http://svn.apache.org/viewvc?rev=1846754=rev
Log:
Avoid SSLHostConfig JMX registrations before server init

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 16 19:47:06 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: r1846753 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 19:46:03 2018
New Revision: 1846753

URL: http://svn.apache.org/viewvc?rev=1846753=rev
Log:
Avoid SSLHostConfig JMX registrations before server init

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1846753=1846752=1846753=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Nov 
16 19:46:03 2018
@@ -1116,6 +1116,10 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846753=1846752=1846753=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 19:46:03 2018
@@ -120,6 +120,9 @@
 Servlet non-blocking I/O is used to read a request body over an HTTP/2
 stream. (markt)
   
+  
+Avoid bad SSLHostConfig JMX registrations before init. (remm)
+  
 
   
   



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



[Bug 62918] Tomcat Manager Server Status Errors After updating from 8.5.34 to 8.5.35. javax.management.AttributeNotFoundException: Cannot find attribute maxThreads for org.apache.tomcat.util.net.Sock

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62918

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #2 from Remy Maucherat  ---
The fix will be in 9.0.14 and 8.5.36.

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

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 19:30:52 2018
New Revision: 1846751

URL: http://svn.apache.org/viewvc?rev=1846751=rev
Log:
62918: Filter out subtype mbeans to avoid breaking the connector status page

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 16 19:30:52 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: r1846750 - in /tomcat/trunk: java/org/apache/catalina/manager/StatusManagerServlet.java webapps/docs/changelog.xml

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 19:28:17 2018
New Revision: 1846750

URL: http://svn.apache.org/viewvc?rev=1846750=rev
Log:
62918: Filter out subtype mbeans to avoid breaking the connector status page

Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1846750=1846749=1846750=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Fri 
Nov 16 19:28:17 2018
@@ -119,10 +119,15 @@ public class StatusManagerServlet
 onStr = "*:type=ThreadPool,*";
 objectName = new ObjectName(onStr);
 set = mBeanServer.queryMBeans(objectName, null);
+onStr = "*:type=ThreadPool,*,subType=SocketProperties";
+objectName = new ObjectName(onStr);
+Set set2 = mBeanServer.queryMBeans(objectName, 
null);
 iterator = set.iterator();
 while (iterator.hasNext()) {
 ObjectInstance oi = iterator.next();
-threadPools.addElement(oi.getObjectName());
+if (!set2.contains(oi)) {
+threadPools.addElement(oi.getObjectName());
+}
 }
 
 // Query Global Request Processors

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846750=1846749=1846750=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 19:28:17 2018
@@ -136,6 +136,10 @@
 server to use when uploading a web application for deployment with the
 Manager web application. Patch provided by Anton Lindström. (markt)
   
+  
+62918: Filter out subtype mbeans to avoid breaking the
+connector status page. (remm)
+  
 
   
   



-
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

2018-11-16 Thread 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/3751

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] 1846745
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



svn commit: r1846745 - /tomcat/trunk/TOMCAT-NEXT.txt

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 18:42:26 2018
New Revision: 1846745

URL: http://svn.apache.org/viewvc?rev=1846745=rev
Log:
Another TODO for 10.x

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1846745=1846744=1846745=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Fri Nov 16 18:42:26 2018
@@ -43,3 +43,7 @@ New items for 10.0.x onwards:
 4.  Clean-up content-type header processing. Remove the optional space after 
the
 ';' character (if any). Don't mutate the header if there is no charset
 parameter. See BZ 62912 for some discussion and additional references.
+
+5.  Consider applying the delayed log file opening (until there is something to
+log). See BZ 53620.
+



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



[Bug 53620] [juli] delay opening a file until something gets logged

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=53620

--- Comment #2 from Mark Thomas  ---
Created attachment 36265
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36265=edit
Delayed file opening changes

-- 
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 53620] [juli] delay opening a file until something gets logged

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=53620

--- Comment #1 from Mark Thomas  ---
Apologies for the delay in getting to this.

Making open() public is likely to break any custom sub-classes. It seems likely
that such classes might exist so I intend to skip that part of the patch.

I've applied the constructor changes to 9.0.x for 9.0.14 onwards.

The changes to delay opening the file break sub-classes so those need to wait
until 10.x. I'll attach a patch with these specific changes.

-- 
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: r1846735 - in /tomcat/trunk: java/org/apache/juli/AsyncFileHandler.java java/org/apache/juli/FileHandler.java test/org/apache/juli/TestFileHandler.java

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 18:09:52 2018
New Revision: 1846735

URL: http://svn.apache.org/viewvc?rev=1846735=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=53620
Add a constructor for all configurable properties

Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/test/org/apache/juli/TestFileHandler.java

Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1846735=1846734=1846735=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Fri Nov 16 18:09:52 
2018
@@ -71,14 +71,14 @@ public class AsyncFileHandler extends Fi
 protected volatile boolean closed = false;
 
 public AsyncFileHandler() {
-this(null, null, null, DEFAULT_MAX_DAYS);
+this(null, null, null);
 }
 
 public AsyncFileHandler(String directory, String prefix, String suffix) {
-this(directory, prefix, suffix, DEFAULT_MAX_DAYS);
+this(directory, prefix, suffix, null);
 }
 
-public AsyncFileHandler(String directory, String prefix, String suffix, 
int maxDays) {
+public AsyncFileHandler(String directory, String prefix, String suffix, 
Integer maxDays) {
 super(directory, prefix, suffix, maxDays);
 open();
 }

Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1846735=1846734=1846735=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Fri Nov 16 18:09:52 2018
@@ -95,7 +95,10 @@ import java.util.regex.Pattern;
  * 
  */
 public class FileHandler extends Handler {
+
 public static final int DEFAULT_MAX_DAYS = -1;
+public static final int DEFAULT_BUFFER_SIZE = -1;
+
 
 private static final ExecutorService DELETE_FILES_SERVICE =
 Executors.newSingleThreadExecutor(new ThreadFactory() {
@@ -151,19 +154,28 @@ public class FileHandler extends Handler
 
 
 public FileHandler() {
-this(null, null, null, DEFAULT_MAX_DAYS);
+this(null, null, null);
 }
 
 
 public FileHandler(String directory, String prefix, String suffix) {
-this(directory, prefix, suffix, DEFAULT_MAX_DAYS);
+this(directory, prefix, suffix, null);
+}
+
+
+public FileHandler(String directory, String prefix, String suffix, Integer 
maxDays) {
+this(directory, prefix, suffix, maxDays, null, null);
 }
 
-public FileHandler(String directory, String prefix, String suffix, int 
maxDays) {
+
+public FileHandler(String directory, String prefix, String suffix, Integer 
maxDays,
+Boolean rotatable, Integer bufferSize) {
 this.directory = directory;
 this.prefix = prefix;
 this.suffix = suffix;
 this.maxDays = maxDays;
+this.rotatable = rotatable;
+this.bufferSize = bufferSize;
 configure();
 openWriter();
 clean();
@@ -183,31 +195,31 @@ public class FileHandler extends Handler
 /**
  * The directory in which log files are created.
  */
-private String directory = null;
+private String directory;
 
 
 /**
  * The prefix that is added to log file filenames.
  */
-private String prefix = null;
+private String prefix;
 
 
 /**
  * The suffix that is added to log file filenames.
  */
-private String suffix = null;
+private String suffix;
 
 
 /**
  * Determines whether the log file is rotatable
  */
-private boolean rotatable = true;
+private Boolean rotatable;
 
 
 /**
  * Maximum number of days to keep the log files
  */
-private int maxDays = DEFAULT_MAX_DAYS;
+private Integer maxDays;
 
 
 /**
@@ -225,7 +237,7 @@ public class FileHandler extends Handler
 /**
  * Log buffer size.
  */
-private int bufferSize = -1;
+private Integer bufferSize;
 
 
 /**
@@ -257,7 +269,7 @@ public class FileHandler extends Handler
 writerLock.readLock().lock();
 try {
 // If the date has changed, switch log files
-if (rotatable && !date.equals(tsDate)) {
+if (rotatable.booleanValue() && !date.equals(tsDate)) {
 // Upgrade to writeLock before we switch
 writerLock.readLock().unlock();
 writerLock.writeLock().lock();
@@ -288,7 +300,7 @@ public class FileHandler extends Handler
 try {
 if (writer != null) {
 writer.write(result);
-if (bufferSize < 0) {

[Bug 62912] Tomcat adds a space character in the Content-Type header if this one has a ; character right after

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62912

--- Comment #10 from Christopher Schultz  ---
Note that this is being discussed on the dev list a bit. See r1846691.

-- 
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 62910] tomcat-jdbc global pool transaction problem

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62910

--- Comment #4 from Christopher Schultz  ---
... and how do you obtain connections and then use them?

The DataSourceFactory.getConnection method does not need to be synchronized.
Read further and you'll find that it is indeed threadsafe.

When you say "on jboss not get the problem", do you mean that when you use
JBoss and tomcat-pool you don't see this problem? Or are you using JBoss's
contained-managed DataSource.

Is there a particular reason you feel like you must choose between tomcat-pool
and c3p0? What about Tomcat's default pool... the one based upon dbcp2?

-- 
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 62918] Tomcat Manager Server Status Errors After updating from 8.5.34 to 8.5.35. javax.management.AttributeNotFoundException: Cannot find attribute maxThreads for org.apache.tomcat.util.net.Sock

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62918

--- Comment #1 from Remy Maucherat  ---
Ok, so there's now a subtype subType=SocketProperties to ThreadPool (not sure
why), and it needs to be removed from the list.

-- 
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 62918] Tomcat Manager Server Status Errors After updating from 8.5.34 to 8.5.35. javax.management.AttributeNotFoundException: Cannot find attribute maxThreads for org.apache.tomcat.util.net.Sock

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62918

Habib Zurrububabel  changed:

   What|Removed |Added

 CC||habib.zurrububa...@gmail.co
   ||m

-- 
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 62918] New: Tomcat Manager Server Status Errors After updating from 8.5.34 to 8.5.35. javax.management.AttributeNotFoundException: Cannot find attribute maxThreads for org.apache.tomcat.util.net

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62918

Bug ID: 62918
   Summary: Tomcat Manager Server Status Errors After updating
from 8.5.34 to 8.5.35.
javax.management.AttributeNotFoundException:  Cannot
find attribute maxThreads for
org.apache.tomcat.util.net.SocketProperties@207af361
   Product: Tomcat 8
   Version: 8.5.35
  Hardware: Other
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: habib.zurrububa...@gmail.com
  Target Milestone: 

-- 
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: r1846717 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/storeconfig/server-registry.xml java/org/apache/coyote/http11/AbstractHttp11Protocol.java java/org/apache/tomcat/util/net/S

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 14:46:06 2018
New Revision: 1846717

URL: http://svn.apache.org/viewvc?rev=1846717=rev
Log:
Add more special SSL attributes for storeconfig.

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

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

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 16 14:46:06 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
 

[Bug 62803] Tomcat Host Manager incorrectly saves connector with SSL configuration

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62803

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #4 from Remy Maucherat  ---
The issue is not what is described, all XML elements are properly closed.

However, the SSL attributes that are used by storeconfig are duplicated in
multiple locations and this is difficult to maintain. This is fixed for now,
but if more issues remain or reappear in that area, they will ultimately be
resolved in Tomcat 10.

-- 
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: r1846716 - in /tomcat/trunk: java/org/apache/catalina/storeconfig/server-registry.xml java/org/apache/coyote/http11/AbstractHttp11Protocol.java java/org/apache/tomcat/util/net/SSLHostConfi

2018-11-16 Thread remm
Author: remm
Date: Fri Nov 16 14:36:16 2018
New Revision: 1846716

URL: http://svn.apache.org/viewvc?rev=1846716=rev
Log:
Add more special SSL attributes for storeconfig.

Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1846716=1846715=1846716=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Fri 
Nov 16 14:36:16 2018
@@ -102,7 +102,7 @@
 URIEncoding
 maxProcessor
 minProcessor
-
+
 SSLProtocol
 sslEnabledProtocols
 SSLCipherSuite
@@ -138,6 +138,13 @@
 truststorePass
 truststoreProvider
 truststoreType
+
+clientAuth
+SSLVerifyClient
+trustMaxCertLength
+SSLVerifyDepth
+useServerCipherSuitesOrder
+SSLHonorCipherOrder
  
  http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1846716=1846715=1846716=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri 
Nov 16 14:36:16 2018
@@ -647,7 +647,7 @@ public abstract class AbstractHttp11Prot
 
 public String getClientAuth() {
 registerDefaultSSLHostConfig();
-return defaultSSLHostConfig.getCertificateVerification().toString();
+return defaultSSLHostConfig.getCertificateVerificationAsString();
 }
 public void setClientAuth(String certificateVerification) {
 registerDefaultSSLHostConfig();
@@ -657,7 +657,7 @@ public abstract class AbstractHttp11Prot
 
 public String getSSLVerifyClient() {
 registerDefaultSSLHostConfig();
-return defaultSSLHostConfig.getCertificateVerification().toString();
+return defaultSSLHostConfig.getCertificateVerificationAsString();
 }
 public void setSSLVerifyClient(String certificateVerification) {
 registerDefaultSSLHostConfig();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1846716=1846715=1846716=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Fri Nov 16 
14:36:16 2018
@@ -338,6 +338,16 @@ public class SSLHostConfig implements Se
 }
 
 
+public void setCertificateVerificationAsString(String 
certificateVerification) {
+setCertificateVerification(certificateVerification);
+}
+
+
+public String getCertificateVerificationAsString() {
+return certificateVerification.toString();
+}
+
+
 public void setCertificateVerificationDepth(int 
certificateVerificationDepth) {
 this.certificateVerificationDepth = certificateVerificationDepth;
 certificateVerificationDepthConfigured = true;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846716=1846715=1846716=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 14:36:16 2018
@@ -96,6 +96,9 @@
 depends on the use of an API that has been deprecated in later versions
 of Java. (markt)
   
+  
+Fix more storeconfig issues with duplicated SSL attributes. (remm)
+  
 
   
   



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



svn commit: r1846713 [1/2] - in /tomcat/trunk: java/javax/el/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 12:58:25 2018
New Revision: 1846713

URL: http://svn.apache.org/viewvc?rev=1846713=rev
Log:
Import Korean translations from POEditor

Added:
tomcat/trunk/java/javax/el/LocalStrings_ko.properties   (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_ko.properties  
 (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ko.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings_ko.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ko.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_ko.properties 
  (with props)
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ko.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_ko.properties  
 (with props)

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_ko.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_ko.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_ko.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_ko.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_ko.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties   (with 
props)
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties   (with 
props)
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/naming/LocalStrings_ko.properties   (with 
props)
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_ko.properties   (with 
props)
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties  
 (with props)

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_ko.properties
   (with props)
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_ko.properties 
  (with props)
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ko.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties   
(with props)


svn commit: r1846713 [2/2] - in /tomcat/trunk: java/javax/el/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache

2018-11-16 Thread markt
Added: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties?rev=1846713=auto
==
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties 
(added)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties Fri 
Nov 16 12:58:25 2018
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+http11processor.request.prepare=Request를 준비하는 과정 중 오류 
발생
+http11processor.request.process=Request를 처리하는 동안 오류가 
발생하였습니다.
+http11processor.socket.info=소켓에 대한 정보를 구하는 과정에서 
익셉션이 발생하였습니다.
+
+iib.invalidmethod=메소드 이름에 유효하지 않은 문자가 
발견되었습니다. HTTP 메소드 이름은 유효한 토큰이어야 
합니다.
+
+iob.illegalreset=Response가 이미 Commit되었기 때문에 Reset이 
허용되지 않습니다.

Propchange: 
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ko.properties
--
svn:eol-style = native

Added: 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties?rev=1846713=auto
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties 
Fri Nov 16 12:58:25 2018
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+chunkedInputFilter.eosTrailer=Trailer 헤더들을 읽는 과정에서 
예기치 않은 스트림의 종료입니다.
+chunkedInputFilter.invalidCrlfNoCR=유효하지 않은 라인입니다. (즉 
CR 바이트가 LF 바이트 전에 존재하지 않습니다.)

Propchange: 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_ko.properties
--
svn:eol-style = native

Added: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties?rev=1846713=auto
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_ko.properties 
Fri Nov 16 12:58:25 2018
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

svn commit: r1846712 [2/2] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-11-16 Thread markt
Added: tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties?rev=1846712=auto
==
--- tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties 
Fri Nov 16 12:52:39 2018
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+memoryUserDatabase.nullRole=指定的角色名为Null或着长度为0。角色将被忽略,
+memoryUserDatabase.readOnly=用户数据库已被设为只读。修改无
法保存
+memoryUserDatabase.reloadError=从更新后的源 [{1}] 重新加载内
存用户数据库 [{0}] 时出错
+memoryUserDatabase.renameOld=原文件无法改名为[{0}]

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

Added: tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties?rev=1846712=auto
==
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
Fri Nov 16 12:52:39 2018
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+customObjectInputStream.nomatch=类不能匹配合适的表达式,因
为类被允许反序列化\n
+
+extensionValidator.web-application-manifest=web 应用程序清单
+
+introspection.classLoadFailed=加载 class [{0}] 失败

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

Added: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties?rev=1846712=auto
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties 
Fri Nov 16 12:52:39 2018
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+accessLogValve.closeFail=关闭访问日志文件失败
+accessLogValve.invalidLocale=无法将区域设置设为 [{0}]

svn commit: r1846712 [1/2] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 12:52:39 2018
New Revision: 1846712

URL: http://svn.apache.org/viewvc?rev=1846712=rev
Log:
Import Simplified Chinese translations from POEditor

Added:
tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties   (with props)
tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties   (with props)
tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties   (with 
props)

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
  (with props)

tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties 
  (with props)

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/security/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties 
  (with props)
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
  (with props)

tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings_zh_CN.properties  
 (with props)

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_zh_CN.properties 
  (with props)
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties  
 (with props)

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
   (with props)
tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties   (with 
props)
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
   (with props)

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_zh_CN.properties
   (with props)
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
  (with props)
tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties   (with 
props)
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_zh_CN.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties  
 (with props)

tomcat/trunk/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties   
(with props)


svn commit: r1846711 - in /tomcat/trunk/java/org/apache: catalina/ha/session/LocalStrings_fr.properties catalina/valves/LocalStrings_fr.properties coyote/http11/upgrade/LocalStrings_fr.properties jasp

2018-11-16 Thread markt
Author: markt
Date: Fri Nov 16 12:46:19 2018
New Revision: 1846711

URL: http://svn.apache.org/viewvc?rev=1846711=rev
Log:
Import updated French translations from POEditor

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties?rev=1846711=1846710=1846711=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties 
Fri Nov 16 12:46:19 2018
@@ -16,6 +16,7 @@
 backupManager.noCluster=pas de groupe (cluster) associé à ce contexte: [{0}]
 
 deltaManager.foundMasterMember=Le membre maître [{1}] a été trouvé pour la 
réplication du contexte [{0}]
+deltaManager.noContextManager=Gestionnaire de session [{0}]: Pas de contexte 
pour le gestionnaire, envoyé à [{1}]. reçu en [{2}] ms
 deltaManager.noSessionState=Manager [{0}]: pas de statut de session envoyé à 
[{1}] recu, expirant après [{2}] ms.
 deltaManager.receiveMessage.delta.unknown=Gestionnaire ("Manager") [{0}] : 
reçu un delta pour une session inconnue [{1}]
 deltaManager.unloading.ioe=IOException lors de la sauvegarde des sessions 
persistantes: [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties?rev=1846711=1846710=1846711=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties 
[UTF-8] Fri Nov 16 12:46:19 2018
@@ -44,6 +44,7 @@ http.407.desc=Le client doit d'abord s'a
 http.407.reason=Authentification Proxy est requise
 http.408.desc=Le client n'a pas produit de requête pendant le temps d'attente 
du serveur.
 http.409.desc=La requête ne peut être finalisée suite à un conflit lié à 
l'état de la ressource.
+http.409.reason=Conflit
 http.410.desc=La ressource demandée n'est pas disponible, et aucune adresse de 
rebond (forwarding) n'est connue.
 http.411.desc=La requête ne peut être traitée sans définition d'une taille de 
contenu (content length).
 http.412.desc=Une condition préalable demandée n'est pas satisfaite pour cette 
requête.

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties?rev=1846711=1846710=1846711=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties 
Fri Nov 16 12:46:19 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 upgrade.sis.read.closed=Le flux d'entrée (InputStream) a été fermé
+upgrade.sis.readListener.set=Il est interdit d'appeler setReadListener() plus 
d'une fois pour une même connection upgradée
 upgrade.sos.writeListener.null=Il est illégal de passer un argument null à 
setWriteListener()
 
 upgradeProcessor.unexpectedState=Fermeture inattendue de la connection 
upgradée alors que le statut du socket en lecture est [{0}]

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1846711=1846710=1846711=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] Fri Nov 16 12:46:19 2018
@@ -70,6 +70,7 @@ jsp.error.jspbody.emptybody.only=Le tag
 jsp.error.jspbody.required=Doit utiliser jsp:body pour indiqué le corps de tag 
body de [{0}] si jsp:attribute est utilisé.
 jsp.error.jspc.uriroot_not_dir=L'option -uriroot doit indiqué un répertoire 
déjà existant
 jsp.error.jspelement.missing.name=L'attribut obligatoire 'name' est absent de 
jsp:element
+jsp.error.jspoutput.conflict=jsp:output: il est illégal d''avoir 
plusieurs occurrences de [{0}] avec des valeurs différentes (ancienne: [{0}], 
nouvelle [{1}])
 jsp.error.jspoutput.doctypenamesystem=jsp:output: les attributs 
"doctype-root-element" et 

[Bug 62803] Tomcat Host Manager incorrectly saves connector with SSL configuration

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62803

--- Comment #3 from Marek Czernek  ---
Note that the following connector now works:



It gets correctly saved as:



  

  


-- 
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 62803] Tomcat Host Manager incorrectly saves connector with SSL configuration

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62803

Marek Czernek  changed:

   What|Removed |Added

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

--- Comment #2 from Marek Czernek  ---
This has cropped up again, tomcat 9.0.13. Same reproducer, but:

TLS connector config:



Outputs:

   
  

  


Tomcat does not start. Notice there's a missing closing sign in the Connector
tag, i.e.:



(closing character added at the end). When I fix that manually, Tomcat starts.

-- 
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 62912] Tomcat adds a space character in the Content-Type header if this one has a ; character right after

2018-11-16 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62912

--- Comment #9 from Franos  ---
Hello,

> Okay, so we have some clients that vitally depend upon the space being added 
> and other clients that vitally depend upon the space *not* being added. Why 
> should your clients win over the others?

I think that in most cases the provider of a server side solution validates
their developments with a fixed list of clients (eg list of User-Agent s). In
such case we can control the response (HTTP header included) to be sent to
those clients depending of the value read from the request in the User-Agent
HTTP header.
So why Tomcat is changing a value we have set at server side and we know it
works with the list of User-Agent s  we want to support ?
More, in the tests I have performed, if the content sent to the client is
character based, Tomcat appends automatically ";charset=ISO-8859-1", for
example, with no space. So why sometimes, we have space and sometimes we
haven't ?


> The real question is "why is Tomcat bothering to re-format the content-type 
> header when it does not have to do so?".

Yes, this is indeed the question I have.

> I could see an argument for a "don't mutate content-type headers when no 
> charset is present", but that's not what you asked for.

So consider I ask for that.

Best Regards.

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