Re: svn commit: r1844066 - in /tomcat/tc8.5.x/trunk: ./ build.xml java/org/apache/tomcat/jni/Library.java res/ide-support/idea/inspections.xml res/ide-support/idea/misc.xml res/ide-support/idea/module

2018-10-17 Thread Rainer Jung 

Hi Igal,

yes, doing the commit after the merge is necessary.

The svn merge command does not merge the commit log message.

You can edit the (empty) log message even after the commit using

  svn propedit -r 1844066 --revprop svn:log .

assuming you are inside the tc8.5.x/trunk directory (otherwise instead 
of "." use a path or URL pointing at the svn tree which contains that 
revision.


Note that the revision number is the one for which you want to edit the 
message, not the original one you merged, thus I have chosen 1844066.


Editing old log messages can also be useful to fix a typo or add a 
security info (eg. CVE number) after a release was done.


Regards,

Rainer

Am 17.10.2018 um 08:17 schrieb Igal Sapir:

OK, so I ran `svn commit` (I thought before that `svn merge` takes care of
that), and I hope that it turned out fine, though it looks like the log
message was left empty.  #cantwaitforgit

Igal

On Tue, Oct 16, 2018 at 11:12 PM  wrote:


Author: isapir
Date: Wed Oct 17 06:12:38 2018
New Revision: 1844066

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

Added:
 tomcat/tc8.5.x/trunk/res/ide-support/idea/misc.xml
   - copied unchanged from r1842809,
tomcat/trunk/res/ide-support/idea/misc.xml
 tomcat/tc8.5.x/trunk/res/ide-support/idea/modules.xml
   - copied unchanged from r1842809,
tomcat/trunk/res/ide-support/idea/modules.xml
 tomcat/tc8.5.x/trunk/res/ide-support/idea/tomcat.iml
   - copied unchanged from r1842809,
tomcat/trunk/res/ide-support/idea/tomcat.iml
Removed:
 tomcat/tc8.5.x/trunk/res/ide-support/idea/inspections.xml
Modified:
 tomcat/tc8.5.x/trunk/   (props changed)
 tomcat/tc8.5.x/trunk/build.xml
 tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Library.java

Propchange: tomcat/tc8.5.x/trunk/

--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 17 06:12:38 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,

Re: Tomcat Native 1.2.18

2018-10-17 Thread Rainer Jung 

Am 16.10.2018 um 23:01 schrieb Mark Thomas:

Hi,

I've been working on building this with OpenSSL 1.1.1. It wasn't as
simple as I expected as there is quite a lot of clean-up in 1.1.1.

I now have a working build although it required a handful of tweaks to
the OpenSSL source. Some are bugs that have already been fixed in
master. Some look to be, effectively, the result of porting the
openssl-msvcrt.patch

The OpenSSL 1.1.1 based Tomcat Native passes a basic smoke test
(including TLSv1.3 support) and the unit tests pass.

I am now wondering which version of OpenSSL to use to build 1.2.18. I am
leaning towards providing both OpenSSL 1.1.1 and 1.0.2p based builds.

WDYT?


I just learned in the httpd project, that there are subtle changes in 
1.1.1 that can break existing code using OpenSSL. The example that hit 
us there, was SSL_read() now returning 0 instead of a negative error 
code in some situations. The old httpd code only called SSL_get_error() 
to check for SSL_ERROR_WANT_READ etc. when SSL_read() returned a 
negative value. The old code used a return value of 0 as an indicator 
for APR_EOF (connection was closed). That lead eg. to h2 failures when 
build against OpenSSL 1.1.1. The current OpenSSL man page for SSL_read() 
says negative return value and 0 should be handled the same.


I have not yet looked at tcnative wrt. this observation ut I would hope 
running our TC test suite would reveal breakage if it happens. But still 
there is an increased risk for the first release.


I like your approach of providing both and I wonder whether we might 
flag our support for 1.1.1 as experimental, likely dropping that for the 
next release.



I'm also almost certainly going to drop the 1.2.18 tag again (sorry!) so
I can document the build process for 1.1.1 and include the necessary
patches etc. in the src tarball.


Good thing!

Regards,

Rainer


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

Re: Tomcat Native 1.2.18

2018-10-17 Thread Rainer Jung 

Am 17.10.2018 um 09:47 schrieb Rainer Jung:

Am 16.10.2018 um 23:01 schrieb Mark Thomas:

Hi,

I've been working on building this with OpenSSL 1.1.1. It wasn't as
simple as I expected as there is quite a lot of clean-up in 1.1.1.

I now have a working build although it required a handful of tweaks to
the OpenSSL source. Some are bugs that have already been fixed in
master. Some look to be, effectively, the result of porting the
openssl-msvcrt.patch

The OpenSSL 1.1.1 based Tomcat Native passes a basic smoke test
(including TLSv1.3 support) and the unit tests pass.

I am now wondering which version of OpenSSL to use to build 1.2.18. I am
leaning towards providing both OpenSSL 1.1.1 and 1.0.2p based builds.

WDYT?


I just learned in the httpd project, that there are subtle changes in 
1.1.1 that can break existing code using OpenSSL. The example that hit 
us there, was SSL_read() now returning 0 instead of a negative error 
code in some situations. The old httpd code only called SSL_get_error() 
to check for SSL_ERROR_WANT_READ etc. when SSL_read() returned a 
negative value. The old code used a return value of 0 as an indicator 
for APR_EOF (connection was closed). That lead eg. to h2 failures when 
build against OpenSSL 1.1.1. The current OpenSSL man page for SSL_read() 
says negative return value and 0 should be handled the same.


I have not yet looked at tcnative wrt. this observation ut I would hope 
running our TC test suite would reveal breakage if it happens. But still 
there is an increased risk for the first release.


The example was just meant as an example. I checked tcnative and we 
handle 0 and < 0 return from SSL_read() identical. So that problem 
shouldn't happen for us.


I like your approach of providing both and I wonder whether we might 
flag our support for 1.1.1 as experimental, likely dropping that for the 
next release.



I'm also almost certainly going to drop the 1.2.18 tag again (sorry!) so
I can document the build process for 1.1.1 and include the necessary
patches etc. in the src tarball.


Good thing!

Regards,

Rainer


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

svn commit: r1844074 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java webapps/docs/changelog.xml

2018-10-17 Thread kfujino 
Author: kfujino
Date: Wed Oct 17 08:48:37 2018
New Revision: 1844074

URL: http://svn.apache.org/viewvc?rev=1844074&view=rev
Log:
Even if all members have already disappeared and PING can not be sent, ensure 
that members will be expired.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1844074&r1=1844073&r2=1844074&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
 Wed Oct 17 08:48:37 2018
@@ -279,20 +279,21 @@ public class StaticMembershipProvider ex
 protected void ping() throws ChannelException {
 // send ping
 Member[] members = getAliveMembers(staticMembers.toArray(new 
Member[0]));
-if (members.length == 0) return;
-try {
-MemberMessage msg = new MemberMessage(membershipId, 
MemberMessage.MSG_PING, service.getLocalMember(true));
-Response[] resp = rpcChannel.send(members, msg, 
RpcChannel.ALL_REPLY, sendOptions, rpcTimeout);
-for (int i = 0; i < resp.length; i++) {
-messageReceived(resp[i].getMessage(), resp[i].getSource());
+if (members.length > 0) {
+try {
+MemberMessage msg = new MemberMessage(membershipId, 
MemberMessage.MSG_PING, service.getLocalMember(true));
+Response[] resp = rpcChannel.send(members, msg, 
RpcChannel.ALL_REPLY, sendOptions, rpcTimeout);
+for (int i = 0; i < resp.length; i++) {
+messageReceived(resp[i].getMessage(), resp[i].getSource());
+}
+} catch (ChannelException ce) {
+// Handle known failed members
+FaultyMember[] faultyMembers = ce.getFaultyMembers();
+for (FaultyMember faultyMember : faultyMembers) {
+memberDisappeared(faultyMember.getMember());
+}
+throw ce;
 }
-} catch (ChannelException ce) {
-// Handle known failed members
-FaultyMember[] faultyMembers = ce.getFaultyMembers();
-for (FaultyMember faultyMember : faultyMembers) {
-memberDisappeared(faultyMember.getMember());
-}
-throw ce;
 }
 // expire
 checkExpired();

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1844074&r1=1844073&r2=1844074&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 17 08:48:37 2018
@@ -220,6 +220,10 @@
 Move the event notification ThreadPoolExecutor to
 MembershipProviderBase. (kfujino)
   
+  
+Even if all members have already disappeared and PING can not be sent,
+ensure that members will be expired. (kfujino)
+  
 
   
   



-
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-nio (in module tomcat-trunk) failed

2018-10-17 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-nio 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-nio :  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-nio/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-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 26 secs
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-NIO -Dexecute.test.nio2=false 
-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-20181017/bin/openssl
 -Dtest.temp=output/test-tmp-NIO 
 -Dtest.accesslog=true -Dexecute.test.nio=true 
-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.0-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

[Bug 62830] Add static methods to load native libraries by the Common ClassLoader

2018-10-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62830

--- Comment #2 from Mark Thomas  ---
I think it would be worth updating the Javadoc for the new methods to make it
clear that System.load[Library]() associates the loaded library not with the
current thread context class loader but with the class loader of the class that
calls System.load[Library](). Typically, this would be the Common class loader
but that may vary depending on configuration and usage.

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

2018-10-17 Thread Rémy Maucherat 
On Mon, Oct 15, 2018 at 5:26 PM Mark Thomas  wrote:

> > and we shouldn't pollute that with side uses. Is that
> > doable in 9, or should it be added to the "10" todo list ?
>
> No strong view. If it can be done without impacting the external API
> then no objections here.
>

This looks ok compatibility wise. I will add this refactoring after 9.0.13.

Now, looking at things:
- There are two more heavyweight uses of an executor in clustering:
MessageDispatchInterceptor and RecieverBase. This might be moveable too
after review, IMO there's no gain to have multiple small internal pools.
- The async timeout threads of the connectors is an obvious item that could
be moved to that executor (it runs only once per second). I am adding the
necessary get/set APIs on ProtocolHandler and Endpoint.

Looking at other items:
- I could obviously avoid using a dedicated accept thread for NIO2 but it's
more complex. So maybe later.
- tribes.transport.bio ... Why does this still exist ?

Rémy

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 09:39:04 2018
New Revision: 1844075

URL: http://svn.apache.org/viewvc?rev=1844075&view=rev
Log:
Make OpenSSL 1.1.1 requirement for TLSv1.3 clear in the change log

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

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1844075&r1=1844074&r2=1844075&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Oct 17 09:39:04 
2018
@@ -44,7 +44,8 @@
   platform for a number of years. (markt)
 
 
-  62748: Add support for TLS 1.3. (schultz/markt)
+  62748: Add support for TLS 1.3 when built with OpenSSL 1.1.1 
or
+  equivalent. (schultz/markt)
 
 
   Expose the API necessary for CLIENT-CERT authentication to be correctly



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

[Bug 62830] Add static methods to load native libraries by the Common ClassLoader

2018-10-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62830

--- Comment #3 from Remy Maucherat  ---
Yes, if it was using the thread context classloader, like is done nearly 100%
of the time elsewhere, it would be useless. Weird stuff there.

Personally, I think native libraries can use extra care and if you're going to
write a bit of Tomcat code, I would recommend writing a bit more and using a
Catalina listener to load them (like for tomcat-native, basically).

-- 
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: r1844077 - /tomcat/native/trunk/native/srclib/VERSIONS

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 09:52:27 2018
New Revision: 1844077

URL: http://svn.apache.org/viewvc?rev=1844077&view=rev
Log:
Version update

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

Modified: tomcat/native/trunk/native/srclib/VERSIONS
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/VERSIONS?rev=1844077&r1=1844076&r2=1844077&view=diff
==
--- tomcat/native/trunk/native/srclib/VERSIONS (original)
+++ tomcat/native/trunk/native/srclib/VERSIONS Wed Oct 17 09:52:27 2018
@@ -1,4 +1,4 @@
 Use the following version of the libraries
 
-- APR 1.6.3 or later, http://apr.apache.org
-- OpenSSL 1.0.2m or later, http://www.openssl.org
+- APR 1.6.5 or later, http://apr.apache.org
+- OpenSSL 1.0.2p or later, http://www.openssl.org



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

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 10:09:39 2018
New Revision: 1844079

URL: http://svn.apache.org/viewvc?rev=1844079&view=rev
Log:
Latest OpenSSL 1.0.2 needs additional patch to work with our build env

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

Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch?rev=1844079&r1=1844078&r2=1844079&view=diff
==
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch (original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch Wed Oct 17 
10:09:39 2018
@@ -1,3 +1,17 @@
+--- crypto/o_time.c
 crypto/o_time.c
+@@ -109,10 +109,6 @@
+ if (gmtime_r(timer, result) == NULL)
+ return NULL;
+ ts = result;
+-#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
+-if (gmtime_s(result, timer))
+-return NULL;
+-ts = result;
+ #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
+ ts = gmtime(timer);
+ if (ts == NULL)
+
 --- util/pl/VC-32.pl
 +++ util/pl/VC-32.pl
 @@ -45,7 +45,7 @@



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

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 10:56:41 2018
New Revision: 1844086

URL: http://svn.apache.org/viewvc?rev=1844086&view=rev
Log:
Add first pass at OpenSSL-1.1.1 patch

Added:
tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch   
(with props)

Added: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch?rev=1844086&view=auto
==
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch (added)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch Wed 
Oct 17 10:56:41 2018
@@ -0,0 +1,112 @@
+--- Configurations/10-main.conf
 Configurations/10-main.conf
+@@ -1268,7 +1268,7 @@
+ # prefer [non-debug] openssl.exe to be free from Micorosoft RTL
+ # redistributable.
+ bin_cflags   => add(picker(debug   => "/MDd",
+-   release => sub { $disabled{shared} ? 
"/MT" : () },
++   release => "/MD",
+   )),
+ bin_lflags   => add("/subsystem:console /opt:ref"),
+ ex_libs  => add(sub {
+--- crypto/engine/eng_openssl.c
 crypto/engine/eng_openssl.c
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include 
++#include "e_os.h"
+ #include 
+ #include "internal/cryptlib.h"
+ #include "internal/engine.h"
+--- crypto/sm2/sm2_sign.c
 crypto/sm2/sm2_sign.c
+@@ -12,6 +12,7 @@
+ #include "internal/sm2.h"
+ #include "internal/sm2err.h"
+ #include "internal/ec_int.h" /* ec_group_do_inverse_ord() */
++#include "internal/numbers.h"
+ #include 
+ #include 
+ #include 
+--- crypto/o_time.c
 crypto/o_time.c
+@@ -41,10 +41,6 @@
+ if (gmtime_r(timer, result) == NULL)
+ return NULL;
+ ts = result;
+-#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
+-if (gmtime_s(result, timer))
+-return NULL;
+-ts = result;
+ #else
+ ts = gmtime(timer);
+ if (ts == NULL)
+--- engines/e_capi.c
 engines/e_capi.c
+@@ -15,6 +15,7 @@
+ # include 
+ 
+ # include 
++# include "e_os.h"
+ # include 
+ # include 
+ # include 
+--- test/testutil/basic_output.c
 test/testutil/basic_output.c
+@@ -10,6 +10,7 @@
+ #include "../testutil.h"
+ #include "output.h"
+ #include "tu_local.h"
++#include "../../e_os.h"
+ 
+ #include 
+ #include 
+--- test/ct_test.c
 test/ct_test.c
+@@ -500,8 +500,8 @@
+ {
+ int success = 0;
+ CT_POLICY_EVAL_CTX *ct_policy_ctx = CT_POLICY_EVAL_CTX_new();
+-const time_t default_time = CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) /
+-1000;
++const time_t default_time =
++(time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000);
+ const time_t time_tolerance = 600;  /* 10 minutes */
+ 
+ if (!TEST_time_t_le(abs((int)difftime(time(NULL), default_time)),
+--- e_os.h
 e_os.h
+@@ -148,8 +148,6 @@
+ }
+ #   endif
+ #   include 
+-#   if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && 
defined(stdin)
+-#if _MSC_VER>=1300 && _MSC_VER<1600
+ # undef stdin
+ # undef stdout
+ # undef stderr
+@@ -157,23 +155,6 @@
+ # define stdin  (&__iob_func()[0])
+ # define stdout (&__iob_func()[1])
+ # define stderr (&__iob_func()[2])
+-#elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
+-# undef stdin
+-# undef stdout
+-# undef stderr
+- /*
+-  * pre-1300 has __p__iob(), but it's available only in msvcrt.lib,
+-  * or in other words with /MD. Declaring implicit import, i.e. with
+-  * _imp_ prefix, works correctly with all compiler options, but
+-  * without /MD results in LINK warning LNK4049: 'locally defined
+-  * symbol "__iob" imported'.
+-  */
+-extern FILE *_imp___iob;
+-# define stdin  (&_imp___iob[0])
+-# define stdout (&_imp___iob[1])
+-# define stderr (&_imp___iob[2])
+-#endif
+-#   endif
+ #  endif
+ #  include 
+ #  include 

Propchange: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
--
svn:eol-style = native



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

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 10:56:24 2018
New Revision: 1844085

URL: http://svn.apache.org/viewvc?rev=1844085&view=rev
Log:
Fix ws

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

Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch?rev=1844085&r1=1844084&r2=1844085&view=diff
==
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch (original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch Wed Oct 17 
10:56:24 2018
@@ -11,7 +11,6 @@
  #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
  ts = gmtime(timer);
  if (ts == NULL)
-
 --- util/pl/VC-32.pl
 +++ util/pl/VC-32.pl
 @@ -45,7 +45,7 @@



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

Re: svn commit: r1844066 - in /tomcat/tc8.5.x/trunk: ./ build.xml java/org/apache/tomcat/jni/Library.java res/ide-support/idea/inspections.xml res/ide-support/idea/misc.xml res/ide-support/idea/module

2018-10-17 Thread Igal Sapir 
Rainer,

On Wed, Oct 17, 2018 at 12:36 AM Rainer Jung 
wrote:

> Hi Igal,
>
> yes, doing the commit after the merge is necessary.
>
> The svn merge command does not merge the commit log message.
>
> You can edit the (empty) log message even after the commit using
>
>svn propedit -r 1844066 --revprop svn:log .
>
> assuming you are inside the tc8.5.x/trunk directory (otherwise instead
> of "." use a path or URL pointing at the svn tree which contains that
> revision.
>
> Note that the revision number is the one for which you want to edit the
> message, not the original one you merged, thus I have chosen 1844066.
>

Thank you very much for that useful information!

Best,

Igal


>
> Editing old log messages can also be useful to fix a typo or add a
> security info (eg. CVE number) after a release was done.
>
> Regards,
>
> Rainer
>
> Am 17.10.2018 um 08:17 schrieb Igal Sapir:
> > OK, so I ran `svn commit` (I thought before that `svn merge` takes care
> of
> > that), and I hope that it turned out fine, though it looks like the log
> > message was left empty.  #cantwaitforgit
> >
> > Igal
> >
> > On Tue, Oct 16, 2018 at 11:12 PM  wrote:
> >
> >> Author: isapir
> >> Date: Wed Oct 17 06:12:38 2018
> >> New Revision: 1844066
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1844066&view=rev
> >> Log: (empty)
> >>
> >> Added:
> >>  tomcat/tc8.5.x/trunk/res/ide-support/idea/misc.xml
> >>- copied unchanged from r1842809,
> >> tomcat/trunk/res/ide-support/idea/misc.xml
> >>  tomcat/tc8.5.x/trunk/res/ide-support/idea/modules.xml
> >>- copied unchanged from r1842809,
> >> tomcat/trunk/res/ide-support/idea/modules.xml
> >>  tomcat/tc8.5.x/trunk/res/ide-support/idea/tomcat.iml
> >>- copied unchanged from r1842809,
> >> tomcat/trunk/res/ide-support/idea/tomcat.iml
> >> Removed:
> >>  tomcat/tc8.5.x/trunk/res/ide-support/idea/inspections.xml
> >> Modified:
> >>  tomcat/tc8.5.x/trunk/   (props changed)
> >>  tomcat/tc8.5.x/trunk/build.xml
> >>  tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Library.java
> >>
> >> Propchange: tomcat/tc8.5.x/trunk/
> >>
> >>
> --
> >> --- svn:mergeinfo (original)
> >> +++ svn:mergeinfo Wed Oct 17 06:12:38 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,1754

svn commit: r1844126 - /tomcat/native/trunk/native/NMAKEmakefile

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 16:34:55 2018
New Revision: 1844126

URL: http://svn.apache.org/viewvc?rev=1844126&view=rev
Log:
Add option to build with OpenSSL 1.0.2 or 1.1.1
There is probably a better way to do this but this works.

Modified:
tomcat/native/trunk/native/NMAKEmakefile

Modified: tomcat/native/trunk/native/NMAKEmakefile
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/NMAKEmakefile?rev=1844126&r1=1844125&r2=1844126&view=diff
==
--- tomcat/native/trunk/native/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/NMAKEmakefile Wed Oct 17 16:34:55 2018
@@ -18,8 +18,9 @@
 # NMAKEmakefile   Master Tomcat Native makefile.
 # Usage:
 # APR_DECLARE_STATIC=1  Use static version of the APR
-# ENABLE_OCSP=1Enable OpenSSL OCSP code
-# DEBUG=1  Build DEBUG version of TCN
+# ENABLE_OCSP=1Enable OpenSSL OCSP code
+# OPENSSL_NEW_LIBS=1Use new OpenSSL lib file names
+# DEBUG=1  Build DEBUG version of TCN
 #
 # Originally contributed by Mladen Turk 
 #
@@ -74,7 +75,11 @@ LFLAGS = $(LFLAGS) $(APR_LIB)
 !IF DEFINED(WITH_FIPS)
 LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib 
/NODEFAULTLIB:LIBCMT
 !ELSE
-LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+!IF DEFINED(OPENSSL_NEW_LIBS)
+LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib
+!ELSE
+LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib 
+!ENDIF
 !ENDIF
 
 CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 
-DOPENSSL_NO_IDEA \



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

svn commit: r1844127 - /tomcat/native/trunk/native/srclib/BUILDING

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 16:35:24 2018
New Revision: 1844127

URL: http://svn.apache.org/viewvc?rev=1844127&view=rev
Log:
Add outline instructions for OpenSSL 1.1.1 and a link to the details steps.

Modified:
tomcat/native/trunk/native/srclib/BUILDING

Modified: tomcat/native/trunk/native/srclib/BUILDING
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/BUILDING?rev=1844127&r1=1844126&r2=1844127&view=diff
==
--- tomcat/native/trunk/native/srclib/BUILDING (original)
+++ tomcat/native/trunk/native/srclib/BUILDING Wed Oct 17 16:35:24 2018
@@ -15,8 +15,8 @@ environment before calling nmake so that
 compiler is setup for the target architecture.
 
 
-Building OpenSSL
-
+Building OpenSSL 1.1.0 and earlier
+--
 
 Apply openssl-msvcrt.patch
 
@@ -36,7 +36,25 @@ For 64-bit Windows use
 > ms\do_win64a
 > nmake -f ms\nt.mak
 
-For 64-bit Windows on Itanium processor use
-> perl Configure VC-WIN64I
-> ms\do_win64i
-> nmake -f ms\nt.mak
+
+Building OpenSSL 1.1.1 and later
+--
+
+Apply openssl-msvcrt-1.1.1.patch
+
+This patch addresses issues caused by CMSC compiling against an older Windows
+API than expected for the compiler version in additional to the static linking
+issues described above.
+
+Then follow the standard OpenSSL make procedure ...
+
+> perl Configure no-shared VC-WIN32
+> nmake
+
+For 64-bit Windows use
+> perl Configure no-shared VC-WIN64A
+> nmake
+
+
+For a step-by-step guide to building OpenSSL on Windows see:
+https://cwiki.apache.org/confluence/display/TOMCAT/Building+the+Tomcat+Native+Connector+binaries+for+Windows



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

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 16:35:49 2018
New Revision: 1844128

URL: http://svn.apache.org/viewvc?rev=1844128&view=rev
Log:
Simplify patch and get it working with 32-bit and 64-bit

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

Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch?rev=1844128&r1=1844127&r2=1844128&view=diff
==
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch 
(original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch Wed 
Oct 17 16:35:49 2018
@@ -77,36 +77,21 @@
  if (!TEST_time_t_le(abs((int)difftime(time(NULL), default_time)),
 --- e_os.h
 +++ e_os.h
-@@ -148,8 +148,6 @@
- }
+@@ -149,7 +149,7 @@
  #   endif
  #   include 
--#   if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && 
defined(stdin)
+ #   if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && 
defined(stdin)
 -#if _MSC_VER>=1300 && _MSC_VER<1600
++#ifdef _WIN64
  # undef stdin
  # undef stdout
  # undef stderr
-@@ -157,23 +155,6 @@
+@@ -157,7 +157,7 @@
  # define stdin  (&__iob_func()[0])
  # define stdout (&__iob_func()[1])
  # define stderr (&__iob_func()[2])
 -#elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
--# undef stdin
--# undef stdout
--# undef stderr
-- /*
--  * pre-1300 has __p__iob(), but it's available only in msvcrt.lib,
--  * or in other words with /MD. Declaring implicit import, i.e. with
--  * _imp_ prefix, works correctly with all compiler options, but
--  * without /MD results in LINK warning LNK4049: 'locally defined
--  * symbol "__iob" imported'.
--  */
--extern FILE *_imp___iob;
--# define stdin  (&_imp___iob[0])
--# define stdout (&_imp___iob[1])
--# define stderr (&_imp___iob[2])
--#endif
--#   endif
- #  endif
- #  include 
- #  include 
++#else
+ # undef stdin
+ # undef stdout
+ # undef stderr



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

svn propchange: r1844066 - svn:log

2018-10-17 Thread isapir 
Author: isapir
Revision: 1844066
Modified property: svn:log

Modified: svn:log at Wed Oct 17 17:58:39 2018
--
--- svn:log (original)
+++ svn:log Wed Oct 17 17:58:39 2018
@@ -0,0 +1 @@
+Backport r1842809 and r1844065 from trunk


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

Re: svn propchange: r1844066 - svn:log

2018-10-17 Thread Mark Thomas 
On 17/10/18 18:58, isa...@apache.org wrote:
> Author: isapir
> Revision: 1844066
> Modified property: svn:log
> 
> Modified: svn:log at Wed Oct 17 17:58:39 2018
> --
> --- svn:log (original)
> +++ svn:log Wed Oct 17 17:58:39 2018
> @@ -0,0 +1 @@
> +Backport r1842809 and r1844065 from trunk

It is also helpful to include a short description of what the change does.

Mark

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

Re: svn propchange: r1844066 - svn:log

2018-10-17 Thread Igal Sapir 
On Wed, Oct 17, 2018 at 11:20 AM Mark Thomas  wrote:

> On 17/10/18 18:58, isa...@apache.org wrote:
> > Author: isapir
> > Revision: 1844066
> > Modified property: svn:log
> >
> > Modified: svn:log at Wed Oct 17 17:58:39 2018
> >
> --
> > --- svn:log (original)
> > +++ svn:log Wed Oct 17 17:58:39 2018
> > @@ -0,0 +1 @@
> > +Backport r1842809 and r1844065 from trunk
>
> It is also helpful to include a short description of what the change does.
>

True.  I will update the log entry with more information below the title.

Igal

svn propchange: r1844066 - svn:log

2018-10-17 Thread isapir 
Author: isapir
Revision: 1844066
Modified property: svn:log

Modified: svn:log at Wed Oct 17 19:09:10 2018
--
--- svn:log (original)
+++ svn:log Wed Oct 17 19:09:10 2018
@@ -1 +1,5 @@
 Backport r1842809 and r1844065 from trunk
+
+r1842809 Added ant target ide-intellij to create an IntelliJ IDEA project 
directory
+r1844065 Added util methods Library.load() and Library.loadLibrary() per BZ 
62830
+


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

svn commit: r1844161 - /tomcat/trunk/java/org/apache/tomcat/jni/SSL.java

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 20:14:20 2018
New Revision: 1844161

URL: http://svn.apache.org/viewvc?rev=1844161&view=rev
Log:
Avoid exception when using Tomcat Native built with OpenSSL that does not 
support TLSv1.3

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1844161&r1=1844160&r2=1844161&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Wed Oct 17 20:14:20 2018
@@ -74,8 +74,17 @@ public final class SSL {
 public static final int SSL_PROTOCOL_TLSV1_1 = (1<<3);
 public static final int SSL_PROTOCOL_TLSV1_2 = (1<<4);
 public static final int SSL_PROTOCOL_TLSV1_3 = (1<<5);
-public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_TLSV1 | 
SSL_PROTOCOL_TLSV1_1 |
-  SSL_PROTOCOL_TLSV1_2 | 
SSL_PROTOCOL_TLSV1_3);
+public static final int SSL_PROTOCOL_ALL;
+
+static {
+if (SSL.version() >= 0x1010100f) {
+SSL_PROTOCOL_ALL = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | 
SSL_PROTOCOL_TLSV1_2 |
+SSL_PROTOCOL_TLSV1_3);
+} else {
+SSL_PROTOCOL_ALL = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | 
SSL_PROTOCOL_TLSV1_2);
+}
+}
+
 
 /*
  * Define the SSL verify levels



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

svn commit: r1844162 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java

2018-10-17 Thread isapir 
Author: isapir
Date: Wed Oct 17 20:19:26 2018
New Revision: 1844162

URL: http://svn.apache.org/viewvc?rev=1844162&view=rev
Log:
Updated JavaDoc for r1844065

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1844162&r1=1844161&r2=1844162&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Wed Oct 17 20:19:26 
2018
@@ -256,9 +256,17 @@ public final class Library {
 }
 
 /**
- * Calls System.load(filename). Using this method will load the
- * native library via the Common ClassLoader so that it can
- * be used by all of the Webapps
+ * Calls System.load(filename). System.load() associates the
+ * loaded library with the class loader of the class that called
+ * the System method. A native library may not be loaded by more
+ * than one class loader, so calling the System method from a class that
+ * was loaded by a Webapp class loader will make it impossible for
+ * other Webapps to load it.
+ *
+ * Using this method will load the native library via a shared class
+ * loader (typically the Common class loader, but may vary in some
+ * configurations), so that it can be loaded by multiple Webapps.
+ *
  * @param filename - absolute path of the native library
  */
 public static void load(String filename){
@@ -266,9 +274,17 @@ public final class Library {
 }
 
 /**
- * Calls System.loadLibrary(libname). Using this method will the
- * native library via the Common ClassLoader so that it can
- * be used by all of the Webapps
+ * Calls System.loadLibrary(libname). System.loadLibrary() associates the
+ * loaded library with the class loader of the class that called
+ * the System method. A native library may not be loaded by more
+ * than one class loader, so calling the System method from a class that
+ * was loaded by a Webapp class loader will make it impossible for
+ * other Webapps to load it.
+ *
+ * Using this method will load the native library via a shared class
+ * loader (typically the Common class loader, but may vary in some
+ * configurations), so that it can be loaded by multiple Webapps.
+ *
  * @param libname - the name of the native library
  */
 public static void loadLibrary(String libname){



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

[Bug 62830] Add static methods to load native libraries by the Common ClassLoader

2018-10-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62830

--- Comment #4 from Igal Sapir  ---
(In reply to Mark Thomas from comment #2)
> I think it would be worth updating the Javadoc for the new methods to make
> it clear that System.load[Library]() associates the loaded library not with
> the current thread context class loader but with the class loader of the
> class that calls System.load[Library](). Typically, this would be the Common
> class loader but that may vary depending on configuration and usage.

Please check r1844162 for accuracy.  I hope that I understood you correctly. 
Text below for convenience:

System.loadLibrary() associates the
loaded library with the class loader of the class that called
the System method. A native library may not be loaded by more
than one class loader, so calling the System method from a class that
was loaded by a Webapp class loader will make it impossible for
other Webapps to load it.

Using this method will load the native library via a shared class
loader (typically the Common class loader, but may vary in some
configurations), so that it can be loaded by multiple Webapps.

-- 
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 62830] Add static methods to load native libraries by the Common ClassLoader

2018-10-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62830

--- Comment #5 from Igal Sapir  ---
(In reply to Remy Maucherat from comment #3)
> Yes, if it was using the thread context classloader, like is done nearly
> 100% of the time elsewhere, it would be useless. Weird stuff there.
> 
> Personally, I think native libraries can use extra care and if you're going
> to write a bit of Tomcat code, I would recommend writing a bit more and
> using a Catalina listener to load them (like for tomcat-native, basically).

I like the idea of using a Listener.  I will look into it.

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

svn commit: r1844166 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/jni/Library.java

2018-10-17 Thread isapir 
Author: isapir
Date: Wed Oct 17 20:34:33 2018
New Revision: 1844166

URL: http://svn.apache.org/viewvc?rev=1844166&view=rev
Log:
Updated JavaDoc for r1844066

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/jni/Library.java

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

svn commit: r1844168 - in /tomcat/native/trunk: java/org/apache/tomcat/ test/org/apache/tomcat/

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 20:49:19 2018
New Revision: 1844168

URL: http://svn.apache.org/viewvc?rev=1844168&view=rev
Log:
Update externals

Modified:
tomcat/native/trunk/java/org/apache/tomcat/   (props changed)
tomcat/native/trunk/test/org/apache/tomcat/   (props changed)

Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Wed Oct 17 20:49:19 2018
@@ -1 +1 @@
-^/tomcat/trunk/java/org/apache/tomcat/jni@1843601 jni
+^/tomcat/trunk/java/org/apache/tomcat/jni@1844162 jni

Propchange: tomcat/native/trunk/test/org/apache/tomcat/
--
--- svn:externals (original)
+++ svn:externals Wed Oct 17 20:49:19 2018
@@ -1 +1 @@
-^/tomcat/trunk/test/org/apache/tomcat/jni@1843601 jni
+^/tomcat/trunk/test/org/apache/tomcat/jni@1844162 jni



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

svn commit: r1844170 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_18/

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 20:50:16 2018
New Revision: 1844170

URL: http://svn.apache.org/viewvc?rev=1844170&view=rev
Log:
Drop tag

Removed:
tomcat/native/tags/TOMCAT_NATIVE_1_2_18/


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

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

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 20:50:43 2018
New Revision: 1844171

URL: http://svn.apache.org/viewvc?rev=1844171&view=rev
Log:
Tag 1.2.18

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

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_18/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_18/build.properties.default?rev=1844171&r1=1844168&r2=1844171&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_18/build.properties.default (original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_18/build.properties.default Wed Oct 17 
20:50:43 2018
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=18
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,

Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_18/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_18/native/include/tcn_version.h?rev=1844171&r1=1844168&r2=1844171&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_18/native/include/tcn_version.h 
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_18/native/include/tcn_version.h Wed 
Oct 17 20:50:43 2018
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */



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

svn commit: r30123 - in /dev/tomcat/tomcat-connectors/native/1.2.18: ./ binaries/ source/

2018-10-17 Thread markt 
Author: markt
Date: Wed Oct 17 22:15:49 2018
New Revision: 30123

Log:
Upload 1.2.18 for voting

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

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

dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.sha512

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

dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-win32-bin.zip.sha512

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.asc
 Wed Oct 17 22:15:49 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlvHtE0ACgkQEMAcWi9g
+WedOMRAAgfIZnIBhAufTHAdymCyxgA9kutf4JpCuvZ9CqKNiDnEBK61QcA6d04PC
+BzhL76U73WERgNkXainpPAJJxZ6W9CMMXBPJQ1mgENXmRC/iP6UhtuOfwlv/twKJ
+T7DXZUWnnPJ3vTRuEFlxVZLhdOY8FFu4s3Mc2krdWcnhOSFe/wOjzLLcpIEqKRIy
+swloZ7OMQjOD1qkF6hDzGmeRn5A+C17NGpFFK4zCpv8NJMDWg0K000g7PpBmkqrp
+uwj3crSuYI88ixHWoROI6NHeHNblRg7qoOAqQrYJ/j2O7VpKMFnDLj15aoDSpfFs
+MpS4QyVyEcOR3qHrUa6w9q1JHg51eSPBn1n+K8Hnj+nD2RjtdTu/V9/Jq4dYbJYI
+zPKvfn0cYFgK6fXviJqDT2ScJdbMX7fM/Fk+yBZoH7lq/UL2w8EEtxPLdBauXd5I
+sIwfhBFd/xW8K5gnDyAET8IIbwm69eVd787co7NKOjhSDv+acepzio1RObIiBu7k
+zO8+WgxWjbKbtSyKUfe8XQbdh2uHfQkGBXxHnVbPMg5+VbYLck7QFlWYS867mGFK
+r9B6zraH5+0ACrIEYgtwXQT8Mh58pSHXcLDcoRAC7NygFWg3w/O0IYL+UuwmsVpJ
+H0eZ9eWY7X1Ohb5PhXm0JENsES8vseB+cK1Tbj6VaNJGhukAcIs=
+=rmZk
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.18/binaries/tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win32-bin.zip.sha512
 Wed Oct 17 22:15:49 2018
@@ -0,0 +1 @@
+a1ef307fc0fa7a7a2bed3ad2c5055a08c154bbe911f04e5ea8b0c8646aae189941a2cf9fb07465c5427245f1cb80c659c584b0486ba0b459b00bcc64866d96a9
 *tomcat-native-1.2.18-openssl-1.0.2p-ocsp-win

[VOTE] Release Apache Tomcat Native 1.2.18

2018-10-17 Thread Mark Thomas 
Version 1.2.18 includes the following changes compared to 1.2.17:

- Windows binaries built with OpenSSL 1.0.2p and APR 1.6.5
- Windows binaries built with OpenSSL 1.1.1 and APR 1.6.5
- TLSv1.3 support when built with OpenSSL 1.1.1

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

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

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

Thanks,

Mark


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

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

[Bug 62825] JSP inline javeascript backslash miss escaping in single quote string values

2018-10-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62825

--- Comment #2 from isalis...@ust.hk ---
Thanks for the clarification.

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

2018-10-17 Thread Igal Sapir 

On 10/17/2018 3:19 PM, Mark Thomas wrote:

Version 1.2.18 includes the following changes compared to 1.2.17:

- Windows binaries built with OpenSSL 1.0.2p and APR 1.6.5
- Windows binaries built with OpenSSL 1.1.1 and APR 1.6.5
- TLSv1.3 support when built with OpenSSL 1.1.1

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

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

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


Works fine for me (non-binding) on

Fedora 28:  [1.2.18] using APR version [1.6.3] [OpenSSL 1.1.0i-fips 14 
Aug 2018]

Windows 10:  [1.2.18] using APR version [1.6.5] [OpenSSL 1.1.1  11 Sep 2018]

Igal


Thanks,

Mark


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

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




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

[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2018-10-17 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-tc7.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 33 secs
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 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.exclude=**/TestFlushableGZIPOutputStream.java 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.j
 ar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dtest.reports=output/logs-APR 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.0.2/dest-20181018/lib
 -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20181018.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.0-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomca