[Bug 55969] Security-related enhancements to the Windows Installer

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=55969

--- Comment #5 from anbinh  ---
Your article has brought a lot of value to me. http://fleeingthecomplex.co/

-- 
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 63743] Tomcat 9.0.x configuration file differences page - Forbidden

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63743

--- Comment #2 from Ezequiel Aguilar  ---
Thanks Mark for the information.

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



[GitHub] [tomcat] vocatan opened a new pull request #203: spelling and formatting corrections for cluster-howto

2019-09-10 Thread GitBox
vocatan opened a new pull request #203: spelling and formatting corrections for 
cluster-howto
URL: https://github.com/apache/tomcat/pull/203
 
 
   Was reading the documentation about session clustering and found some minor 
typographical issues.  Felt that they were small enough that rather than 
reporting by email, could just submit a patch. Hope this is okay!


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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



[Bug 63743] Tomcat 9.0.x configuration file differences page - Forbidden

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63743

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Mark Thomas  ---
See:

https://markmail.org/message/cwrtcft7o3gqmyzc

https://markmail.org/message/qgchdzl6i7wzgprx

-- 
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 63743] New: Tomcat 9.0.x configuration file differences page - Forbidden

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63743

Bug ID: 63743
   Summary: Tomcat 9.0.x configuration file differences page -
Forbidden
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: ezequiel.agui...@gmail.com
  Target Milestone: -

Hi, 
When I go to this URL:
http://tomcat.apache.org/migration-9.html#Tomcat_9.0.x_configuration_file_differences
and try to run the tool it opens a new tab with the Forbidden message:

Forbidden
You don't have permission to access this resource.

This is the URL reached:
https://gitbox.apache.org/repos/asf?p=tomcat.git=blobdiff=conf%2Fcatalina.policy=9.0.7=9.0.22

-- 
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 63685] WebappClassLoaderBase and StandardRoot reload classes from jar files on each call of getResource, getResourceAsStream and etc. that hit application startup performance

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63685

--- Comment #2 from Mark Thomas  ---
Leaving this open for now but it will be closed as WONTFIX if no justification
for caching classes is provided.

-- 
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 63737] Compression may not work when there are multiple Accept-Encoding headers in the request

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63737

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
There were other issues with the parsing such as xxgzip being treated as
meaning gzip was supported. Those have been fixed as well.

Fixed in:
- master for 9.0.25 onwards
- 8.5.x for 8.5.46 onwards
- 7.0.x for 7.0.97 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



[tomcat] branch 8.5.x updated: Polish. Spacing.

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 45b3f9b  Polish. Spacing.
45b3f9b is described below

commit 45b3f9b87480e2f6ca0e21c2591e5d350c5dafc2
Author: Mark Thomas 
AuthorDate: Tue Sep 10 20:57:57 2019 +0100

Polish. Spacing.
---
 java/org/apache/tomcat/util/http/parser/AcceptEncoding.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java 
b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
index ee145c6..ba92702 100644
--- a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
+++ b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http.parser;
 
 import java.io.IOException;


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



[tomcat] branch master updated: Polish. Spacing.

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 4d8ce2c  Polish. Spacing.
4d8ce2c is described below

commit 4d8ce2c1c58c5432316d5c045f480667f887fb97
Author: Mark Thomas 
AuthorDate: Tue Sep 10 20:57:57 2019 +0100

Polish. Spacing.
---
 java/org/apache/tomcat/util/http/parser/AcceptEncoding.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java 
b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
index ee145c6..ba92702 100644
--- a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
+++ b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http.parser;
 
 import java.io.IOException;


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



[tomcat] branch 7.0.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 809d6a9  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737
809d6a9 is described below

commit 809d6a99e004320af8685a36d32ed32b22ecfb05
Author: Mark Thomas 
AuthorDate: Tue Sep 10 20:33:14 2019 +0100

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

Correct various issues with parsing the accept-encoding header when
looking to see if gzip is supported.
 - only the first header was examined
 - xxgzip was treated as indicating support for gzip
---
 .../coyote/http11/AbstractHttp11Processor.java | 31 +++--
 .../tomcat/util/http/parser/AcceptEncoding.java| 76 ++
 .../apache/tomcat/util/http/parser/HttpParser.java | 74 +
 webapps/docs/changelog.xml |  5 ++
 4 files changed, 181 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index bc149d3..c2750df 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -18,6 +18,9 @@ package org.apache.coyote.http11;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.io.StringReader;
+import java.util.Enumeration;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -48,6 +51,7 @@ import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.http.ResponseUtil;
+import org.apache.tomcat.util.http.parser.AcceptEncoding;
 import org.apache.tomcat.util.http.parser.HttpParser;
 import org.apache.tomcat.util.log.UserDataHelper;
 import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -636,12 +640,29 @@ public abstract class AbstractHttp11Processor extends 
AbstractProcessor {
  */
 private boolean useCompression() {
 
-// Check if browser support gzip encoding
-MessageBytes acceptEncodingMB =
-request.getMimeHeaders().getValue("accept-encoding");
+// Check if user-agent supports gzip encoding
+// Only interested in whether gzip encoding is supported. Other
+// encodings and weights can be ignored.
+Enumeration headerValues = 
request.getMimeHeaders().values("accept-encoding");
+boolean foundGzip = false;
+while (!foundGzip && headerValues.hasMoreElements()) {
+List acceptEncodings = null;
+try {
+acceptEncodings = AcceptEncoding.parse(new 
StringReader(headerValues.nextElement()));
+} catch (IOException ioe) {
+// If there is a problem reading the header, disable 
compression
+return false;
+}
+
+for (AcceptEncoding acceptEncoding : acceptEncodings) {
+if ("gzip".equalsIgnoreCase(acceptEncoding.getEncoding())) {
+foundGzip = true;
+break;
+}
+}
+}
 
-if ((acceptEncodingMB == null)
-|| (acceptEncodingMB.indexOf("gzip") == -1)) {
+if (!foundGzip) {
 return false;
 }
 
diff --git a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java 
b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
new file mode 100644
index 000..a2a2e2b
--- /dev/null
+++ b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
@@ -0,0 +1,76 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.http.parser;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tomcat.util.http.parser.HttpParser.SkipResult;
+
+public class AcceptEncoding {
+
+private final String encoding;
+private final double quality;
+
+protected 

[tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2099e4d  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737
2099e4d is described below

commit 2099e4d5a64e018c5dcba48db775e302b55c3aad
Author: Mark Thomas 
AuthorDate: Tue Sep 10 20:33:14 2019 +0100

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

Correct various issues with parsing the accept-encoding header when
looking to see if gzip is supported.
 - only the first header was examined
 - xxgzip was treated as indicating support for gzip
---
 java/org/apache/coyote/CompressionConfig.java  | 30 -
 .../tomcat/util/http/parser/AcceptEncoding.java| 75 ++
 test/org/apache/coyote/TestCompressionConfig.java  | 67 +++
 webapps/docs/changelog.xml |  5 ++
 4 files changed, 174 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/CompressionConfig.java 
b/java/org/apache/coyote/CompressionConfig.java
index e921917..fd0652e 100644
--- a/java/org/apache/coyote/CompressionConfig.java
+++ b/java/org/apache/coyote/CompressionConfig.java
@@ -16,7 +16,10 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
@@ -24,6 +27,7 @@ import java.util.regex.Pattern;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.http.ResponseUtil;
+import org.apache.tomcat.util.http.parser.AcceptEncoding;
 
 public class CompressionConfig {
 
@@ -215,9 +219,29 @@ public class CompressionConfig {
 // Therefore, set the Vary header to keep proxies happy
 ResponseUtil.addVaryFieldName(responseHeaders, "accept-encoding");
 
-// Check if browser support gzip encoding
-MessageBytes acceptEncodingMB = 
request.getMimeHeaders().getValue("accept-encoding");
-if ((acceptEncodingMB == null) || (acceptEncodingMB.indexOf("gzip") == 
-1)) {
+// Check if user-agent supports gzip encoding
+// Only interested in whether gzip encoding is supported. Other
+// encodings and weights can be ignored.
+Enumeration headerValues = 
request.getMimeHeaders().values("accept-encoding");
+boolean foundGzip = false;
+while (!foundGzip && headerValues.hasMoreElements()) {
+List acceptEncodings = null;
+try {
+acceptEncodings = AcceptEncoding.parse(new 
StringReader(headerValues.nextElement()));
+} catch (IOException ioe) {
+// If there is a problem reading the header, disable 
compression
+return false;
+}
+
+for (AcceptEncoding acceptEncoding : acceptEncodings) {
+if ("gzip".equalsIgnoreCase(acceptEncoding.getEncoding())) {
+foundGzip = true;
+break;
+}
+}
+}
+
+if (!foundGzip) {
 return false;
 }
 
diff --git a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java 
b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
new file mode 100644
index 000..ee145c6
--- /dev/null
+++ b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
@@ -0,0 +1,75 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.tomcat.util.http.parser;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AcceptEncoding {
+
+private final String encoding;
+private final double quality;
+
+protected AcceptEncoding(String encoding, double quality) {
+this.encoding = encoding;
+this.quality = quality;
+}
+
+public String getEncoding() {
+return encoding;
+}
+
+public double getQuality() {
+return quality;
+}
+
+

[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 6766747  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63737
6766747 is described below

commit 6766747351d86d22be697e80edecc754822383b6
Author: Mark Thomas 
AuthorDate: Tue Sep 10 20:33:14 2019 +0100

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

Correct various issues with parsing the accept-encoding header when
looking to see if gzip is supported.
 - only the first header was examined
 - xxgzip was treated as indicating support for gzip
---
 java/org/apache/coyote/CompressionConfig.java  | 30 -
 .../tomcat/util/http/parser/AcceptEncoding.java| 75 ++
 test/org/apache/coyote/TestCompressionConfig.java  | 67 +++
 webapps/docs/changelog.xml |  5 ++
 4 files changed, 174 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/CompressionConfig.java 
b/java/org/apache/coyote/CompressionConfig.java
index e921917..fd0652e 100644
--- a/java/org/apache/coyote/CompressionConfig.java
+++ b/java/org/apache/coyote/CompressionConfig.java
@@ -16,7 +16,10 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.regex.Pattern;
@@ -24,6 +27,7 @@ import java.util.regex.Pattern;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.http.ResponseUtil;
+import org.apache.tomcat.util.http.parser.AcceptEncoding;
 
 public class CompressionConfig {
 
@@ -215,9 +219,29 @@ public class CompressionConfig {
 // Therefore, set the Vary header to keep proxies happy
 ResponseUtil.addVaryFieldName(responseHeaders, "accept-encoding");
 
-// Check if browser support gzip encoding
-MessageBytes acceptEncodingMB = 
request.getMimeHeaders().getValue("accept-encoding");
-if ((acceptEncodingMB == null) || (acceptEncodingMB.indexOf("gzip") == 
-1)) {
+// Check if user-agent supports gzip encoding
+// Only interested in whether gzip encoding is supported. Other
+// encodings and weights can be ignored.
+Enumeration headerValues = 
request.getMimeHeaders().values("accept-encoding");
+boolean foundGzip = false;
+while (!foundGzip && headerValues.hasMoreElements()) {
+List acceptEncodings = null;
+try {
+acceptEncodings = AcceptEncoding.parse(new 
StringReader(headerValues.nextElement()));
+} catch (IOException ioe) {
+// If there is a problem reading the header, disable 
compression
+return false;
+}
+
+for (AcceptEncoding acceptEncoding : acceptEncodings) {
+if ("gzip".equalsIgnoreCase(acceptEncoding.getEncoding())) {
+foundGzip = true;
+break;
+}
+}
+}
+
+if (!foundGzip) {
 return false;
 }
 
diff --git a/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java 
b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
new file mode 100644
index 000..ee145c6
--- /dev/null
+++ b/java/org/apache/tomcat/util/http/parser/AcceptEncoding.java
@@ -0,0 +1,75 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.tomcat.util.http.parser;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AcceptEncoding {
+
+private final String encoding;
+private final double quality;
+
+protected AcceptEncoding(String encoding, double quality) {
+this.encoding = encoding;
+this.quality = quality;
+}
+
+public String getEncoding() {
+return encoding;
+}
+
+public double getQuality() {
+return quality;
+}
+

buildbot success in on tomcat-trunk

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 99693d43c031c9ccbe2b7a691fb7078492936def
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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



[tomcat] branch master updated (99693d4 -> 6b3a956)

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 99693d4  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63740 
xmlBase != null
 add 6b3a956  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63739

No new revisions were added by this update.

Summary of changes:
 res/bnd/tomcat-dbcp.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 2 +-
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
 webapps/docs/changelog.xml | 5 +
 6 files changed, 11 insertions(+), 6 deletions(-)


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



[Bug 63739] Automatic-Module-Names in embedded jars are language-level invalid

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63739

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

Fixed in:
- master for 9.0.25 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



[Bug 63740] Host-specific xml files are not processed when xmlBase is not null

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63740

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Thanks for the patch and the explanation.

Fixed in:
- master for 9.0.25 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



[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63740 xmlBase != null

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 99693d4  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63740 
xmlBase != null
99693d4 is described below

commit 99693d43c031c9ccbe2b7a691fb7078492936def
Author: Mark Thomas 
AuthorDate: Tue Sep 10 18:32:49 2019 +0100

Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63740 xmlBase != null

Correctly locate configuration files when a Host has an xmlBase
specified.

Patch provided by uk4sx.
---
 java/org/apache/catalina/Container.java   | 1 +
 java/org/apache/catalina/startup/ContextConfig.java   | 4 ++--
 java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
 webapps/docs/changelog.xml| 5 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/Container.java 
b/java/org/apache/catalina/Container.java
index 177b2d2..f9da61e 100644
--- a/java/org/apache/catalina/Container.java
+++ b/java/org/apache/catalina/Container.java
@@ -319,6 +319,7 @@ public interface Container extends Lifecycle {
 if (host != null && ((Host) host).getXmlBase() != null) {
 result.append(((Host) host).getXmlBase()).append('/');
 } else {
+result.append("conf/");
 if (engine != null) {
 result.append(engine.getName()).append('/');
 }
diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index b416f31..6b6928a 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -472,7 +472,7 @@ public class ContextConfig implements LifecycleListener {
 
 String hostContextFile = Container.getConfigPath(context, 
Constants.HostContextXml);
 try (ConfigurationSource.Resource contextXmlResource =
-
ConfigFileLoader.getSource().getConfResource(hostContextFile)) {
+ConfigFileLoader.getSource().getResource(hostContextFile)) 
{
 URL defaultContextUrl = contextXmlResource.getURI().toURL();
 processContextConfig(digester, defaultContextUrl, 
contextXmlResource.getInputStream());
 } catch (MalformedURLException e) {
@@ -1898,7 +1898,7 @@ public class ContextConfig implements LifecycleListener {
 }
 } else {
 String hostWebXml = Container.getConfigPath(context, 
Constants.HostWebXml);
-webXmlResource = 
ConfigFileLoader.getSource().getConfResource(hostWebXml);
+webXmlResource = 
ConfigFileLoader.getSource().getResource(hostWebXml);
 }
 } catch (IOException e) {
 // Ignore if not found
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index ca64326..68f0bc5 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -154,7 +154,7 @@ public class RewriteValve extends ValveBase {
 } else {
 String resourceName = Container.getConfigPath(getContainer(), 
resourcePath);
 try {
-ConfigurationSource.Resource resource = 
ConfigFileLoader.getSource().getConfResource(resourceName);
+ConfigurationSource.Resource resource = 
ConfigFileLoader.getSource().getResource(resourceName);
 is = resource.getInputStream();
 } catch (IOException e) {
 if (containerLog.isDebugEnabled()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a957436..61d7e56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -56,6 +56,11 @@
 RealmBase.hasRole() for given security constraints.
 (michaelo)
   
+  
+63740: Ensure configuration files are loaded correctly when 
a
+Host is configured with an xmlBase. Patch
+provided by uk4sx. (markt)
+  
 
   
   


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



[Bug 63740] Host-specific xml files are not processed when xmlBase is not null

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63740

Michael Osipov  changed:

   What|Removed |Added

Summary|BUG: host-specific xml  |Host-specific xml files are
   |files are not processed |not processed when xmlBase
   |when xmlBase is not null|is not null

-- 
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 63740] BUG: host-specific xml files are not processed when xmlBase is not null

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63740

uk...@atlas.cz changed:

   What|Removed |Added

   Severity|normal  |regression
Summary|Host-specific xml files are |BUG: host-specific xml
   |not processed when xmlBase  |files are not processed
   |is not null |when xmlBase is not null

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

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] c651cd12b23e7c64dac8d7713b0600dfde37ca85
Blamelist: Mark Thomas 

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



buildbot success in on tomcat-85-trunk

2019-09-10 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/1923

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 2a322e4e34ce8baf404d0d9e2d0d1fab76606f61
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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



[Bug 63625] Unable to start Tomcat 7.0.96 (stop by 0xc0000005)

2019-09-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63625

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #23 from Mark Thomas  ---
I've just updated Tomcat to use Commons Daemon 1.2.1 where this is fixed.

Fixed in:
- master for 9.0.25 onwards
- 8.5.x for 8.5.46 onwards
- 7.0.x for 7.0.97 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



[tomcat] branch 7.0.x updated: Update Commons Daemon to 1.2.1 (BZ 63625)

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 47f3f56  Update Commons Daemon to 1.2.1 (BZ 63625)
47f3f56 is described below

commit 47f3f562f1e7c3079322d5cf5405c68e23fbcfd7
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:21:04 2019 +0100

Update Commons Daemon to 1.2.1 (BZ 63625)
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  5 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f620925..1f4bbd1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -212,20 +212,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.0
+commons-daemon.version=1.2.1
 
-# checksum for commons-daemon-1.2.0-bin.tar.gz
+# checksum for commons-daemon-1.2.1-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=81fbbd1115d735232bbcc426d958bd8fe149c97bfe96df1549a19332afd4954f3f75c3a693f214bfef065931a1d79c528dfb2cefb1bb3628d211e1761814c23b
+commons-daemon.bin.checksum.value=ee3ba0ad34579e819ccecde372a9213ff6b5dc48dc95fb20aabc7e5bcfb02406527586c23b9e8d182c4572ee07c6f8d5f9f10db0a3d8ff3eda3f071ef8ac7dcd
 
-# checksums for commons-daemon-1.1.0-native-src.tar.gz, 
commons-daemon-1.2.0-bin-windows.zip
+# checksums for commons-daemon-1.2.1-native-src.tar.gz, 
commons-daemon-1.2.1-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=c37f506b129b8a0efface6745dcc6d0d9d3e2663d28eca0df9903301f0b9b65fd8306e361935887fb459daf0a29da6fa63ea60f742ce4e497dc53a2a2d86db12
+commons-daemon.native.src.checksum.value=d05114f4e3b6dde2519b3edf5f6915e5a587a13ad5f8d81615ff068705825a94312645eff956b3d2c400422724e890eb590615b31340e767e42ff88b81ebf6a6
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=8b6e0bb4172861338e0cb3238f6da715c3cef04a88e8bfab0cbb487ef638aa69fd34de9407b0b2ed54451fbbcbff8a999324289052a581a5d07d6f6ff84a83b6
+commons-daemon.native.win.checksum.value=62777d2424361162736b4a9b39b9fb4155760d4d7c4a3489fe1868e0912158ae126ef5f42abbd1bcca1dbf5aa6204d8d0029be7c49f93d6e1421a5173dd7
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61c2049..7c1fbf0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,6 +174,11 @@
 pick up the fix for CODEC-134. (markt)
   
   
+63625: Update to Commons Daemon 1.2.1. This corrects several
+regressions in Commons Daemon 1.2.1, most notably the Windows Service
+crashing on start when using 32-bit JVMs. (markt)
+  
+  
 63648: Update the test TLS keys and certificates used in the
 test suite to replace the keys and certificates that are about to
 expire. (markt)


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



[tomcat] branch master updated: Update Commons Daemon to 1.2.1 (BZ 63625)

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c651cd1  Update Commons Daemon to 1.2.1 (BZ 63625)
c651cd1 is described below

commit c651cd12b23e7c64dac8d7713b0600dfde37ca85
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:21:04 2019 +0100

Update Commons Daemon to 1.2.1 (BZ 63625)
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  5 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d41c1b2..a47e0e5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -175,20 +175,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.0
+commons-daemon.version=1.2.1
 
-# checksum for commons-daemon-1.2.0-bin.tar.gz
+# checksum for commons-daemon-1.2.1-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=81fbbd1115d735232bbcc426d958bd8fe149c97bfe96df1549a19332afd4954f3f75c3a693f214bfef065931a1d79c528dfb2cefb1bb3628d211e1761814c23b
+commons-daemon.bin.checksum.value=ee3ba0ad34579e819ccecde372a9213ff6b5dc48dc95fb20aabc7e5bcfb02406527586c23b9e8d182c4572ee07c6f8d5f9f10db0a3d8ff3eda3f071ef8ac7dcd
 
-# checksums for commons-daemon-1.1.0-native-src.tar.gz, 
commons-daemon-1.2.0-bin-windows.zip
+# checksums for commons-daemon-1.2.1-native-src.tar.gz, 
commons-daemon-1.2.1-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=c37f506b129b8a0efface6745dcc6d0d9d3e2663d28eca0df9903301f0b9b65fd8306e361935887fb459daf0a29da6fa63ea60f742ce4e497dc53a2a2d86db12
+commons-daemon.native.src.checksum.value=d05114f4e3b6dde2519b3edf5f6915e5a587a13ad5f8d81615ff068705825a94312645eff956b3d2c400422724e890eb590615b31340e767e42ff88b81ebf6a6
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=8b6e0bb4172861338e0cb3238f6da715c3cef04a88e8bfab0cbb487ef638aa69fd34de9407b0b2ed54451fbbcbff8a999324289052a581a5d07d6f6ff84a83b6
+commons-daemon.native.win.checksum.value=62777d2424361162736b4a9b39b9fb4155760d4d7c4a3489fe1868e0912158ae126ef5f42abbd1bcca1dbf5aa6204d8d0029be7c49f93d6e1421a5173dd7
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e781d04..a957436 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,11 @@
 Fix JSSE_OPTS quoting in catalina.bat.
 Contributed by Peter Uhnak. (fschumacher)
   
+  
+63625: Update to Commons Daemon 1.2.1. This corrects several
+regressions in Commons Daemon 1.2.1, most notably the Windows Service
+crashing on start when using 32-bit JVMs. (markt)
+  
   
 63689: Correct a regression in the fix for 63285
 that meant that when installing a service, the service display name was


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



[tomcat] branch 8.5.x updated: Update Commons Daemon to 1.2.1 (BZ 63625)

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 29b82db  Update Commons Daemon to 1.2.1 (BZ 63625)
29b82db is described below

commit 29b82db54defd52ff2c45bcbcebf96345fb15e91
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:21:04 2019 +0100

Update Commons Daemon to 1.2.1 (BZ 63625)
---
 build.properties.default   | 12 ++--
 webapps/docs/changelog.xml |  5 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1c460c8..9142f2c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -179,20 +179,20 @@ 
nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.2.0 or later -
-commons-daemon.version=1.2.0
+commons-daemon.version=1.2.1
 
-# checksum for commons-daemon-1.2.0-bin.tar.gz
+# checksum for commons-daemon-1.2.1-bin.tar.gz
 commons-daemon.bin.checksum.enabled=true
 commons-daemon.bin.checksum.algorithm=SHA-512
-commons-daemon.bin.checksum.value=81fbbd1115d735232bbcc426d958bd8fe149c97bfe96df1549a19332afd4954f3f75c3a693f214bfef065931a1d79c528dfb2cefb1bb3628d211e1761814c23b
+commons-daemon.bin.checksum.value=ee3ba0ad34579e819ccecde372a9213ff6b5dc48dc95fb20aabc7e5bcfb02406527586c23b9e8d182c4572ee07c6f8d5f9f10db0a3d8ff3eda3f071ef8ac7dcd
 
-# checksums for commons-daemon-1.1.0-native-src.tar.gz, 
commons-daemon-1.2.0-bin-windows.zip
+# checksums for commons-daemon-1.2.1-native-src.tar.gz, 
commons-daemon-1.2.1-bin-windows.zip
 commons-daemon.native.src.checksum.enabled=true
 commons-daemon.native.src.checksum.algorithm=SHA-512
-commons-daemon.native.src.checksum.value=c37f506b129b8a0efface6745dcc6d0d9d3e2663d28eca0df9903301f0b9b65fd8306e361935887fb459daf0a29da6fa63ea60f742ce4e497dc53a2a2d86db12
+commons-daemon.native.src.checksum.value=d05114f4e3b6dde2519b3edf5f6915e5a587a13ad5f8d81615ff068705825a94312645eff956b3d2c400422724e890eb590615b31340e767e42ff88b81ebf6a6
 commons-daemon.native.win.checksum.enabled=true
 commons-daemon.native.win.checksum.algorithm=SHA-512
-commons-daemon.native.win.checksum.value=8b6e0bb4172861338e0cb3238f6da715c3cef04a88e8bfab0cbb487ef638aa69fd34de9407b0b2ed54451fbbcbff8a999324289052a581a5d07d6f6ff84a83b6
+commons-daemon.native.win.checksum.value=62777d2424361162736b4a9b39b9fb4155760d4d7c4a3489fe1868e0912158ae126ef5f42abbd1bcca1dbf5aa6204d8d0029be7c49f93d6e1421a5173dd7
 
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f8e4ea..b7f2a10 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,11 @@
 Fix JSSE_OPTS quoting in catalina.bat.
 Contributed by Peter Uhnak. (fschumacher)
   
+  
+63625: Update to Commons Daemon 1.2.1. This corrects several
+regressions in Commons Daemon 1.2.1, most notably the Windows Service
+crashing on start when using 32-bit JVMs. (markt)
+  
   
 63689: Correct a regression in the fix for 63285
 that meant that when installing a service, the service display name was


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



[tomcat] branch master updated: Correct version

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new f72ae03  Correct version
f72ae03 is described below

commit f72ae033a1d1f36a782ffb7b40b9f603e801d5a7
Author: Mark Thomas 
AuthorDate: Mon Sep 9 14:33:59 2019 +0100

Correct version
---
 build.properties.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.properties.default b/build.properties.default
index ec173fd..d41c1b2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -290,7 +290,7 @@ 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
 # - provides OSGI metadata for JARs   -
 bnd.version=4.2.0
 
-# checksums for biz.aQute.bnd-4.0.0.jar, biz.aQute.bndlib-4.0.0.jar
+# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
 
bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43


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



[tomcat] branch 7.0.x updated: Correct registry entry locations for silent installs with 64-bit JVMs

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new dc2580f  Correct registry entry locations for silent installs with 
64-bit JVMs
dc2580f is described below

commit dc2580fe23df33118b6e4ef8c69d8b83805f3148
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:04:39 2019 +0100

Correct registry entry locations for silent installs with 64-bit JVMs
---
 res/tomcat.nsi | 10 +++---
 webapps/docs/changelog.xml |  5 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 58d6d57..438506e 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -822,22 +822,26 @@ Function checkJava
   IntOp $R3 $R3 << 8
   IntOp $R2 $R2 + $R3
 
-  IntCmp $R2 0x014c +1 +3 +3
+  IntCmp $R2 0x014c +1 +4 +4
   StrCpy "$Arch" "x86"
+  SetRegView 32
   Goto DonePEHeader
 
-  IntCmp $R2 0x8664 +1 +3 +3
+  IntCmp $R2 0x8664 +1 +4 +4
   StrCpy "$Arch" "x64"
+  SetRegView 64
   Goto DonePEHeader
 
-  IntCmp $R2 0x0200 +1 +3 +3
+  IntCmp $R2 0x0200 +1 +4 +4
   StrCpy "$Arch" "i64"
+  SetRegView 64
   Goto DonePEHeader
 
 WrongPEHeader:
   IfSilent +2
   MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from 
"$JvmDll"$\r$\nWill assume that the architecture is x86.'
   DetailPrint 'Cannot read PE header from "$JvmDll". Assuming the architecture 
is x86.'
+  SetRegView 32
   StrCpy "$Arch" "x86"
 
 DonePEHeader:
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6d4f8fc..61c2049 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,6 +225,11 @@
 reject them with a 400 response rather than triggering an internal 
error
 that results in a 500 response. (markt)
   
+  
+When performing a silent install with the Windows Installer, ensure 
that
+the registry entires are added to the 64-bit registry when using a
+64-bit JVM. (markt)
+  
 
   
   


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



[tomcat] branch 8.5.x updated: Correct registry entry locations for silent installs with 64-bit JVMs

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2a322e4  Correct registry entry locations for silent installs with 
64-bit JVMs
2a322e4 is described below

commit 2a322e4e34ce8baf404d0d9e2d0d1fab76606f61
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:04:39 2019 +0100

Correct registry entry locations for silent installs with 64-bit JVMs
---
 res/tomcat.nsi | 10 +++---
 webapps/docs/changelog.xml |  5 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 646487e..a4f92e4 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -823,22 +823,26 @@ Function checkJava
   IntOp $R3 $R3 << 8
   IntOp $R2 $R2 + $R3
 
-  IntCmp $R2 0x014c +1 +3 +3
+  IntCmp $R2 0x014c +1 +4 +4
   StrCpy "$Arch" "x86"
+  SetRegView 32
   Goto DonePEHeader
 
-  IntCmp $R2 0x8664 +1 +3 +3
+  IntCmp $R2 0x8664 +1 +4 +4
   StrCpy "$Arch" "x64"
+  SetRegView 64
   Goto DonePEHeader
 
-  IntCmp $R2 0x0200 +1 +3 +3
+  IntCmp $R2 0x0200 +1 +4 +4
   StrCpy "$Arch" "i64"
+  SetRegView 64
   Goto DonePEHeader
 
 WrongPEHeader:
   IfSilent +2
   MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from 
"$JvmDll"$\r$\nWill assume that the architecture is x86.'
   DetailPrint 'Cannot read PE header from "$JvmDll". Assuming the architecture 
is x86.'
+  SetRegView 32
   StrCpy "$Arch" "x86"
 
 DonePEHeader:
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a90f87..5f8e4ea 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,11 @@
 that meant that when installing a service, the service display name was
 not set. (markt)
   
+  
+When performing a silent install with the Windows Installer, ensure 
that
+the registry entires are added to the 64-bit registry when using a
+64-bit JVM. (markt)
+  
 
   
 


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



[tomcat] branch master updated: Correct registry entry locations for silent installs with 64-bit JVMs

2019-09-10 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 2c36386  Correct registry entry locations for silent installs with 
64-bit JVMs
2c36386 is described below

commit 2c363861fe7c81778893aefb33f1983f4d5176f8
Author: Mark Thomas 
AuthorDate: Tue Sep 10 09:04:39 2019 +0100

Correct registry entry locations for silent installs with 64-bit JVMs
---
 res/tomcat.nsi | 10 +++---
 webapps/docs/changelog.xml |  5 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 6f9304f..c50f084 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -823,22 +823,26 @@ Function checkJava
   IntOp $R3 $R3 << 8
   IntOp $R2 $R2 + $R3
 
-  IntCmp $R2 0x014c +1 +3 +3
+  IntCmp $R2 0x014c +1 +4 +4
   StrCpy "$Arch" "x86"
+  SetRegView 32
   Goto DonePEHeader
 
-  IntCmp $R2 0x8664 +1 +3 +3
+  IntCmp $R2 0x8664 +1 +4 +4
   StrCpy "$Arch" "x64"
+  SetRegView 64
   Goto DonePEHeader
 
-  IntCmp $R2 0x0200 +1 +3 +3
+  IntCmp $R2 0x0200 +1 +4 +4
   StrCpy "$Arch" "i64"
+  SetRegView 64
   Goto DonePEHeader
 
 WrongPEHeader:
   IfSilent +2
   MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from 
"$JvmDll"$\r$\nWill assume that the architecture is x86.'
   DetailPrint 'Cannot read PE header from "$JvmDll". Assuming the architecture 
is x86.'
+  SetRegView 32
   StrCpy "$Arch" "x86"
 
 DonePEHeader:
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c8735f1..e781d04 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,11 @@
 that meant that when installing a service, the service display name was
 not set. (markt)
   
+  
+When performing a silent install with the Windows Installer, ensure 
that
+the registry entires are added to the 64-bit registry when using a
+64-bit JVM. (markt)
+  
 
   
 


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



[GitHub] [tomcat] xiantang opened a new pull request #202: Polish. Add spaces

2019-09-10 Thread GitBox
xiantang opened a new pull request #202: Polish. Add spaces
URL: https://github.com/apache/tomcat/pull/202
 
 
   when i read `LimitLatch.java` I saw that obvious format error


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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