[Bug 60963] Optimize class loading for unpackWARs=false case

2017-05-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60963

--- Comment #17 from Thomas Meyer  ---
The upcoming commons-compress 1.14 library will have support for fetching the
offsets of the zip local headers -
https://github.com/apache/commons-compress/pull/22

should we use that library in favour of my custom written zip parser?

opinions?

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

2017-05-12 Thread Bill Barker 
To whom it may engage...

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

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


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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 mins 22 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170513-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170513.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170513-native-src
 .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170513/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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

Re: [VOTE] Release Apache Tomcat 8.0.44

2017-05-12 Thread Violeta Georgieva 
2017-05-10 21:41 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 8.0.44 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.44/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1136/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_44/
>
> The proposed 8.0.44 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.44

Regards,
Violeta

[Bug 61089] New: Http11NioProtocol doesn't work when using port 20443

2017-05-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61089

Bug ID: 61089
   Summary: Http11NioProtocol doesn't work when using port 20443
   Product: Tomcat 8
   Version: 8.5.4
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: hiram.espa...@gmail.com
  Target Milestone: 

When using protocol Http11NioProtocol with port 20443 and a keystore PKCS12,
tomcat looks to be running at the beginning but after some seconds I can see
the processor working too hard, it keeps like that until I shut down tomcat.

If I wait more like that, I can see the next exception stacktrace being
repeated indefinitely in catalina.out:

12-May-2017 11:14:22.153 SEVERE [https-jsse-nio-20443-exec-27]
org.apache.coyote.AbstractProtocol$ConnectionHandler.process Error reading
request, ignored
 java.lang.NullPointerException
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.getSslSupport(NioEndpoint.java:1349)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:775)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1425)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
org.apache.tomcat.util.net.AbstractEndpoint.processSocket(AbstractEndpoint.java:830)
at
org.apache.tomcat.util.net.NioEndpoint$Poller.add(NioEndpoint.java:669)
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.registerReadInterest(NioEndpoint.java:1264)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1433)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

It fixes if I change to port 8443 or if I change to use protocol
Http11Nio2Protocol

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

Re: [VOTE] Release Apache Tomcat 7.0.78

2017-05-12 Thread Violeta Georgieva 
2017-05-10 18:47 GMT+03:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.78 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.78/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1135/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_78/
>
> The proposed 7.0.78 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.78 Stable

Regards,
Violeta

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

2017-05-12 Thread markt 
Author: markt
Date: Fri May 12 09:46:10 2017
New Revision: 1794949

URL: http://svn.apache.org/viewvc?rev=1794949=rev
Log:
Add missing release date

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

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1794949=1794948=1794949=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri May 12 09:46:10 2017
@@ -198,7 +198,7 @@
 
   
 
-
+
   
 
   



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

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

2017-05-12 Thread markt 
Author: markt
Date: Fri May 12 09:30:06 2017
New Revision: 1794948

URL: http://svn.apache.org/viewvc?rev=1794948=rev
Log:
Correct comment

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

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

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

2017-05-12 Thread markt 
Author: markt
Date: Fri May 12 08:55:53 2017
New Revision: 1794943

URL: http://svn.apache.org/viewvc?rev=1794943=rev
Log:
Remove unnecessary code. If protocols="" is used, an exception will be thrown 
before this code is reached.

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

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

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

svn commit: r1794942 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

2017-05-12 Thread markt 
Author: markt
Date: Fri May 12 08:55:18 2017
New Revision: 1794942

URL: http://svn.apache.org/viewvc?rev=1794942=rev
Log:
Remove unnecessary code. If protocols="" is used, an exception will be thrown 
before this code is reached.

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

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1794942=1794941=1794942=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java 
Fri May 12 08:55:18 2017
@@ -115,31 +115,27 @@ public class OpenSSLContext implements o
 try {
 // SSL protocol
 int value = SSL.SSL_PROTOCOL_NONE;
-if (sslHostConfig.getProtocols().size() == 0) {
-value = SSL.SSL_PROTOCOL_ALL;
-} else {
-for (String protocol : sslHostConfig.getEnabledProtocols()) {
-if 
(Constants.SSL_PROTO_SSLv2Hello.equalsIgnoreCase(protocol)) {
-// NO-OP. OpenSSL always supports SSLv2Hello
-} else if 
(Constants.SSL_PROTO_SSLv2.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV2;
-} else if 
(Constants.SSL_PROTO_SSLv3.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_SSLV3;
-} else if 
(Constants.SSL_PROTO_TLSv1.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_TLSV1;
-} else if 
(Constants.SSL_PROTO_TLSv1_1.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_TLSV1_1;
-} else if 
(Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_TLSV1_2;
-} else if 
(Constants.SSL_PROTO_ALL.equalsIgnoreCase(protocol)) {
-value |= SSL.SSL_PROTOCOL_ALL;
-} else {
-// Protocol not recognized, fail to start as it is 
safer than
-// continuing with the default which might enable more 
than the
-// is required
-throw new Exception(netSm.getString(
-"endpoint.apr.invalidSslProtocol", protocol));
-}
+for (String protocol : sslHostConfig.getEnabledProtocols()) {
+if (Constants.SSL_PROTO_SSLv2Hello.equalsIgnoreCase(protocol)) 
{
+// NO-OP. OpenSSL always supports SSLv2Hello
+} else if 
(Constants.SSL_PROTO_SSLv2.equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_SSLV2;
+} else if 
(Constants.SSL_PROTO_SSLv3.equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_SSLV3;
+} else if 
(Constants.SSL_PROTO_TLSv1.equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_TLSV1;
+} else if 
(Constants.SSL_PROTO_TLSv1_1.equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_TLSV1_1;
+} else if 
(Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
+value |= SSL.SSL_PROTOCOL_TLSV1_2;
+} else if (Constants.SSL_PROTO_ALL.equalsIgnoreCase(protocol)) 
{
+value |= SSL.SSL_PROTOCOL_ALL;
+} else {
+// Protocol not recognized, fail to start as it is safer 
than
+// continuing with the default which might enable more 
than the
+// is required
+throw new Exception(netSm.getString(
+"endpoint.apr.invalidSslProtocol", protocol));
 }
 }
 



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

svn commit: r1794941 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

2017-05-12 Thread markt 
Author: markt
Date: Fri May 12 08:53:28 2017
New Revision: 1794941

URL: http://svn.apache.org/viewvc?rev=1794941=rev
Log: (empty)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

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=1794941=1794940=1794941=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Fri May 12 
08:53:28 2017
@@ -51,12 +51,9 @@ public class SSLHostConfig implements Se
 protected static final Set SSL_PROTO_ALL_SET = new HashSet<>();
 
 static {
-/* Default used if protocols is not configured, also
-   used if protocols="All" */
-/* If protocols is configured to be empty, the effective
-   value comes from
-   
org.apache.tomcat.util.net.jsse.JSSESocketFactory.defaultServerProtocols
-   (JSSE) resp. org.apache.tomcat.jni.SSL.SSL_PROTOCOL_ALL (OpenSSL)*/
+/* Default used if protocols is not configured, also used if
+ * protocols="All"
+ */
 SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);
 SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1);
 SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1_1);



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

[Bug 61086] Some clients hang when HTTP responses give status 205 Reset Content

2017-05-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61086

frederic.gil...@synchronoss.com changed:

   What|Removed |Added

 CC||frederic.giltay@synchronoss
   ||.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

[Bug 61088] Documentation upper/lower case mismach for SSLHostConfig doc and SSLHostConfig java source

2017-05-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61088

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID
 OS||All

--- Comment #1 from Mark Thomas  ---
1. That is a comment, not source code.

2. SSLHostConfig processes the configuration in a case insensitive manner.

-- 
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 61088] New: Documentation upper/lower case mismach for SSLHostConfig doc and SSLHostConfig java source

2017-05-12 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=61088

Bug ID: 61088
   Summary: Documentation upper/lower case mismach for
SSLHostConfig doc and SSLHostConfig java source
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: didier.wir...@mesr.etat.lu
  Target Milestone: 

There is an upper/lower case mismatch between SSLHostConfig code and the
documentation of SSLHostConfig:
https://tomcat.apache.org/tomcat-8.5-doc/config/http.html#SSL_Support_-_SSLHostConfig

Doc says quote:
"The token all is an alias for SSLv2Hello,TLSv1,TLSv1.1,TLSv1.2."
and "all" is listed as an option:

The source code uses with "A" uppercase:
static {
/* Default used if protocols is not configured, also
   used if protocols="All" */
/* If protocols is configured to be empty, the effective
   value comes from
  
org.apache.tomcat.util.net.jsse.JSSESocketFactory.defaultServerProtocols
   (JSSE) resp. org.apache.tomcat.jni.SSL.SSL_PROTOCOL_ALL (OpenSSL)*/
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_SSLv2Hello);
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1);
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1_1);
SSL_PROTO_ALL_SET.add(Constants.SSL_PROTO_TLSv1_2);
}

Documentation should use the correct case:
"The token All is an alias for SSLv2Hello,TLSv1,TLSv1.1,TLSv1.2."
And the listing should use "All" everywhere.
Thx!
Didier

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