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

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 07:31:53 2018
New Revision: 1834472

URL: http://svn.apache.org/viewvc?rev=1834472&view=rev
Log:
EU conference has ended. Focus on NA.

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

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1834472&r1=1834471&r2=1834472&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Jun 27 07:31:53 2018
@@ -54,7 +54,7 @@
 TomcatCon
 
 
-EU & North America
+North America
 
 
 

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1834472&r1=1834471&r2=1834472&view=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Wed Jun 27 07:31:53 2018
@@ -53,7 +53,7 @@
 TomcatCon
 
 
-EU & North America
+North America
 
 
 

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1834472&r1=1834471&r2=1834472&view=diff
==
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Wed Jun 27 07:31:53 2018
@@ -53,7 +53,7 @@
 TomcatCon
 
 
-EU & North America
+North America
 
 
 
@@ -224,105 +224,12 @@
 
 
 
-Quick Navigation
-
-  
-
-TomcatCon Berlin TomcatCon Montreal
-
-
-
-TomcatCon Berlin
-
-
-
-
-When
-
-
-
-June 13 to 14, 2018. 
-
-
-
-
-
-
-
-Where
-
-
-
-
-http://apachecon.com/euroadshow18/venue.html";>KulturBrauerei,
-   Berlin, Germany, as part of the
-   http://apachecon.com/euroadshow18/index.html";>ApacheCon EU
-   Roadshow and alongside https://foss-backstage.de/";>FOSS
-   Backstage. 
-
-
-
-
-
-
-
-What
-
-
-
-This is a one day track at the ApacheCon EU Roadshow dedicated to Apache
-   Tomcat.
-
-
-
-https://foss-backstage.de/tickets";>Registration
-   for TomcatCon is open with standard prices available until 7 June.
-   Registration includes access to ApacheCon EU Roadshow and FOSS 
Backstage.
-
-
-
-
-
-
-
-Schedule
-
-
-
-The full
-   http://apachecon.com/euroadshow18/tomcat-schedule.html";>schedule
-   is now available. The Tomcat team is pleased to be able to say that the 
final
-   schedule has a day of great content covering:
-   
-
- 
-roadmap
- 
-security
- 
-networking (re

svn commit: r27757 - /release/tomcat/tomcat-9/v9.0.7/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 07:34:30 2018
New Revision: 27757

Log:
Drop 9.0.7 from mirrors

Removed:
release/tomcat/tomcat-9/v9.0.7/


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



svn commit: r27758 - /release/tomcat/tomcat-8/v8.5.31/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 07:34:55 2018
New Revision: 27758

Log:
Drop 8.5.31 from mirrors

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


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



svn commit: r1834474 - /tomcat/site/trunk/xdocs/presentations.xml

2018-06-27 Thread rjung
Author: rjung
Date: Wed Jun 27 07:36:03 2018
New Revision: 1834474

URL: http://svn.apache.org/viewvc?rev=1834474&view=rev
Log:
Add my Apache Roadshow 2018 presentations.

I hope adding the Apache Web Server one too is OK.

Modified:
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1834474&r1=1834473&r2=1834474&view=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Wed Jun 27 07:36:03 2018
@@ -39,7 +39,15 @@ mailing list.
 
   
 State of the Cat - Mark Thomas,
-http://people.apache.org/~markt/presentations/2018-06-13-state-of-the-cat.pdf";>slides,
+http://people.apache.org/~markt/presentations/2018-06-13-state-of-the-cat.pdf";>slides
+  
+  
+Performance Troubleshooting using Java Thread Dumps - Rainer Jung,
+http://home.apache.org/~rjung/presentations/2018-06-13-ApacheRoadShow-JavaThreadDumps.pdf";>slides
+  
+  
+Apache Web Server 2.4 - 10 Must-know Configuration Features - Rainer Jung,
+http://home.apache.org/~rjung/presentations/2018-06-14-ApacheRoadShow-WebServerConfgurationFeatures.pdf";>slides
   
 
 



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



svn commit: r1834475 - /tomcat/site/trunk/docs/presentations.html

2018-06-27 Thread rjung
Author: rjung
Date: Wed Jun 27 07:37:31 2018
New Revision: 1834475

URL: http://svn.apache.org/viewvc?rev=1834475&view=rev
Log:
Transforms.

Modified:
tomcat/site/trunk/docs/presentations.html

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1834475&r1=1834474&r2=1834475&view=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Jun 27 07:37:31 2018
@@ -272,8 +272,21 @@ mailing list.
   
 
 State of the Cat - Mark Thomas,
-http://people.apache.org/~markt/presentations/2018-06-13-state-of-the-cat.pdf";>slides,
-  
+http://people.apache.org/~markt/presentations/2018-06-13-state-of-the-cat.pdf";>slides
+  
+
+  
+
+Performance Troubleshooting using Java Thread Dumps - Rainer Jung,
+http://home.apache.org/~rjung/presentations/2018-06-13-ApacheRoadShow-JavaThreadDumps.pdf";>slides
+  
+
+  
+
+Apache Web Server 2.4 - 10 Must-know Configuration Features - Rainer Jung,
+http://home.apache.org/~rjung/presentations/2018-06-14-ApacheRoadShow-WebServerConfgurationFeatures.pdf";>slides
+  
+
 
 
 



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



Re: Slides for ApacheCon EU Roadshow 2018

2018-06-27 Thread Rainer Jung

Am 27.06.2018 um 01:40 schrieb Huxing Zhang:

Hi All,

I have check the presentation page[1] but could only find slide of
Mark's "State of the Cat" topic.

Do we have slides/recordings for the other topics?

[1] http://tomcat.apache.org/presentations.html


Thanks for asking. I just added my two presentations.

More to come from others?

Regards,

Rainer


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



Re: Slides for ApacheCon EU Roadshow 2018

2018-06-27 Thread Rémy Maucherat
On Wed, Jun 27, 2018 at 9:39 AM Rainer Jung  wrote:

> Am 27.06.2018 um 01:40 schrieb Huxing Zhang:
> > Hi All,
> >
> > I have check the presentation page[1] but could only find slide of
> > Mark's "State of the Cat" topic.
> >
> > Do we have slides/recordings for the other topics?
> >
> > [1] http://tomcat.apache.org/presentations.html
>
> Thanks for asking. I just added my two presentations.
>
> More to come from others?
>

That would be nice !

Rémy


svn commit: r1834478 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 07:49:59 2018
New Revision: 1834478

URL: http://svn.apache.org/viewvc?rev=1834478&view=rev
Log:
Update docs for 8.5.32 release


[This commit notification would consist of 78 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



svn commit: r1834479 - in /tomcat/site/trunk: ./ docs/ xdocs/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 07:52:22 2018
New Revision: 1834479

URL: http://svn.apache.org/viewvc?rev=1834479&view=rev
Log:
Update site for 8.5.32 reelase

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1834479&r1=1834478&r2=1834479&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jun 27 07:52:22 2018
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat70=7.0.88
 tomcat80=8.0.52
-tomcat85=8.5.31
+tomcat85=8.5.32
 tomcat90=9.0.8
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1834479&r1=1834478&r2=1834479&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Jun 27 07:52:22 2018
@@ -233,7 +233,7 @@
 Quick Navigation
 
 
-[define v]8.5.31[end]
+[define v]8.5.32[end]
 [define w]8.0.52[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
 [v] |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1834479&r1=1834478&r2=1834479&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jun 27 07:52:22 2018
@@ -248,6 +248,46 @@ project logo are trademarks of the Apach
 
 
 
+
+2018-06-25 Tomcat 8.5.32 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.32
+of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
+new features pulled forward from Tomcat 9.0.x. The minimum Java version and
+implemented specification versions remain unchanged. The notable changes
+compared to 8.5.31 include:
+
+
+
+Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny
+requests based on IPv4 and/or IPv6 client address where the IP ranges are
+defined using CIDR notation. Based on a patch by Francis Galiegue.
+
+Update the packaged version of the Tomcat Native Library to 1.2.17 to pick
+up the latest Windows binaries built with APR 1.6.3 and OpenSSL 
1.0.2o.
+
+Correct a regression in the Host validation by removing the requirement 
that
+the final component of a FQDN must be alphabetic.
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+
+
+https://tomcat.apache.org/download-80.cgi";>Download
+
+
+
+
 
 2018-06-13 Tomcat Native 1.2.17 Released
 
@@ -395,46 +435,6 @@ changelog.
 
 
 
-
-
-2018-05-03 Tomcat 8.5.31 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.5.31
-of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
-new features pulled forward from Tomcat 9.0.x. The minimum Java version and
-implemented specification versions remain unchanged. The notable changes
-compared to 8.5.30 include:
-
-
-
-Implement configuration options to work-around specification non-compliant
-user agents (including all the major browsers) that do not correctly %nn
-encode URI paths and query strings as required by RFC 7230 and RFC 
3986
-
-Enable the CrawlerSessionManagerValve to correctly handle bots that crawl
-multiple hosts and/or web applications when the Valve is configured on a
-Host or an Engine.
-
-Add support for annotation scanning of classes built with Java 11 EA
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
-changelog.
-
-
-
-
-
-https://tomcat.apache.org/download-80.cgi";>Download
-
-
-
 
 
 2018-03-06 Tomcat Connectors 1.2.43 
Released

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1834479&r1=1834478&r2=1834479&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Jun 27 07:52:22 2018
@@ -703,7 +703,8 @@ of Apache Tomcat.
   "8.5.28":"1823407",
   "8.5.29":"1825889",
   "8.5

[ANN] Apache Tomcat 8.5.32 available

2018-06-27 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.32.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled
forward from the 9.0.x branch. The notable changes since 8.5.30 include:

- Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to
  allow/deny requests based on IPv4 and/or IPv6 client address where the
  IP ranges are defined using CIDR notation.
  Based on a patch by Francis Galiegue.

- Update the packaged version of the Tomcat Native Library to 1.2.17 to
  pick up the latest Windows binaries built with APR 1.6.3 and OpenSSL
  1.0.2o.

- Correct a regression in the Host validation by removing the
  requirement that the final component of a FQDN must be alphabetic.


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.5-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 7.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team


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



[Bug 62494] New: Apache http via tomcat WAR or Directory URL syntax (tomcat server.xml) for WAR application not working

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62494

Bug ID: 62494
   Summary: Apache http via tomcat WAR or Directory URL syntax
(tomcat server.xml) for WAR application not working
   Product: Tomcat 9
   Version: 9.0.2
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: mark.sand...@ouh.nhs.uk
  Target Milestone: -

I am attempting to launch a WAR web application from a tomcat service (tomcat
9.0.2, windows server 2008 R2), after invoking a URL in a browser (Firefox)
hosted by an Apache HTTP server (Apache 2.4). The documentation …

https://www.ibm.com/support/knowledgecenter/SS6RHZ_6.0.6/com.ibm.rational.pe.install.doc/topics/t_rpeng_tomcat.html
 
https://tomcat.apache.org/tomcat-7.0-doc/html-manager-howto.html#Deploy_a_Directory_or_WAR_by_URL)

states that the tomcat server.xml configuration file should have an entry:



[Bug 62459] mod_jk: Forwarding URLs containing escaped slashes (e.g. for REST services) fail with syntactical-wrong double-escaping

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62459

--- Comment #2 from Guido Jäkel  ---
Created attachment 35991
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35991&action=edit
proposed patch to avoid double encoding of an encoded slash

I propose the attached patch. It will skip over the encoding of the percent
character ('%') to '%25', if it is followed by the string '2F' or it's lower
case representation. Because this following char's are "legal", just passing
over the '%' unchanged and continue the loop will do the job. The test
condition is robust against an incomplete '%xx' as long as the incoming string
is '\0'-terminated as also assumed by the for loop.


Applying this patch allows me to switch to the mode 'ForwardURIProxy' again
(instead of using 'ForwardURICompatUnparsed' as a workaround) for our
REST-usecase  with use a data representation which contain encoded slashes in
path elements.

-- 
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: r1834485 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 09:32:11 2018
New Revision: 1834485

URL: http://svn.apache.org/viewvc?rev=1834485&view=rev
Log:
Add 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=1834485&r1=1834484&r2=1834485&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Jun 27 09:32:11 2018
@@ -54,7 +54,7 @@
 
   
 
-
+
   
 
   



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



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

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 09:32:41 2018
New Revision: 1834486

URL: http://svn.apache.org/viewvc?rev=1834486&view=rev
Log:
Add release date

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1834486&r1=1834485&r2=1834486&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 27 09:32:41 2018
@@ -71,7 +71,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1834487 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 09:43:46 2018
New Revision: 1834487

URL: http://svn.apache.org/viewvc?rev=1834487&view=rev
Log:
Update docs for 9.0.10 release


[This commit notification would consist of 88 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



[Bug 62494] Apache http via tomcat WAR or Directory URL syntax (tomcat server.xml) for WAR application not working

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62494

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum. Please use the Tomcat users mailing list.

As a starting point, ensure the documentation you are using matches the Tomcat
version you are using.

-- 
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 56402] Add support for HTTP Upgrade to AJP components

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56402

--- Comment #1 from Remy Maucherat  ---
IMO, with each day that passes, this enhancement becomes more unrealistic and
less useful. I think the decision must now be made to either start it
immediately (with a volunteer ;) ) or pass on it and freeze AJP for good.

-- 
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: r1834488 - in /tomcat/site/trunk: ./ docs/ xdocs/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 10:04:55 2018
New Revision: 1834488

URL: http://svn.apache.org/viewvc?rev=1834488&view=rev
Log:
Update site to 9.0.10 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1834488&r1=1834487&r2=1834488&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Jun 27 10:04:55 2018
@@ -39,7 +39,7 @@ tomcat.loc=http://www.apache.org/dist/to
 tomcat70=7.0.88
 tomcat80=8.0.52
 tomcat85=8.5.32
-tomcat90=9.0.8
+tomcat90=9.0.10
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1834488&r1=1834487&r2=1834488&view=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Jun 27 10:04:55 2018
@@ -225,7 +225,7 @@
 Quick Navigation
 
 
-[define v]9.0.8[end]
+[define v]9.0.10[end]
 https://www.apache.org/dist/tomcat/tomcat-9/KEYS";>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1834488&r1=1834487&r2=1834488&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jun 27 10:04:55 2018
@@ -248,6 +248,45 @@ project logo are trademarks of the Apach
 
 
 
+
+2018-06-25 Tomcat 9.0.10 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.10
+of Apache Tomcat. The notable changes compared to 9.0.10 include:
+
+
+
+Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny
+requests based on IPv4 and/or IPv6 client address where the IP ranges are
+defined using CIDR notation. Based on a patch by Francis Galiegue.
+
+Use NIO2 API for websockets writes.
+
+Update the packaged version of the Tomcat Native Library to 1.2.17 to pick
+up the latest Windows binaries built with APR 1.6.3 and OpenSSL 
1.0.2o.
+
+Correct a regression in the Host validation by removing the requirement 
that
+the final component of a FQDN must be alphabetic.
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+
+
+https://tomcat.apache.org/download-90.cgi";>Download
+
+
+
+
 
 2018-06-25 Tomcat 8.5.32 Released
 
@@ -398,43 +437,6 @@ changelog.
 
 
 
-
-
-2018-05-03 Tomcat 9.0.8 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.8
-of Apache Tomcat. The notable changes compared to 9.0.8 include:
-
-
-
-Implement configuration options to work-around specification non-compliant
-user agents (including all the major browsers) that do not correctly %nn
-encode URI paths and query strings as required by RFC 7230 and RFC 
3986
-
-Enable the CrawlerSessionManagerValve to correctly handle bots that crawl
-multiple hosts and/or web applications when the Valve is configured on a
-Host or an Engine.
-
-Add support for annotation scanning of classes built with Java 11 EA
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-
-
-https://tomcat.apache.org/download-90.cgi";>Download
-
-
-
 
 
 2018-03-06 Tomcat Connectors 1.2.43 
Released

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1834488&r1=1834487&r2=1834488&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Jun 27 10:04:55 2018
@@ -847,7 +847,8 @@ of Apache Tomcat.
   "9.0.5":"1823394",
   "9.0.6":"1825860",
   "9.0.7":"1828274",
-  "9.0.8":"1830389"
+  "9.0.8":"1830389",
+  "9.0.10":"1833930"
 };
 
 formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/"; +
@@ -899,9 +900,10 @@ of Apache Tomcat.
 9.0.2
 9.0.4
 9.0.5
-9.0.7
-9.0.7
-9.0.8
+9.0.6
+9.0.7
+9.0.8
+9.0.10
 , new

svn commit: r27762 - /release/tomcat/tomcat-9/v9.0.8/

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 10:05:47 2018
New Revision: 27762

Log:
Drop 9.0.8 from mirrors

Removed:
release/tomcat/tomcat-9/v9.0.8/


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



svn commit: r1834490 - in /tomcat/trunk: java/org/apache/catalina/ssi/ExpressionParseTree.java java/org/apache/catalina/ssi/SSIMediator.java test/org/apache/catalina/ssi/TestRegExpCapture.java test/we

2018-06-27 Thread markt
Author: markt
Date: Wed Jun 27 10:16:33 2018
New Revision: 1834490

URL: http://svn.apache.org/viewvc?rev=1834490&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53387
Add support for regular expression capture groups to the SSI servlet and filter.

Added:
tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java   (with 
props)
tomcat/trunk/test/webapp/bug5/bug53387.shtml
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1834490&r1=1834489&r2=1834490&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Wed Jun 
27 10:16:33 2018
@@ -20,6 +20,7 @@ package org.apache.catalina.ssi;
 import java.text.ParseException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 /**
@@ -368,11 +369,14 @@ public class ExpressionParseTree {
 val2.charAt(val2Len - 1) == '/') {
 // Treat as a regular expression
 String expr = val2.substring(1, val2Len - 1);
+ssiMediator.clearMatchGroups();
 try {
 Pattern pattern = Pattern.compile(expr);
 // Regular expressions will only ever be used with 
EqualNode
 // so return zero for equal and non-zero for not equal
-if (pattern.matcher(val1).find()) {
+Matcher matcher = pattern.matcher(val1);
+if (matcher.find()) {
+ssiMediator.populateMatchGroups(matcher);
 return 0;
 } else {
 return -1;

Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=1834490&r1=1834489&r2=1834490&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java Wed Jun 27 
10:16:33 2018
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
 
 import org.apache.catalina.util.Strftime;
 import org.apache.catalina.util.URLEncoder;
@@ -52,6 +53,7 @@ public class SSIMediator {
 protected final long lastModifiedDate;
 protected Strftime strftime;
 protected final SSIConditionalState conditionalState = new 
SSIConditionalState();
+protected  int lastMatchCount = 0;
 
 
 public SSIMediator(SSIExternalResolver ssiExternalResolver,
@@ -332,4 +334,24 @@ public class SSIMediator {
 retVal);
 }
 }
+
+
+protected void clearMatchGroups() {
+for (int i = 1; i <= lastMatchCount; i++) {
+setVariableValue(Integer.toString(i), "");
+}
+lastMatchCount = 0;
+}
+
+
+protected void populateMatchGroups(Matcher matcher) {
+lastMatchCount = matcher.groupCount();
+// $0 is not used
+if (lastMatchCount == 0) {
+return;
+}
+for (int i = 1; i <= lastMatchCount; i++) {
+setVariableValue(Integer.toString(i), matcher.group(i));
+}
+}
 }
\ No newline at end of file

Added: tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java?rev=1834490&view=auto
==
--- tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java (added)
+++ tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java Wed Jun 27 
10:16:33 2018
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 

[Bug 53387] SSI: Allow to use $1 to get result of regular expression matching

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=53387

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Implemented in 9.0.x for 9.0.11 onwards.

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



buildbot failure in on tomcat-trunk

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



Re: svn commit: r1834490 - in /tomcat/trunk: java/org/apache/catalina/ssi/ExpressionParseTree.java java/org/apache/catalina/ssi/SSIMediator.java test/org/apache/catalina/ssi/TestRegExpCapture.java tes

2018-06-27 Thread Konstantin Kolinko
2018-06-27 13:16 GMT+03:00  :
> Author: markt
> Date: Wed Jun 27 10:16:33 2018
> New Revision: 1834490
>
> URL: http://svn.apache.org/viewvc?rev=1834490&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53387
> Add support for regular expression capture groups to the SSI servlet and 
> filter.
>
> Added:
> tomcat/trunk/test/org/apache/catalina/ssi/TestRegExpCapture.java   (with 
> props)
> tomcat/trunk/test/webapp/bug5/bug53387.shtml

svn:eol-style is missing from the above,
also "text.files" list in build.xml is likely to be updated so that
this file is processed with crlf conversion  when packing Tomcat
sources into zip vs tar.gz.

> Modified:
> tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
> tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
> tomcat/trunk/webapps/docs/changelog.xml

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



[Bug 62496] New: Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

Bug ID: 62496
   Summary: Add possibility write remote user/auth type to
response header
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: 1983-01...@gmx.net
  Target Milestone: 

I have a fairly simple usecase for an enhancement request from which a lot of
users can benefit.

Use case:

* Apache HTTPd (2.4.33) <> Tomcat (8.5.30) via mod_proxy
* Apache logs with CustomLog ... common
* VirtualHost does not only proxy Tomcat, also hosts other unrelated apps
(.e.g, Subversion), so changing the log format is not an option
* Tomcat performs authentication
* Apache logs the requests, but remote_user column is empty. This is ugly and I
do not really want duplicate logging, i.e., on both sides or if both need to be
consistent.

Thanks to rjung@ and jim@ I worked out a solution which does a nice job.

httpd-tomcat.conf:
> 
> ProxyPreserveHost On
> ProxyPass ..
> ProxyPassReverse ..
> RequestHeader set X-Forwarded-Proto "https"
> Header note X-Remote-User REMOTE_USER
> LuaHookLog /usr/local/etc/apache24/register_remote_user.lua 
> register_remote_user
> 

register_remote_user.lua:
> require 'apache2'
> 
> function register_remote_user(r)
> local remote_user = r.notes["REMOTE_USER"]
> if remote_user ~= nil then
> r.user = remote_user
> -- not implemented in mod_lua
> -- r.ap_auth_type = "SPNEGO"
> end
> return apache2.OK
> end

On the Tomcat side I have added:
> public class ResponseRemoteUserValve extends ValveBase {
> 
>   @Override
>   public void invoke(Request request, Response response) throws 
> IOException, ServletException {
>   String remoteUser = request.getRemoteUser();
> 
>   if (remoteUser != null) {
>   response.setHeader("X-Remote-User", remoteUser);
>   }
> 
>   getNext().invoke(request, response);
>   }
> 
> }

Ideally for request#getAuthType() to X-Remote-AuthType too. I think this is
suitable for either AuthenticatorBase or RemoteIPValve.

Comments and ideas welcome!

-- 
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: r1834507 - in /tomcat/trunk: build.xml test/webapp/bug5nnnn/bug53387.shtml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 14:44:25 2018
New Revision: 1834507

URL: http://svn.apache.org/viewvc?rev=1834507&view=rev
Log:
Followup to the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=53387
Set property svn:eol-style=native on a .shtml file,
and add its extension to the "text.files" patterns in build.xml so that fixcrlf 
processes this file when packing Tomcat sources during a release.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/webapp/bug5/bug53387.shtml   (props changed)

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834507&r1=1834506&r2=1834507&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jun 27 14:44:25 2018
@@ -287,6 +287,7 @@
 
 
 
+
 
 
 

Propchange: tomcat/trunk/test/webapp/bug5/bug53387.shtml
--
svn:eol-style = native



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



Re: svn commit: r1834507 - in /tomcat/trunk: build.xml test/webapp/bug5nnnn/bug53387.shtml

2018-06-27 Thread Mark Thomas
On 27/06/18 15:44, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Wed Jun 27 14:44:25 2018
> New Revision: 1834507
> 
> URL: http://svn.apache.org/viewvc?rev=1834507&view=rev
> Log:
> Followup to the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=53387
> Set property svn:eol-style=native on a .shtml file,
> and add its extension to the "text.files" patterns in build.xml so that 
> fixcrlf processes this file when packing Tomcat sources during a release.

Thanks.

Looks like my local svn config didn't get setup correctly when I moved
machines. I'll look at that shortly.

Mark


> 
> Modified:
> tomcat/trunk/build.xml
> tomcat/trunk/test/webapp/bug5/bug53387.shtml   (props changed)
> 
> Modified: tomcat/trunk/build.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834507&r1=1834506&r2=1834507&view=diff
> ==
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Wed Jun 27 14:44:25 2018
> @@ -287,6 +287,7 @@
>  
>  
>  
> +
>  
>  
>  
> 
> Propchange: tomcat/trunk/test/webapp/bug5/bug53387.shtml
> --
> svn:eol-style = native
> 
> 
> 
> -
> 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



[Bug 62498] New: FileDirContext validate not working properly for directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62498

Bug ID: 62498
   Summary: FileDirContext validate not working properly for
directories
   Product: Tomcat 7
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: m.droess...@handelsblattgroup.com
  Target Milestone: ---

Created attachment 35993
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35993&action=edit
Patch

We encounter weird errors with our webapp since tomcat 7.0.82

A change in org.apache.naming.resources.FileDirContext from Mark Thomas at
28.09.17 at 13:54
introduced the wrong behaviour due to difference in how constructors of
java.io.File work.

e.g.:
File f = new File("/tmp/");

is not the same as:
File fp = new File("/tmp");
File f = new File(f, "/");


Thus, the changed check in the validate-method can result in absPath = "/" and
canPath = "" ...and the check for equals fails, although its the same path!

I attached a patch to reverse the handling of absPath and canPath.

-- 
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 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #1 from Michael Osipov <1983-01...@gmx.net> ---
One glitch: "Header unset X-Remote-User" is missing from the config.

-- 
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 56402] Add support for HTTP Upgrade to AJP components

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56402

--- Comment #2 from Christopher Schultz  ---
I think this was intended to allow websocket to be used with mod_jk (where this
was a bug against Tomcat to support such things).

I'm not sure it makes any sense at all at this point. H2 and websocket work
well together across the whole ecosystem. mod_proxy has, by now, nearly caught
up with the robustness of mod_jk when it comes to configurability, fail-over,
and monitoring. Plus, they natively support encryption.

It might be time to let AJP die.

-- 
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 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #2 from Christopher Schultz  ---
Seems reasonable.

Care to prepare a patch, including javadoc + XML/HTML documentation?

-- 
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: Dynamic reloading of SSL certificates

2018-06-27 Thread Romain Manni-Bucau
up? any hope we have live reloading of certs in tomcat?

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le mar. 2 janv. 2018 à 17:00, Romain Manni-Bucau  a
écrit :

> Yes, if tomcat can supports hot reloading of certs it is very feasible:
> https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/main/java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.java
>
>
> Romain Manni-Bucau
> @rmannibucau  |  Blog
>  | Old Blog
>  | Github
>  | LinkedIn
> 
>
> 2018-01-02 16:56 GMT+01:00 Emmanuel Bourg :
>
>> Le 02/01/2018 à 09:40, Romain Manni-Bucau a écrit :
>> > up?
>>
>> I haven't got much time to look into this yet. However since Let's
>> Encrypt client implementations in Java are starting to appear [1] I
>> wonder if the certificate renewal process could be directly integrated
>> into Tomcat instead of relying on an external client such as certbot.
>>
>> Emmanuel Bourg
>>
>> [1] https://github.com/shred/acme4j
>>
>
>


[Bug 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #3 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Christopher Schultz from comment #2)
> Seems reasonable.
> 
> Care to prepare a patch, including javadoc + XML/HTML documentation?

The patch isn't an issue. I'd like to assess where (classwise) it fits best.

-- 
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: Dynamic reloading of SSL certificates

2018-06-27 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Romain,

On 6/27/18 11:50 AM, Romain Manni-Bucau wrote:
> up? any hope we have live reloading of certs in tomcat?

Yup. Recent versions allow you to reload the SSLHostConfigs.

I was getting ready to update my presentation on Let's Encrypt,
actually, so this was a good nudge to actually do that.

I thought the operation would be exposed via JMX, but it does not
appear to be so. It's in the Manager application.

Have a look at what ManagerServlet.sslReload() does.

markt, any objection to taking this code and putting it into the
Connector under the public method reloadSSLHostConfig to make it (a)
accessible via JMX and (b) easy to access?

We have several options when it comes to JMX operations:

1. Connector
2. ProcotolHandler
3. SSLHostConfig

#3 doesn't make much sense, since SSLHostConfigs are the ones that
were loaded, and presumably will be replaced when a "reload" happens.

#2 would work fine, except that:

a. Everyone will look on the Connector first
and
b. The ProtocolHandler doesn't know if SSLEnabled=true on the connector

So I think this is best-done on the Connector.

Any comments or suggestions?

- -chris

> 
> Romain Manni-Bucau @rmannibucau  |
> Blog  | Old Blog 
>  | Github
>  | LinkedIn
>  | Book 
> 
>
> 
> 
> Le mar. 2 janv. 2018 à 17:00, Romain Manni-Bucau
>  a écrit :
> 
>> Yes, if tomcat can supports hot reloading of certs it is very
>> feasible: 
>> https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/ma
in/java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.ja
va
>>
>>
>>
>> 
Romain Manni-Bucau
>> @rmannibucau  |  Blog 
>>  | Old Blog 
>>  | Github 
>>  | LinkedIn 
>> 
>> 
>> 2018-01-02 16:56 GMT+01:00 Emmanuel Bourg :
>> 
>>> Le 02/01/2018 à 09:40, Romain Manni-Bucau a écrit :
 up?
>>> 
>>> I haven't got much time to look into this yet. However since
>>> Let's Encrypt client implementations in Java are starting to
>>> appear [1] I wonder if the certificate renewal process could be
>>> directly integrated into Tomcat instead of relying on an
>>> external client such as certbot.
>>> 
>>> Emmanuel Bourg
>>> 
>>> [1] https://github.com/shred/acme4j
>>> 
>> 
>> 
> 
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlszuY4ACgkQHPApP6U8
pFgxRA//Zsf+/zHUtTx1bVLFtJM7pYSHbdxepQRTCnEN4IS5dAeBSx7zI7w/OSV/
Dt3Fd8dglDrimoYNEt4EWCAo0HNJjJkEsW9UbJPx0riyHQjqW4/wrSFFoWyDLmUg
IEalbxZ++9MYlIcRAVwJRQ4lfze9g+e1CmkEyN3j3CZuq7mQp+5U9EEX8QkuI3Ig
cRZfjztWST6Nsec88Y08w7VE+HYvTDQGG/0rzaeeJrQJ7zANxy2YtyBujzCTV3LK
2wzOMrc63X4VMGISwbimhFWRwfzwkwYmUZXOhCa0OW5/Ob56x/LVYtlRykfQAYbT
xTIyaY+hc3cdbbDNEWymef6FbILbA7lOUOy0qhH2Aiv47gPCTIYyvDkYPr+tjoYo
5F+gqfTmy3qfBOBbRpcWcC9ySu5CdGvwP9YIMY8Q6ko8y/ySw26CK2XQH8Nm4yca
os0zhOu2GzI0P202yGVavoSjLYsdJxDHCIcIRLowbCVBnp6bY1kL/dgGtyQoC7oi
K9Yoz9LmjDJC+DkLSidZEugyGRCihI5fEAH9f1ftSDoCjMeYUMJ5dcOeiU2Vu5Ix
CyYmiIgIDeWOitJJOOV38ogdGo8pGWJvFWymOt41BROtiS7OOTnURcc3Nx65C5mE
odkio+xWznTt09a4Fb4cE9s1CoUIZ79ZkjFf2L4PY+xc27T5xvs=
=8dT7
-END PGP SIGNATURE-

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



[Bug 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #4 from Christopher Schultz  ---
Well, there doesn't seem to be a need to implement this as a Valve (unless I'm
missing something important), so let's implement it as a Filter.

The other filters Tomcat provides are all in the org.apache.catalina.filters
package. The class name you have now seems awkward, but I don't have a better
idea for it.

It would be nice to be able to set the header field-names, and enable either/or
X-Remote-User and X-Remote-AuthType.

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



Plans for AJP

2018-06-27 Thread Rainer Jung

Hi there,

BZ56402 is an AJP feature request and Remy postet

"IMO, with each day that passes, this enhancement becomes more 
unrealistic and

less useful. I think the decision must now be made to either start it
immediately (with a volunteer  ) or pass on it and freeze AJP for good."

and Chris postet:

"It might be time to let AJP die."

Maybe a dev list discussion about plans for AJP should happen. I heard 
several people interested in getting TLS support for mod_jk. Whenever I 
was thinking about it, I refrained from starting to work on it, because


- good TLS support is a lot of work and I'm not sure how good mod_jk 
could reuse mod_ssl like mod_proxy does. mod_jk uses common source code 
for IIS and Apache httpd with only a thin wrapper for the individual web 
servers. Therefore it is not easy to integrate the details of 
comunication, which happens in the common source code part, with mod_ssl.


- even if it would be done with lots of efforts, it would probably take 
quite some time to become robust and I think there's not enough interest 
and available work time to support that new and complex code for a 
longer time.


Since encryption would be most of the most useful features and IMHO we 
won't get there, I suggest we discuss deprecation and EOL dates for AJP 
- meaning mod_jk and AJP connectors.


There's no need to rush, but there could be a clear statement, that no 
feature improvements will be done and users should plan for moving to 
mod_proxy_http (or other http/https) clients.


I think it would be better to invest time in improving mod_proxy where 
it still might lack. For instance adding custom headers to transport 
communication info from the proxy to the backend like AJP does and which 
could be noticed by our Tomcat http connectors and/or support for the 
PROXY protocol.


So what do people think about:

1) adding a statement to the mod_jk docs, that we don't plan any feature 
enhancements and suggest users to migrate to mod_proxy_http and the TC 
HTTP connectors (but what about IIS? I think there are reverse proxy 
modules there as well?)


2) Adding a similar statement to the connector docs for AJP to TC 7-9.

3) Deprecating AJP in TC 9 and removing in TC 10

Regards,

Rainer

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



[Bug 62498] FileDirContext validate not working properly for directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62498

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Mark Thomas  ---
That patch, and the related patches, are part of the fix for security
vulnerability CVE-2017-12617.

You are going to need to provide a test case that demonstrates an incorrect
behaviour before we are going to consider making any changes along the lines
you request.

-- 
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 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #5 from Rainer Jung  ---
I wonder how hard it would be to rewrite something like mod_headers in Java.
Similar to our RewriteValve that mimics mod_rewrite. That would be more
flexible, but we would need to find a good place to put the config for the
headers valve or filter. The RewriteValve uses it's own rewrite.config due to
the goal of config compatibility with httpd, but mod_headers config syntax is
much simpler, so maybe it can be transformed to xml style without getting to
ugly.

Just an idea...

-- 
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 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #6 from Rainer Jung  ---
I should have added, how such a headers filter or valve would then be used:

Header set X-Remote-User %{REMOTE_USER}

That would be httpd syntax, it could be adjusted for our uses. Also
%{REMOTE_USER} is httpd syntax and also used by our own RewriteValve, but we
could instead use something else.

-- 
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: Plans for AJP

2018-06-27 Thread Mark Thomas
On 27/06/18 17:50, Rainer Jung wrote:
> Since encryption would be most of the most useful features and IMHO we
> won't get there, I suggest we discuss deprecation and EOL dates for AJP
> - meaning mod_jk and AJP connectors.

+1

> There's no need to rush, but there could be a clear statement, that no
> feature improvements will be done and users should plan for moving to
> mod_proxy_http (or other http/https) clients.
> 
> I think it would be better to invest time in improving mod_proxy where
> it still might lack. For instance adding custom headers to transport
> communication info from the proxy to the backend like AJP does and which
> could be noticed by our Tomcat http connectors and/or support for the
> PROXY protocol.

+1

> So what do people think about:
> 
> 1) adding a statement to the mod_jk docs, that we don't plan any feature
> enhancements and suggest users to migrate to mod_proxy_http and the TC
> HTTP connectors (but what about IIS? I think there are reverse proxy
> modules there as well?)

I believe there is, but we should investigate it a little first to see
what the feature set is. I have a full set of current Windows OSes plus
IIS VMs. I'm happy to look into this aspect.

> 2) Adding a similar statement to the connector docs for AJP to TC 7-9.

+1, with the above caveat.

> 3) Deprecating AJP in TC 9 and removing in TC 10

That was sooner than I was expecting. I guess it comes down to what the
timescale is for Tomcat 10 and that depends on Jakarta EE. I think I'd
like to wait until we have a clearer picture of the Jakarta EE roadmap
before deciding. If Tomcat 10 was far enough in the future (and assuming
IIS has a reasonable set of features) then I'd be OK with that.

How far is "far enough" and what "reasonable" means I'm still thinking
about ;)

Cheers,

Mark

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



Re: Dynamic reloading of SSL certificates

2018-06-27 Thread Romain Manni-Bucau
+1 for connectors IMHO

Le mer. 27 juin 2018 18:21, Christopher Schultz <
ch...@christopherschultz.net> a écrit :

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Romain,
>
> On 6/27/18 11:50 AM, Romain Manni-Bucau wrote:
> > up? any hope we have live reloading of certs in tomcat?
>
> Yup. Recent versions allow you to reload the SSLHostConfigs.
>
> I was getting ready to update my presentation on Let's Encrypt,
> actually, so this was a good nudge to actually do that.
>
> I thought the operation would be exposed via JMX, but it does not
> appear to be so. It's in the Manager application.
>
> Have a look at what ManagerServlet.sslReload() does.
>
> markt, any objection to taking this code and putting it into the
> Connector under the public method reloadSSLHostConfig to make it (a)
> accessible via JMX and (b) easy to access?
>
> We have several options when it comes to JMX operations:
>
> 1. Connector
> 2. ProcotolHandler
> 3. SSLHostConfig
>
> #3 doesn't make much sense, since SSLHostConfigs are the ones that
> were loaded, and presumably will be replaced when a "reload" happens.
>
> #2 would work fine, except that:
>
> a. Everyone will look on the Connector first
> and
> b. The ProtocolHandler doesn't know if SSLEnabled=true on the connector
>
> So I think this is best-done on the Connector.
>
> Any comments or suggestions?
>
> - -chris
>
> >
> > Romain Manni-Bucau @rmannibucau  |
> > Blog  | Old Blog
> >  | Github
> >  | LinkedIn
> >  | Book
> >  rmance>
> >
> >
> >
> > Le mar. 2 janv. 2018 à 17:00, Romain Manni-Bucau
> >  a écrit :
> >
> >> Yes, if tomcat can supports hot reloading of certs it is very
> >> feasible:
> >> https://github.com/rmannibucau/letsencrypt-manager/blob/master/src/ma
> in/java/com/github/rmannibucau/letsencrypt/manager/LetsEncryptManager.ja
> 
> va
> >>
> >>
> >>
> >>
> Romain Manni-Bucau
> >> @rmannibucau  |  Blog
> >>  | Old Blog
> >>  | Github
> >>  | LinkedIn
> >> 
> >>
> >> 2018-01-02 16:56 GMT+01:00 Emmanuel Bourg :
> >>
> >>> Le 02/01/2018 à 09:40, Romain Manni-Bucau a écrit :
>  up?
> >>>
> >>> I haven't got much time to look into this yet. However since
> >>> Let's Encrypt client implementations in Java are starting to
> >>> appear [1] I wonder if the certificate renewal process could be
> >>> directly integrated into Tomcat instead of relying on an
> >>> external client such as certbot.
> >>>
> >>> Emmanuel Bourg
> >>>
> >>> [1] https://github.com/shred/acme4j
> >>>
> >>
> >>
> >
> -BEGIN PGP SIGNATURE-
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlszuY4ACgkQHPApP6U8
> pFgxRA//Zsf+/zHUtTx1bVLFtJM7pYSHbdxepQRTCnEN4IS5dAeBSx7zI7w/OSV/
> Dt3Fd8dglDrimoYNEt4EWCAo0HNJjJkEsW9UbJPx0riyHQjqW4/wrSFFoWyDLmUg
> IEalbxZ++9MYlIcRAVwJRQ4lfze9g+e1CmkEyN3j3CZuq7mQp+5U9EEX8QkuI3Ig
> cRZfjztWST6Nsec88Y08w7VE+HYvTDQGG/0rzaeeJrQJ7zANxy2YtyBujzCTV3LK
> 2wzOMrc63X4VMGISwbimhFWRwfzwkwYmUZXOhCa0OW5/Ob56x/LVYtlRykfQAYbT
> xTIyaY+hc3cdbbDNEWymef6FbILbA7lOUOy0qhH2Aiv47gPCTIYyvDkYPr+tjoYo
> 5F+gqfTmy3qfBOBbRpcWcC9ySu5CdGvwP9YIMY8Q6ko8y/ySw26CK2XQH8Nm4yca
> os0zhOu2GzI0P202yGVavoSjLYsdJxDHCIcIRLowbCVBnp6bY1kL/dgGtyQoC7oi
> K9Yoz9LmjDJC+DkLSidZEugyGRCihI5fEAH9f1ftSDoCjMeYUMJ5dcOeiU2Vu5Ix
> CyYmiIgIDeWOitJJOOV38ogdGo8pGWJvFWymOt41BROtiS7OOTnURcc3Nx65C5mE
> odkio+xWznTt09a4Fb4cE9s1CoUIZ79ZkjFf2L4PY+xc27T5xvs=
> =8dT7
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


[Bug 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #7 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Christopher Schultz from comment #4)
> Well, there doesn't seem to be a need to implement this as a Valve (unless
> I'm missing something important), so let's implement it as a Filter.

That is true, but opted for Valve because I can phyically register it *after*
my authenticator (in context.xml) guaranteeing that auth has actually happened.
I had it at Host level and it did not work of course.

Why do we need that actually separately? Why not add it to AuthenticatorBase?
That seems to be perfect.

> It would be nice to be able to set the header field-names, and enable
> either/or X-Remote-User and X-Remote-AuthType.

Agreed.

-- 
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 62496] Add possibility write remote user/auth type to response header

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62496

--- Comment #8 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Christopher Schultz from comment #4)

Oh, I forgot. Here is the code I have put on the server now:
https://sourceforge.net/p/mo-tomcat-ext/code/121/

-- 
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: Plans for AJP

2018-06-27 Thread Rémy Maucherat
On Wed, Jun 27, 2018 at 7:09 PM Mark Thomas  wrote:

> On 27/06/18 17:50, Rainer Jung wrote:
> > Since encryption would be most of the most useful features and IMHO we
> > won't get there, I suggest we discuss deprecation and EOL dates for AJP
> > - meaning mod_jk and AJP connectors.
>
> +1
>
> > There's no need to rush, but there could be a clear statement, that no
> > feature improvements will be done and users should plan for moving to
> > mod_proxy_http (or other http/https) clients.
> >
> > I think it would be better to invest time in improving mod_proxy where
> > it still might lack. For instance adding custom headers to transport
> > communication info from the proxy to the backend like AJP does and which
> > could be noticed by our Tomcat http connectors and/or support for the
> > PROXY protocol.
>
> +1
>
> > So what do people think about:
> >
> > 1) adding a statement to the mod_jk docs, that we don't plan any feature
> > enhancements and suggest users to migrate to mod_proxy_http and the TC
> > HTTP connectors (but what about IIS? I think there are reverse proxy
> > modules there as well?)
>
> I believe there is, but we should investigate it a little first to see
> what the feature set is. I have a full set of current Windows OSes plus
> IIS VMs. I'm happy to look into this aspect.
>
> > 2) Adding a similar statement to the connector docs for AJP to TC 7-9.
>
> +1, with the above caveat.
>
> > 3) Deprecating AJP in TC 9 and removing in TC 10
>
> That was sooner than I was expecting. I guess it comes down to what the
> timescale is for Tomcat 10 and that depends on Jakarta EE. I think I'd
> like to wait until we have a clearer picture of the Jakarta EE roadmap
> before deciding. If Tomcat 10 was far enough in the future (and assuming
> IIS has a reasonable set of features) then I'd be OK with that.
>
> How far is "far enough" and what "reasonable" means I'm still thinking
> about ;)
>

+1 for everything, it doesn't seem significant enhancements will happen so
this makes perfect sense.

Rémy


Re: Plans for AJP

2018-06-27 Thread Igal Sapir

On 6/27/2018 11:28 AM, Rémy Maucherat wrote:

On Wed, Jun 27, 2018 at 7:09 PM Mark Thomas  wrote:


On 27/06/18 17:50, Rainer Jung wrote:

Since encryption would be most of the most useful features and IMHO we
won't get there, I suggest we discuss deprecation and EOL dates for AJP
- meaning mod_jk and AJP connectors.

+1

There's no need to rush, but there could be a clear statement, that no
feature improvements will be done and users should plan for moving to
mod_proxy_http (or other http/https) clients.

I think it would be better to invest time in improving mod_proxy where
it still might lack. For instance adding custom headers to transport
communication info from the proxy to the backend like AJP does and which
could be noticed by our Tomcat http connectors and/or support for the
PROXY protocol.

+1

So what do people think about:

1) adding a statement to the mod_jk docs, that we don't plan any feature
enhancements and suggest users to migrate to mod_proxy_http and the TC
HTTP connectors (but what about IIS? I think there are reverse proxy
modules there as well?)

I believe there is, but we should investigate it a little first to see
what the feature set is. I have a full set of current Windows OSes plus
IIS VMs. I'm happy to look into this aspect.


2) Adding a similar statement to the connector docs for AJP to TC 7-9.

+1, with the above caveat.

3) Deprecating AJP in TC 9 and removing in TC 10

That was sooner than I was expecting. I guess it comes down to what the
timescale is for Tomcat 10 and that depends on Jakarta EE. I think I'd
like to wait until we have a clearer picture of the Jakarta EE roadmap
before deciding. If Tomcat 10 was far enough in the future (and assuming
IIS has a reasonable set of features) then I'd be OK with that.

How far is "far enough" and what "reasonable" means I'm still thinking
about ;)


+1 for everything, it doesn't seem significant enhancements will happen so
this makes perfect sense.

Rémy


+1 from me as well.

My main issue with AJP is that you can not add custom headers, which are 
many times desired (e.g. I often set a custom header of a Request-ID on 
the proxy server and then log it in the Proxy server, Tomcat, and the 
Servlet.  That allows me to trace a request when troubleshooting issues).


When I try to migrate clients from AJP to HTTP Proxy they usually tell 
me that they chose AJP because the data is transferred in binary format 
vs. the HTTP text so they believe that it is faster. I make the argument 
that for such small requests the encoding/decoding to/from binary adds 
more overhead than the gained benefit of the data format.


Igal


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



[Bug 62164] Build for Eclipse IDE does not work

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62164

--- Comment #6 from Konstantin Kolinko  ---
(In reply to Mark Thomas from comment #3)
> I can understand Ant not allowing an https -> http redirect but I'm not sure
> why http -> https isn't allowed.
> 

This is actually a regression in Apache Ant 1.9.10+.
The code of Get task was broken during a checkstyle cleanup.

I filed this into Bugzilla for Apache Ant:
https://bz.apache.org/bugzilla/show_bug.cgi?id=62499


> In theory, switching everything to https would fix this - but many of the
> mirrors used by the ASF are not configured for TLS. And the ECJ download
> doesn't appear to want to work over TLS either.
> 
> Maven and SF seem OK so my solution at this point is to switch them to TLS
> and leave the others.

I am facing failure with ASF mirrors. Using Apache Ant 1.9.12:


trydownload:
  [get] Getting:
https://www.apache.org/dyn/closer.lua?action=download&filename=/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz
  [get] To: -censored-\download-1299307821.tar.gz
  [get]
https://www.apache.org/dyn/closer.lua?action=download&filename=/commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz
moved to
http://apache-mirror.rbc.ru/pub/apache//commons/daemon/binaries/commons-daemon-1.1.0-bin.tar.gz

BUILD FAILED
-censored-\trunk\build.xml:2670: The following error occurred while executing
this line:
-censored-\trunk\build.xml:2986: The following error occurred while executing
this line:
-censored-\trunk\build.xml:3102: Redirection detected from https to http.
Protocol switch unsafe, not allowed.


The workaround: specify a specific mirror by setting "base-apache.loc.1"
property in build.properties file to the root URL of a mirror.

-- 
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: Plans for AJP

2018-06-27 Thread Rainer Jung

Am 27.06.2018 um 21:49 schrieb Igal Sapir:

On 6/27/2018 11:28 AM, Rémy Maucherat wrote:

On Wed, Jun 27, 2018 at 7:09 PM Mark Thomas  wrote:


On 27/06/18 17:50, Rainer Jung wrote:

Since encryption would be most of the most useful features and IMHO we
won't get there, I suggest we discuss deprecation and EOL dates for AJP
- meaning mod_jk and AJP connectors.

+1

There's no need to rush, but there could be a clear statement, that no
feature improvements will be done and users should plan for moving to
mod_proxy_http (or other http/https) clients.

I think it would be better to invest time in improving mod_proxy where
it still might lack. For instance adding custom headers to transport
communication info from the proxy to the backend like AJP does and 
which

could be noticed by our Tomcat http connectors and/or support for the
PROXY protocol.

+1

So what do people think about:

1) adding a statement to the mod_jk docs, that we don't plan any 
feature

enhancements and suggest users to migrate to mod_proxy_http and the TC
HTTP connectors (but what about IIS? I think there are reverse proxy
modules there as well?)

I believe there is, but we should investigate it a little first to see
what the feature set is. I have a full set of current Windows OSes plus
IIS VMs. I'm happy to look into this aspect.


2) Adding a similar statement to the connector docs for AJP to TC 7-9.

+1, with the above caveat.

3) Deprecating AJP in TC 9 and removing in TC 10

That was sooner than I was expecting. I guess it comes down to what the
timescale is for Tomcat 10 and that depends on Jakarta EE. I think I'd
like to wait until we have a clearer picture of the Jakarta EE roadmap
before deciding. If Tomcat 10 was far enough in the future (and assuming
IIS has a reasonable set of features) then I'd be OK with that.

How far is "far enough" and what "reasonable" means I'm still thinking
about ;)

+1 for everything, it doesn't seem significant enhancements will 
happen so

this makes perfect sense.

Rémy


+1 from me as well.

My main issue with AJP is that you can not add custom headers, which are 
many times desired (e.g. I often set a custom header of a Request-ID on 
the proxy server and then log it in the Proxy server, Tomcat, and the 
Servlet.  That allows me to trace a request when troubleshooting issues).


Not trying to deviate, but any header set with mod_headers RequestHeader 
directive should automatically be forwarded (I use it often eg. for 
request IDs). Alternatively one can use JkEnvVar to forward httpd 
request environment variables as request attributes. No idea about IIS 
though.


When I try to migrate clients from AJP to HTTP Proxy they usually tell 
me that they chose AJP because the data is transferred in binary format 
vs. the HTTP text so they believe that it is faster. I make the argument 
that for such small requests the encoding/decoding to/from binary adds 
more overhead than the gained benefit of the data format.


I do not expect the marshalling/unmarshalling to make a big difference 
between AJP and HTTP. Typically the CPU cycles used for a request are 
dominated by application stuff. Everything else is so small, that it 
only costs noticeable resources if you are doing many thousand requests 
per second.


Not arguing against you, since you are +1, just adding my thoughts.

Regards,

Rainer

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



Re: Plans for AJP

2018-06-27 Thread Igal Sapir

On 6/27/2018 1:02 PM, Rainer Jung wrote:



Not trying to deviate, but any header set with mod_headers 
RequestHeader directive should automatically be forwarded (I use it 
often eg. for request IDs). Alternatively one can use JkEnvVar to 
forward httpd request environment variables as request attributes. No 
idea about IIS though.


When I try to migrate clients from AJP to HTTP Proxy they usually 
tell me that they chose AJP because the data is transferred in binary 
format vs. the HTTP text so they believe that it is faster. I make 
the argument that for such small requests the encoding/decoding 
to/from binary adds more overhead than the gained benefit of the data 
format.


I do not expect the marshalling/unmarshalling to make a big difference 
between AJP and HTTP. Typically the CPU cycles used for a request are 
dominated by application stuff. Everything else is so small, that it 
only costs noticeable resources if you are doing many thousand 
requests per second.


We're in agreement.  The point I make to them is that they do not gain 
any performance benefits.



Not arguing against you, since you are +1, just adding my thoughts.


I welcome your thoughts, thank you.

Igal

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



svn commit: r1834542 - in /tomcat/trunk: build.properties.default build.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 20:26:20 2018
New Revision: 1834542

URL: http://svn.apache.org/viewvc?rev=1834542&view=rev
Log:
Implement checksum checks when downloading dependencies that are used to build 
Tomcat.
Also updated WSDL4J 1.6.2 -> 1.6.3, JUnit 4.11 -> 4.12.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834542&r1=1834541&r2=1834542&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jun 27 20:26:20 2018
@@ -105,12 +105,18 @@ base-maven.loc=https://repo.maven.apache
 
 # - Webservices - JAX RPC -
 jaxrpc-lib.version=1.1-rc4
+jaxrpc-lib.checksum.enabled=true
+jaxrpc-lib.checksum.algorithm=MD5|SHA-1
+jaxrpc-lib.checksum.value=4bebba22a4cdb9f68e16c45129770333|fe9371d33dc3e1646d4d13bde19614283eb998b1
 jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
 
jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 
jaxrpc-lib.loc=${base-maven.loc}/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
 
 # - Webservices - WSDL4J -
-wsdl4j-lib.version=1.6.2
+wsdl4j-lib.version=1.6.3
+wsdl4j-lib.checksum.enabled=true
+wsdl4j-lib.checksum.algorithm=MD5|SHA-1
+wsdl4j-lib.checksum.value=cfc28d89625c5e88589aec7a9aee0208|6d106a6845a3d3477a1560008479312888e94f2f
 wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
 wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
@@ -119,6 +125,9 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
 jdt.version=4.7.3a
 jdt.release=R-4.7.3a-201803300640
+jdt.checksum.enabled=true
+jdt.checksum.algorithm=SHA-512
+jdt.checksum.value=7287b1ea3e18423d027a99ce40ae72e46e1700a65b474d2ec09af6a17b10653b7c2e69e9bb87efe14f4c593dc66b6370ea566fce90edb4b4190a903046817e6f
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.
@@ -127,6 +136,12 @@ jdt.loc.2=http://download.eclipse.org/ec
 
 # - Tomcat native library -
 tomcat-native.version=1.2.17
+tomcat-native.src.checksum.enabled=true
+tomcat-native.src.checksum.algorithm=SHA-512
+tomcat-native.src.checksum.value=8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
+tomcat-native.win.checksum.enabled=true
+tomcat-native.win.checksum.algorithm=SHA-512
+tomcat-native.win.checksum.value=2955209b39707949b080f13c09edcad08a13faf5545f7890e2ac493ccbc66d09e152a39b4fa6ac40fe3de6b209b305608db3db8dcf24dda94567b417f55a5f49
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
@@ -136,6 +151,9 @@ tomcat-native.win.2=${base-tomcat.loc.2}
 
 # - NSIS, version 3.0 or later -
 nsis.version=3.03
+nsis.checksum.enabled=true
+nsis.checksum.algorithm=MD5|SHA-1
+nsis.checksum.value=d4919dc089ec256a7264e97ada299b64|ea69aa8d538916c9e8630dfd0106b063f7bb5d46
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.arch.dir=x86-unicode/
@@ -148,6 +166,20 @@ nsis.loc=${base-sf.loc}/nsis/nsis-${nsis
 
 # - Commons Daemon, version 1.1.0 or later -
 commons-daemon.version=1.1.0
+
+# checksum for commons-daemon-1.1.0-bin.tar.gz
+commons-daemon.bin.checksum.enabled=true
+commons-daemon.bin.checksum.algorithm=SHA-512
+commons-daemon.bin.checksum.value=43c33e52e0be11e73370083500592ee9df0431c3166dbc7ed95794cabb462ac2a140e3eb4bbe2a0b99882bb93d9244ff534f13e4933c13e7a31a37e58e0c8e1d
+
+# checksums for commons-daemon-1.1.0-native-src.tar.gz, 
commons-daemon-1.1.0-bin-windows.zip
+commons-daemon.native.src.checksum.enabled=true
+commons-daemon.native.src.checksum.algorithm=SHA-512
+commons-daemon.native.src.checksum.value=3443f1c95a4b267c4387a9ac7c79315422a51e896c0bcea48fbe959bc301094770aa8065b2388a84760a3e07e5d1753c2b351336fb2d3a8c996ee14d32088f6e
+commons-daemon.native.win.checksum.enabled=true
+commons-daemon.native.win.checksum.algorithm=SHA-512
+commons-daemon.native.win.checksum.value=10cda04d9a44286cb67107fdb9d20958013f075cad4accba048801f3677765c334dc16f6901e1d2e4a9df5a2c702797370de63393568df6fceb9e7902421f9ea
+
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.versio

[Bug 62500] New: Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

Bug ID: 62500
   Summary: Add Shell Script to Create CATALINA_BASE Directories
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: isa...@apache.org
  Target Milestone: -

Add a batch/shell script, e.g. mkdirs-base.bat/sh, that will accept a target
directory as an argument and in it will create a directory structure for
CATALINA_BASE, i.e. conf, logs, temp, webapps, work.

Creating ticket per
http://tomcat.10.x6.nabble.com/Tomcat-Installation-on-Windows-tp5075398p5075436.html

-- 
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 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

Igal Sapir  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Igal Sapir  ---
How can I assign this ticket to myself?  If can not due to permissions, then
please someone with permissions do so.  Thank you.

-- 
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 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #2 from Michael Osipov <1983-01...@gmx.net> ---
Funny, I have crated such a script for two operating systems at work. My script
does even check for bound ports. Shall I share?

-- 
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 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #3 from Igal Sapir  ---
> Shall I share?

Sure, why not :)

-- 
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 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #4 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Igal Sapir from comment #3)
> > Shall I share?
> 
> Sure, why not :)

Will do tomorrow as soon as I get access to our company's Subversion server.

-- 
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: Dynamic reloading of SSL certificates

2018-06-27 Thread Mark Thomas
On 27/06/18 17:21, Christopher Schultz wrote:
> Romain,
> 
> On 6/27/18 11:50 AM, Romain Manni-Bucau wrote:
>> up? any hope we have live reloading of certs in tomcat?
> 
> Yup. Recent versions allow you to reload the SSLHostConfigs.
> 
> I was getting ready to update my presentation on Let's Encrypt,
> actually, so this was a good nudge to actually do that.
> 
> I thought the operation would be exposed via JMX, but it does not
> appear to be so. It's in the Manager application.
> 
> Have a look at what ManagerServlet.sslReload() does.
> 
> markt,

Probably better to ask the dev list as a whole rather than just me. My
view should carry the same weight as every one else's.

(OK, being pedantic the committers views in theory carry more weight
because they can veto a change but in practise if anyone feels that
strongly about an issue then it probably needs more discussion.)

> any objection to taking this code and putting it into the
> Connector under the public method reloadSSLHostConfig to make it (a)
> accessible via JMX and (b) easy to access?

Yes.

The operations are already accessible via JMX on the ProtocolHandlers.
As the refactoring has progressed there has been a steady shift away
from duplicating attributes and methods between the Connector, Protocol
and endpoint. I think there will always need to be some duplication but
it has been trending downwards.

Mark

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



[Bug 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #5 from Mark Thomas  ---
(In reply to Igal Sapir from comment #1)
> How can I assign this ticket to myself?  If can not due to permissions, then
> please someone with permissions do so.  Thank you.

We don't assign tickets in Bugzilla. They are hard-coded to be assigned to the
relevant dev@ list so any updates to the issue appear on list.

If you, want you can just add a note to the ticket that you are working on 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



[Bug 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #6 from Igal Sapir  ---
(In reply to Mark Thomas from comment #5)
> We don't assign tickets in Bugzilla. They are hard-coded to be assigned to
> the relevant dev@ list so any updates to the issue appear on list.
> 
> If you, want you can just add a note to the ticket that you are working on
> it.

Sounds good.

I am working on this ticket.  Will wait for feedback from Michael Osipov as per
comment #2 first.

-- 
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 62500] Add Shell Script to Create CATALINA_BASE Directories

2018-06-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62500

--- Comment #7 from Igal Sapir  ---
(In reply to Michael Osipov from comment #4)
> (In reply to Igal Sapir from comment #3)
> > > Shall I share?
> > 
> > Sure, why not :)
> 
> Will do tomorrow as soon as I get access to our company's Subversion server.

Michael, I just realized that you are a committer.  If you want to take this
one yourself then that's fine by me - please let me know.  

Otherwise I will take your files and edit if/as needed.

-- 
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: r1834548 - /tomcat/trunk/build.properties.default

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 21:44:57 2018
New Revision: 1834548

URL: http://svn.apache.org/viewvc?rev=1834548&view=rev
Log:
Add a comment where to look for a checksum for ECJ.

The path may be obvious, but as different versions of Tomcat use different 
versions of ECJ it is easy to get confused.

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1834548&r1=1834547&r2=1834548&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jun 27 21:44:57 2018
@@ -123,6 +123,11 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
 
 # - Eclipse JDT, version 4.7 or later -#
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
+#
+# Checksum is from "SHA512 Checksums for 4.7.3a" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.7.3a-201803300640/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.7.3a-201803300640/checksum/eclipse-4.7.3a-SUMSSHA512
+#
 jdt.version=4.7.3a
 jdt.release=R-4.7.3a-201803300640
 jdt.checksum.enabled=true



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



buildbot success in on tomcat-trunk

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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



svn commit: r1834550 - in /tomcat/trunk: res/ide-support/eclipse/eclipse.classpath res/ide-support/netbeans/project.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 22:14:09 2018
New Revision: 1834550

URL: http://svn.apache.org/viewvc?rev=1834550&view=rev
Log:
Update library versions in IDE configuration files.

Modified:
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/ide-support/netbeans/project.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1834550&r1=1834549&r2=1834550&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Wed Jun 27 22:14:09 
2018
@@ -23,7 +23,7 @@
 
 
 
-
+
 
 
 

Modified: tomcat/trunk/res/ide-support/netbeans/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/project.xml?rev=1834550&r1=1834549&r2=1834550&view=diff
==
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Wed Jun 27 22:14:09 2018
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.7.3a/ecj-4.7.3a.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.7.3a/ecj-4.7.3a.jar:${ant.includes}/
 1.7
 
 
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.12/junit-4.12.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
 1.7
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1834550&r1=1834549&r2=1834550&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 27 22:14:09 2018
@@ -78,6 +78,11 @@
   
 Update JUnit library to version 4.12 (from 4.11). (kkolinko)
   
+  
+Downgrade CGLib library used for testing with EasyMock to version
+2.2.2 (from 2.2.3) as version 2.2.3 is not available from Maven 
Central.
+(markt)
+  
   
 Implement checksum checks when downloading dependencies that are used
 to build Tomcat. (kkolinko)



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



svn commit: r1834552 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default build.xml res/ide-support/eclipse/eclipse.classpath res/ide-support/netbeans/project.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 22:22:24 2018
New Revision: 1834552

URL: http://svn.apache.org/viewvc?rev=1834552&view=rev
Log:
Implement checksum checks when downloading dependencies that are used to build 
Tomcat.
Also:
- Updated WSDL4J 1.6.2 -> 1.6.3
- Updated JUnit 4.11 -> 4.12.
- Changed download locations for EasyMock, CGLib, Objenesis to be Maven Central 
(r1834354, r1834356)
- Downgraded CGLib 2.2.3 -> 2.2.2 so that it can be downloaded from Maven 
Central (r1834356)

Merged r1834542 (and also r1834354, r1834356, r1834548, r1834550) from 
tomcat/trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.5.x/trunk/res/ide-support/netbeans/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 27 22:22:24 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,176

svn commit: r1834559 - /tomcat/trunk/build.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 23:18:29 2018
New Revision: 1834559

URL: http://svn.apache.org/viewvc?rev=1834559&view=rev
Log:
Fix filename in checksum check message for target "downloadgz".

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1834559&r1=1834558&r2=1834559&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jun 27 23:18:29 2018
@@ -2970,7 +2970,7 @@ skip.installer property in build.propert
 
+  file="${temp.file}.tar.gz" name="${sourcefile}" />
 
 
 



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



svn commit: r1834560 - in /tomcat/tc8.5.x/trunk: ./ build.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 23:23:08 2018
New Revision: 1834560

URL: http://svn.apache.org/viewvc?rev=1834560&view=rev
Log:
Followup. Fix filename in checksum check message for target "downloadgz".

Merged r1834559 from tomcat/trunk.

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 27 23:23:08 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,

svn commit: r1834562 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default build.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Wed Jun 27 23:36:28 2018
New Revision: 1834562

URL: http://svn.apache.org/viewvc?rev=1834562&view=rev
Log:
Implement checksum checks when downloading dependencies that are used to build 
Tomcat.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 27 23:36:28 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042,1831557,1831569,1832269,1832271,1832693,1832967,1833809,1833919
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,16

svn commit: r1834565 [2/2] - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1834565&r1=1834564&r2=1834565&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Jun 28 00:52:16 2018
@@ -1565,30 +1565,45 @@
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
   
@@ -1705,12 +1720,18 @@
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
+  
+  
+  
 
 
   
@@ -2620,6 +2644,9 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
@@ -2627,11 +2654,17 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
   
   
   
+  
+  
+  
 
 
 
@@ -2652,6 +2685,9 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
   
 
@@ -2662,30 +2698,45 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
   
@@ -2697,6 +2748,9 @@ Apache Tomcat ${version} native binaries
 
   
   
+  
+  
+  
 
 
   
@@ -2709,6 +2763,9 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
@@ -2716,6 +2773,9 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
@@ -2723,6 +2783,9 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
@@ -2730,12 +2793,18 @@ Apache Tomcat ${version} native binaries
   
   
   
+  
+  
+  
 
 
 
   
   
   
+  
+  
+  
 
 
   
@@ -2811,12 +2880,108 @@ Apache Tomcat ${version} native binaries
 
   
 
+  
+
+
+
+
+
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+
+  
+  
+  Checksum check failure for ${name} (@{file}).
+  Algorithm: @{algorithm}
+  Expected value: @{value}
+  Actual values:
+  SHA-512: ${value.sha512}
+  SHA-256: ${value.sha256}
+  SHA-1: ${value.sha1}
+  MD5: ${value.md5}
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
   
 
 
 
 
 
+
+
 
 
 
@@ -2836,6 +3001,12 @@ Apache Tomcat ${version} native binaries
   
   
 
+
+
+
 
 
 
@@ -2848,6 +3019,11 @@ Apache Tomcat ${version} native binaries
 
 
 
+
+
 
 
 
@@ -2866,6 +3042,12 @@ Apache Tomcat ${version} native binaries
   
   
 
+
+
+
 
 
 
@@ -2877,6 +3059,11 @@ Apache Tomcat ${version} native binaries
 
 
 
+
+
 
 
   
@@ -2900,6 +3087,11 @@ Apache Tomcat ${version} native binaries
 
 
 
+
+
 
 
   

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1834565&r1=1834564&r2=1834565&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 28 00:52:16 2018
@@ -205,6 +205,10 @@
 pick up the latest Windows binaries built with APR 1.6.3 and OpenSSL
 1.0.2o. (markt)
   
+  
+Implement checksum checks when downloading dependencies that are used
+to build Tomcat. (kkolinko)
+  
 
   
 



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



svn commit: r1834565 [1/2] - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml webapps/docs/changelog.xml

2018-06-27 Thread kkolinko
Author: kkolinko
Date: Thu Jun 28 00:52:16 2018
New Revision: 1834565

URL: http://svn.apache.org/viewvc?rev=1834565&view=rev
Log:
Implement checksum checks when downloading dependencies that are used to build 
Tomcat.

Based on r1834562 from tomcat/tc8.0.x/trunk.

Implementation of "verifyChecksum" macrodef is different from the one
in Tomcat 8.0 (and later) to allow building with Ant 1.8.2: it does not
use namespaces "if" and "unless".
It works, but it is less efficient: all checksums are calculated always,
regardless of whether their values will be used or not.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 28 00:52:16 2018
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082

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

2018-06-27 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 13 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 bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 28 mins 23 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-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180628/bin/openssl
 -Dtest.temp=output/test-tmp-NIO2
  -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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/wor