Reproducible builds
Hi all, Over the last few days I have been looking at making the Tomcat builds (more) reproducible. I have currently reached the stage where sequential builds on my local machine produce identical output. There are several caveats 1. Some of the embedded JARs can vary between runs due to a Bnd issue. That has been reported to the Bnd project and should be fixed shortly. 2. The current Windows exe signing process isn't repeatable. There are a few suggestions workarounds at https://reproducible-builds.org/ and I need to discuss these with the provider of the code signing service the ASF uses (DigiCert). I have a series of commits where each commit addresses a specific issue. I need to get them committed and back-ported and then I plan to look at repeatability cross-platform. I'm not sure if that is a solvable problem for the Tomcat build but I want to take a look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Make bnd processed JARs reproducible
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 49e13cc Reproducible builds: Make bnd processed JARs reproducible
49e13cc is described below
commit 49e13cc363909b2bf4841315cab520eeb6fbaa3c
Author: Mark Thomas
AuthorDate: Thu Mar 18 12:15:55 2021 +
Reproducible builds: Make bnd processed JARs reproducible
---
res/bnd/build-defaults.bnd | 5 +
1 file changed, 5 insertions(+)
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index 2eec204..b7ddb81 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -30,4 +30,9 @@ X-Compile-Target-JDK: ${compile.target}
-noclassforname: true
+-reproducible: true
+-noextraheaders: true
+
+-removeheaders: DSTAMP,TODAY,TSTAMP
+
module.name: org.apache.${replace;${Bundle-Name};-;.}
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (3d3622b -> ab72d91)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3d3622b Additional fix for BZ 65179 add ab72d91 Reproducible builds: Make bnd processed JARs reproducible No new revisions were added by this update. Summary of changes: res/bnd/build-defaults.bnd | 5 + 1 file changed, 5 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Make non-bnd processed JARs reproducible
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 3149bef Reproducible builds: Make non-bnd processed JARs reproducible 3149bef is described below commit 3149befcb31301bc1eb115440858d34ae8adc516 Author: Mark Thomas AuthorDate: Thu Mar 18 12:23:35 2021 + Reproducible builds: Make non-bnd processed JARs reproducible --- build.properties.default | 4 build.xml| 15 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 3e6b261..3878450 100644 --- a/build.properties.default +++ b/build.properties.default @@ -29,6 +29,10 @@ version.build=5 version.patch=0 version.suffix=-dev +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Source control flags - git.branch=master diff --git a/build.xml b/build.xml index 8338af0..aa727ae 100644 --- a/build.xml +++ b/build.xml @@ -266,6 +266,7 @@ + @@ -990,6 +991,11 @@ + + + + + + + + @@ -3698,7 +3708,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - + @@ -3706,9 +3716,10 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Reproducible builds: Make non-bnd processed JARs reproducible
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 8411469 Reproducible builds: Make non-bnd processed JARs reproducible 8411469 is described below commit 84114698faaa618d8deb26d9101b2436a38f3317 Author: Mark Thomas AuthorDate: Thu Mar 18 12:23:35 2021 + Reproducible builds: Make non-bnd processed JARs reproducible --- build.properties.default | 4 build.xml| 15 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index a0355eb..2103fb9 100644 --- a/build.properties.default +++ b/build.properties.default @@ -29,6 +29,10 @@ version.build=45 version.patch=0 version.suffix=-dev +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Source control flags - git.branch=master diff --git a/build.xml b/build.xml index 2593c4c..99300f1 100644 --- a/build.xml +++ b/build.xml @@ -261,6 +261,7 @@ + @@ -985,6 +986,11 @@ + + + + + + + + @@ -3666,7 +3676,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - + @@ -3674,9 +3684,10 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + - + - 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: Reproducible builds: Make non-bnd processed JARs reproducible
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 cbf0e27 Reproducible builds: Make non-bnd processed JARs reproducible cbf0e27 is described below commit cbf0e272e068225533cff04306d2a62f6b88869b Author: Mark Thomas AuthorDate: Thu Mar 18 12:23:35 2021 + Reproducible builds: Make non-bnd processed JARs reproducible --- build.properties.default | 4 build.xml| 15 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index e45fe99..5cc548d 100644 --- a/build.properties.default +++ b/build.properties.default @@ -29,6 +29,10 @@ version.build=65 version.patch=0 version.suffix=-dev +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Source control flags - git.branch=8.5.x diff --git a/build.xml b/build.xml index 3486a26..4560387 100644 --- a/build.xml +++ b/build.xml @@ -260,6 +260,7 @@ + @@ -732,6 +733,11 @@ + + + + + + + + @@ -3291,7 +3301,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - + @@ -3299,9 +3309,10 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Make Graal processed JARs reproducible
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 368f8c4 Reproducible builds: Make Graal processed JARs reproducible 368f8c4 is described below commit 368f8c4958c209f6f5b1f1394a047ed711ed843a Author: Mark Thomas AuthorDate: Thu Mar 18 12:52:19 2021 + Reproducible builds: Make Graal processed JARs reproducible --- build.xml | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index aa727ae..0ce088b 100644 --- a/build.xml +++ b/build.xml @@ -80,6 +80,7 @@ + @@ -3757,8 +3758,15 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Reproducible builds: Make Graal processed JARs reproducible
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new f33ebf3 Reproducible builds: Make Graal processed JARs reproducible f33ebf3 is described below commit f33ebf31700680a4c2126f00dd2f5fbd49bde551 Author: Mark Thomas AuthorDate: Thu Mar 18 12:52:19 2021 + Reproducible builds: Make Graal processed JARs reproducible --- build.xml | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 99300f1..9ab1864 100644 --- a/build.xml +++ b/build.xml @@ -76,6 +76,7 @@ + @@ -3725,8 +3726,15 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Make i18n JARs reproducible
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 2aa6464 Reproducible builds: Make i18n JARs reproducible 2aa6464 is described below commit 2aa646470ae9ec1e2b42930f19099544156c9386 Author: Mark Thomas AuthorDate: Thu Mar 18 14:47:31 2021 + Reproducible builds: Make i18n JARs reproducible --- build.xml | 74 --- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/build.xml b/build.xml index 0ce088b..710d962 100644 --- a/build.xml +++ b/build.xml @@ -996,6 +996,7 @@ files placed in JARs --> + @@ -1185,96 +1186,115 @@ addOSGi="true" /> - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Reproducible builds: Make i18n JARs reproducible
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 7b4c116 Reproducible builds: Make i18n JARs reproducible 7b4c116 is described below commit 7b4c116418232d49e19f6078d988d09974beda5c Author: Mark Thomas AuthorDate: Thu Mar 18 14:47:31 2021 + Reproducible builds: Make i18n JARs reproducible --- build.xml | 74 --- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/build.xml b/build.xml index 9ab1864..f3bc2f8 100644 --- a/build.xml +++ b/build.xml @@ -991,6 +991,7 @@ files placed in JARs --> + @@ -1174,96 +1175,115 @@ addOSGi="true" /> - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - + - 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: Reproducible builds: Make i18n JARs reproducible
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 d2b6c69 Reproducible builds: Make i18n JARs reproducible d2b6c69 is described below commit d2b6c69838570db0264b68b7dea356287d2fb340 Author: Mark Thomas AuthorDate: Thu Mar 18 14:47:31 2021 + Reproducible builds: Make i18n JARs reproducible --- build.xml | 58 +- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/build.xml b/build.xml index 4560387..992961f 100644 --- a/build.xml +++ b/build.xml @@ -737,6 +737,7 @@ files placed in JARs --> + @@ -894,76 +895,91 @@ filesId="files.tomcat-dbcp" /> - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Make jdbc-pool JAR reproducible
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 f558a19 Reproducible builds: Make jdbc-pool JAR reproducible f558a19 is described below commit f558a1984ea60318e7d3405b1fbe2a246edc49b4 Author: Mark Thomas AuthorDate: Thu Mar 18 16:05:44 2021 + Reproducible builds: Make jdbc-pool JAR reproducible --- build.xml | 1 + modules/jdbc-pool/build.properties.default | 4 modules/jdbc-pool/build.xml| 20 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 710d962..1bc68b7 100644 --- a/build.xml +++ b/build.xml @@ -1551,6 +1551,7 @@ + diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default index 753da45..6131bd7 100644 --- a/modules/jdbc-pool/build.properties.default +++ b/modules/jdbc-pool/build.properties.default @@ -29,6 +29,10 @@ version.build=0 version.patch=1 version.suffix= +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 6d41d22..3bc8c3d 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -85,6 +85,9 @@ + + + @@ -157,8 +160,21 @@ + + + + + + + + + + - + + + @@ -166,7 +182,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Reproducible builds: Make jdbc-pool JAR reproducible
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new d988741 Reproducible builds: Make jdbc-pool JAR reproducible d988741 is described below commit d9887416e690eddc1dad31816ae3a18f355ed3f1 Author: Mark Thomas AuthorDate: Thu Mar 18 16:05:44 2021 + Reproducible builds: Make jdbc-pool JAR reproducible --- build.xml | 1 + modules/jdbc-pool/build.properties.default | 4 modules/jdbc-pool/build.xml| 20 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index f3bc2f8..d7a0353 100644 --- a/build.xml +++ b/build.xml @@ -1529,6 +1529,7 @@ + diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default index 753da45..6131bd7 100644 --- a/modules/jdbc-pool/build.properties.default +++ b/modules/jdbc-pool/build.properties.default @@ -29,6 +29,10 @@ version.build=0 version.patch=1 version.suffix= +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index 6d41d22..3bc8c3d 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -85,6 +85,9 @@ + + + @@ -157,8 +160,21 @@ + + + + + + + + + + - + + + @@ -166,7 +182,7 @@ - + - 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: Reproducible builds: Make jdbc-pool JAR reproducible
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 760f357 Reproducible builds: Make jdbc-pool JAR reproducible 760f357 is described below commit 760f357d590290b0d67fcaef31a255be4721e629 Author: Mark Thomas AuthorDate: Thu Mar 18 16:05:44 2021 + Reproducible builds: Make jdbc-pool JAR reproducible --- build.xml | 1 + modules/jdbc-pool/build.properties.default | 4 modules/jdbc-pool/build.xml| 20 ++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 992961f..437d300 100644 --- a/build.xml +++ b/build.xml @@ -1225,6 +1225,7 @@ + diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default index 2107872..1e1d03a 100644 --- a/modules/jdbc-pool/build.properties.default +++ b/modules/jdbc-pool/build.properties.default @@ -29,6 +29,10 @@ version.build=0 version.patch=1 version.suffix= +# - Reproducible builds - +# Uncomment and set to current time for reproducible builds +#ant.tstamp.now.iso=2021-03-18T06:00:00Z + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml index e56c1e9..c9a2444 100644 --- a/modules/jdbc-pool/build.xml +++ b/modules/jdbc-pool/build.xml @@ -85,6 +85,9 @@ + + + @@ -157,8 +160,21 @@ + + + + + + + + + + - + + + @@ -166,7 +182,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: XReflectionIntrospectionUtils.java
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 b2b5773 Reproducible builds: XReflectionIntrospectionUtils.java
b2b5773 is described below
commit b2b57736572eb1385130d32e5d291ee5558f2e3b
Author: Mark Thomas
AuthorDate: Thu Mar 18 19:50:00 2021 +
Reproducible builds: XReflectionIntrospectionUtils.java
---
.../util/xreflection/ObjectReflectionPropertyInspector.java | 3 ++-
.../apache/tomcat/util/xreflection/ReflectionProperty.java | 12 +++-
.../apache/tomcat/util/xreflection/SetPropertyClass.java| 13 +
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index 520e6a0..514aeb4 100644
---
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -64,7 +65,7 @@ public final class ObjectReflectionPropertyInspector {
private static final Set> getKnownClasses() throws
ClassNotFoundException {
return
-Collections.unmodifiableSet(new HashSet<>(
+Collections.unmodifiableSet(new LinkedHashSet<>(
Arrays.asList(
Class.forName("org.apache.catalina.authenticator.jaspic.SimpleAuthConfigProvider"),
Class.forName("org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations$Property"),
diff --git a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
index f74f7c0..46d4447 100644
--- a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
+++ b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.util.xreflection;
import java.lang.reflect.Method;
import java.net.InetAddress;
-final class ReflectionProperty {
+final class ReflectionProperty implements Comparable {
private final String clazz;
private final String propertyName;
private final Class propertyType;
@@ -116,4 +116,14 @@ final class ReflectionProperty {
sb.append('}');
return sb.toString();
}
+
+@Override
+public int compareTo(ReflectionProperty o) {
+// Class then property name
+int result = clazz.compareTo(o.clazz);
+if (result == 0) {
+result = propertyName.compareTo(o.propertyName);
+}
+return result;
+}
}
diff --git a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
index 55a68c4..389a483 100644
--- a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
+++ b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
@@ -18,12 +18,12 @@ package org.apache.tomcat.util.xreflection;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.HashSet;
import java.util.Set;
+import java.util.TreeSet;
import org.apache.tomcat.util.IntrospectionUtils;
-final class SetPropertyClass {
+final class SetPropertyClass implements Comparable {
static final String OBJECT_VAR_NAME = "o";
static final String NAME_VAR_NAME = "name";
@@ -32,8 +32,8 @@ final class SetPropertyClass {
private final SetPropertyClass parent;
private final Class clazz;
-private Set children = new HashSet<>();
-private Set properties = new HashSet<>();
+private Set children = new TreeSet<>();
+private Set properties = new TreeSet<>();
private final boolean isAbstract;
private final Method genericSetPropertyMethod;
private final Method genericGetPropertyMethod;
@@ -433,4 +433,9 @@ final class SetPropertyClass {
return code.toString();
}
+
+@Override
+public int compareTo(SetPropertyClass o) {
+return clazz.getName().compareTo(o.clazz.getName());
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Binary packages (excluding installer)
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 c06dbae Reproducible builds: Binary packages (excluding installer)
c06dbae is described below
commit c06dbae706e1907b961f5f36970e364744679c0c
Author: Mark Thomas
AuthorDate: Thu Mar 18 20:53:49 2021 +
Reproducible builds: Binary packages (excluding installer)
---
build.xml | 76 +--
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 1bc68b7..44a021b 100644
--- a/build.xml
+++ b/build.xml
@@ -1773,6 +1773,12 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -1823,6 +1835,12 @@
encoding="ISO-8859-1" fixlast="false" >
+
+
+
+
+
+
@@ -2444,7 +2462,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2469,7 +2487,14 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
+
+
+
+
@@ -2720,7 +2745,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2753,8 +2784,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2780,6 +2817,7 @@ skip.installer property in build.properties" />
+
@@ -2820,7 +2858,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
+
@@ -2838,6 +2883,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2886,6 +2936,12 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2909,6 +2965,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2933,7 +2994,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2949,6 +3016,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (d988741 -> f79d84f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d988741 Reproducible builds: Make jdbc-pool JAR reproducible new 974af56 Reproducible builds: XReflectionIntrospectionUtils.java new f79d84f Reproducible builds: Binary packages (excluding installer) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 76 +- .../ObjectReflectionPropertyInspector.java | 3 +- .../util/xreflection/ReflectionProperty.java | 12 +++- .../tomcat/util/xreflection/SetPropertyClass.java | 13 ++-- 4 files changed, 96 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Reproducible builds: XReflectionIntrospectionUtils.java
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 974af564eb4e0e0fe873b3ae0f80f0ed29d32da8
Author: Mark Thomas
AuthorDate: Thu Mar 18 19:50:00 2021 +
Reproducible builds: XReflectionIntrospectionUtils.java
---
.../util/xreflection/ObjectReflectionPropertyInspector.java | 3 ++-
.../apache/tomcat/util/xreflection/ReflectionProperty.java | 12 +++-
.../apache/tomcat/util/xreflection/SetPropertyClass.java| 13 +
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index dc101cb..f27a27f 100644
---
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -64,7 +65,7 @@ public final class ObjectReflectionPropertyInspector {
private static final Set> getKnownClasses() throws
ClassNotFoundException {
return
-Collections.unmodifiableSet(new HashSet<>(
+Collections.unmodifiableSet(new LinkedHashSet<>(
Arrays.asList(
Class.forName("org.apache.catalina.authenticator.jaspic.SimpleAuthConfigProvider"),
Class.forName("org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations$Property"),
diff --git a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
index f74f7c0..46d4447 100644
--- a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
+++ b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.util.xreflection;
import java.lang.reflect.Method;
import java.net.InetAddress;
-final class ReflectionProperty {
+final class ReflectionProperty implements Comparable {
private final String clazz;
private final String propertyName;
private final Class propertyType;
@@ -116,4 +116,14 @@ final class ReflectionProperty {
sb.append('}');
return sb.toString();
}
+
+@Override
+public int compareTo(ReflectionProperty o) {
+// Class then property name
+int result = clazz.compareTo(o.clazz);
+if (result == 0) {
+result = propertyName.compareTo(o.propertyName);
+}
+return result;
+}
}
diff --git a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
index 55a68c4..389a483 100644
--- a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
+++ b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
@@ -18,12 +18,12 @@ package org.apache.tomcat.util.xreflection;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.HashSet;
import java.util.Set;
+import java.util.TreeSet;
import org.apache.tomcat.util.IntrospectionUtils;
-final class SetPropertyClass {
+final class SetPropertyClass implements Comparable {
static final String OBJECT_VAR_NAME = "o";
static final String NAME_VAR_NAME = "name";
@@ -32,8 +32,8 @@ final class SetPropertyClass {
private final SetPropertyClass parent;
private final Class clazz;
-private Set children = new HashSet<>();
-private Set properties = new HashSet<>();
+private Set children = new TreeSet<>();
+private Set properties = new TreeSet<>();
private final boolean isAbstract;
private final Method genericSetPropertyMethod;
private final Method genericGetPropertyMethod;
@@ -433,4 +433,9 @@ final class SetPropertyClass {
return code.toString();
}
+
+@Override
+public int compareTo(SetPropertyClass o) {
+return clazz.getName().compareTo(o.clazz.getName());
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Reproducible builds: Binary packages (excluding installer)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f79d84fecbcb5bea7cf52fe0e0f84675940940a1
Author: Mark Thomas
AuthorDate: Thu Mar 18 20:53:49 2021 +
Reproducible builds: Binary packages (excluding installer)
---
build.xml | 76 +--
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index d7a0353..e975fa6 100644
--- a/build.xml
+++ b/build.xml
@@ -1751,6 +1751,12 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -1801,6 +1813,12 @@
encoding="ISO-8859-1" fixlast="false" >
+
+
+
+
+
+
@@ -2422,7 +2440,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2447,7 +2465,14 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
+
+
+
+
@@ -2698,7 +2723,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2731,8 +2762,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2758,6 +2795,7 @@ skip.installer property in build.properties" />
+
@@ -2798,7 +2836,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
+
@@ -2816,6 +2861,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2864,6 +2914,12 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2887,6 +2943,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2911,7 +2972,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2927,6 +2994,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
-
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: Reproducible builds: Binary packages (excluding installer)
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 1df6d44 Reproducible builds: Binary packages (excluding installer)
1df6d44 is described below
commit 1df6d44d7653924f98b48ad66c86c497986dfc92
Author: Mark Thomas
AuthorDate: Thu Mar 18 20:53:49 2021 +
Reproducible builds: Binary packages (excluding installer)
---
build.xml | 70 +--
1 file changed, 68 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 437d300..212895b 100644
--- a/build.xml
+++ b/build.xml
@@ -1401,6 +1401,12 @@
encoding="ISO-8859-1" fixlast="false" >
+
+
+
+
+
+
@@ -1416,6 +1422,12 @@
encoding="ISO-8859-1" fixlast="false" >
+
+
+
+
+
+
@@ -2099,7 +2111,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2124,7 +2136,14 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
+
+
+
+
@@ -2382,7 +2401,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2415,8 +2440,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2442,6 +2473,7 @@ skip.installer property in build.properties" />
+
@@ -2482,7 +2514,14 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
+
@@ -2500,6 +2539,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2548,6 +2592,12 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2571,6 +2621,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
@@ -2595,7 +2650,13 @@ skip.installer property in build.properties" />
+
+
+
+
+
+
@@ -2611,6 +2672,11 @@ skip.installer property in build.properties" />
+
+
+
+
+
-
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: Add missing string
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 c9c3b13 Add missing string
c9c3b13 is described below
commit c9c3b131933353c8d2f1a7ff8c9ceca02a42921f
Author: Mark Thomas
AuthorDate: Tue Mar 16 16:10:10 2021 +
Add missing string
---
java/org/apache/jasper/resources/LocalStrings.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 3fa55ad..670ea4e 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -298,6 +298,7 @@ jsp.warning.noJarScanner=Warning: No
org.apache.tomcat.JarScanner set in Servlet
jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam
quoteAttributeEL. Will use the default value of "false"
jsp.warning.recompileOnFail=Warning: Invalid value for the initParam
recompileOnFail. Will use the default value of "false"
jsp.warning.suppressSmap=Warning: Invalid value for the initParam
suppressSmap. Will use the default value of "false"
+jsp.warning.trimspaces=Warning: Invalid value for the initParam trimSpaces.
Will use the default value of "false"
jsp.warning.unknown.element.in.attribute=Unknown element [{0}] in attribute
jsp.warning.unknown.element.in.function=Unknown element [{0}] in function
jsp.warning.unknown.element.in.initParam=Unknown element [{0}] in validator''s
init-param
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix indent
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 ced745d Fix indent
ced745d is described below
commit ced745df57818ea280942664991e51d287fd9431
Author: Mark Thomas
AuthorDate: Fri Mar 19 09:36:33 2021 +
Fix indent
---
build.xml | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/build.xml b/build.xml
index 44a021b..3aabf2e 100644
--- a/build.xml
+++ b/build.xml
@@ -2463,37 +2463,37 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (f79d84f -> f525bcf)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from f79d84f Reproducible builds: Binary packages (excluding installer) add f525bcf Fix indent No new revisions were added by this update. Summary of changes: build.xml | 62 +++--- 1 file changed, 31 insertions(+), 31 deletions(-) - 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: Fix indent
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 b30f045 Fix indent
b30f045 is described below
commit b30f045fa60c71bb9a0da3575ca4af6d3fc1ec56
Author: Mark Thomas
AuthorDate: Fri Mar 19 09:36:33 2021 +
Fix indent
---
build.xml | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/build.xml b/build.xml
index 212895b..2b63398 100644
--- a/build.xml
+++ b/build.xml
@@ -2112,37 +2112,37 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Windows installer
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 c3215cf Reproducible builds: Windows installer c3215cf is described below commit c3215cf9e3652a7c37b45580ccbb77d5233f47a5 Author: Mark Thomas AuthorDate: Fri Mar 19 15:22:41 2021 + Reproducible builds: Windows installer --- build.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 3aabf2e..60fd8cc 100644 --- a/build.xml +++ b/build.xml @@ -2610,6 +2610,10 @@ skip.installer property in build.properties" /> encoding="ISO-8859-1" fixlast="false" > + + + + - + + + +
[tomcat] branch 9.0.x updated (f525bcf -> 7acc5c9)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from f525bcf Fix indent add 7acc5c9 Reproducible builds: Windows installer No new revisions were added by this update. Summary of changes: build.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) - 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: Reproducible builds: Windows installer
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 cc45875 Reproducible builds: Windows installer cc45875 is described below commit cc458751c4d7f6d9b17c5c8ded3f41cf608e35d1 Author: Mark Thomas AuthorDate: Fri Mar 19 15:22:41 2021 + Reproducible builds: Windows installer --- build.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 2b63398..9c23c75 100644 --- a/build.xml +++ b/build.xml @@ -2259,6 +2259,10 @@ skip.installer property in build.properties" /> encoding="ISO-8859-1" fixlast="false" > + + + + - + + + +
[tomcat] branch master updated: Update changelog
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 a57f5bc Update changelog a57f5bc is described below commit a57f5bcddfcc65ad4d1a42e7e3d03e9be05bdfc5 Author: Mark Thomas AuthorDate: Fri Mar 19 15:25:36 2021 + Update changelog --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b857721..35ee2ca 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,15 @@ + + + +Implement the first phase of reproducible builds. Sequential builds on +the same machine now produce identical output provided that the Ant +property ant.tstamp.now.iso is set. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update changelog
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new a5d34a0 Update changelog a5d34a0 is described below commit a5d34a049e58fd018f9228749b83411f94367f15 Author: Mark Thomas AuthorDate: Fri Mar 19 15:25:36 2021 + Update changelog --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index bad4825..7b03cc8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -151,6 +151,15 @@ + + + +Implement the first phase of reproducible builds. Sequential builds on +the same machine now produce identical output provided that the Ant +property ant.tstamp.now.iso is set. (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: Update changelog
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 769ab82 Update changelog 769ab82 is described below commit 769ab824966282e8ccc54379010c9f7cec80ceea Author: Mark Thomas AuthorDate: Fri Mar 19 15:25:36 2021 + Update changelog --- webapps/docs/changelog.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7ce868d..e2162ca 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -139,6 +139,15 @@ + + + +Implement the first phase of reproducible builds. Sequential builds on +the same machine now produce identical output provided that the Ant +property ant.tstamp.now.iso is set. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Sync on correct object - should fix TestCancelledUpload failures
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 043850d Sync on correct object - should fix TestCancelledUpload
failures
043850d is described below
commit 043850ddf6b0f41867a27f6c98d1cd2acd40a8b2
Author: Mark Thomas
AuthorDate: Fri Mar 19 16:50:37 2021 +
Sync on correct object - should fix TestCancelledUpload failures
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 37b1533..b577d6e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1191,7 +1191,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private final void swallowUnread() throws IOException {
if (inBuffer != null) {
-synchronized (inputBuffer) {
+synchronized (inBuffer) {
closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Sync on correct object - should fix TestCancelledUpload failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f0a258a Sync on correct object - should fix TestCancelledUpload
failures
f0a258a is described below
commit f0a258ad4ae19a736885ea5fc563b6733564045a
Author: Mark Thomas
AuthorDate: Fri Mar 19 16:50:37 2021 +
Sync on correct object - should fix TestCancelledUpload failures
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 1cb6f97..ad637fa 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1191,7 +1191,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private final void swallowUnread() throws IOException {
if (inBuffer != null) {
-synchronized (inputBuffer) {
+synchronized (inBuffer) {
closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
-
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: Sync on correct object - should fix TestCancelledUpload failures
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 39e8ffc Sync on correct object - should fix TestCancelledUpload
failures
39e8ffc is described below
commit 39e8ffc5ae9dbe6001d7f107616714589d8c9479
Author: Mark Thomas
AuthorDate: Fri Mar 19 16:50:37 2021 +
Sync on correct object - should fix TestCancelledUpload failures
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 6c2626e..13ea2b5 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1253,7 +1253,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private final void swallowUnread() throws IOException {
if (inBuffer != null) {
-synchronized (inputBuffer) {
+synchronized (inBuffer) {
closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on pull request #406: Improve the SSLValve so it is able to handle the ssl_client_escaped_cert header from Nginx
michael-o commented on pull request #406: URL: https://github.com/apache/tomcat/pull/406#issuecomment-803115444 The change on HTTPd is now on trunk. It does not use the NGINX approach. -- 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65181] Tomcat Native library with OpenSSL Engine private key loading
https://bz.apache.org/bugzilla/show_bug.cgi?id=65181 Christopher Schultz changed: What|Removed |Added Severity|major |enhancement --- Comment #2 from Christopher Schultz --- Changing back to "enhancement" since that's what this is. It may be of major importance to YOU but this is _not_ a bug. -- 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 65181] Tomcat Native library with OpenSSL Engine private key loading
https://bz.apache.org/bugzilla/show_bug.cgi?id=65181 --- Comment #3 from Christopher Schultz --- A quick review: >... >&& tcn_ssl_engine && >(c->keys[idx] = ENGINE_load_private_key(tcn_ssl_engine, key_file, >NULL, NULL)) == NULL This will attempt to use the tcn_ssl_engine pointer to load the private key, but only if the pointer is non-zero. If you mean NULL, you should explicitly compare the pointer to NULL. Otherwise the patch looks reasonable to me. I assume you've tested it to make sure it still works with a "standard" configuration? -- 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 65181] Tomcat Native library with OpenSSL Engine private key loading
https://bz.apache.org/bugzilla/show_bug.cgi?id=65181 --- Comment #4 from Edin Hodzic --- Thanks for the updates, the review and the comments. The NULL comparison I can add. The change was tested with and without the SSL engine in the configuration. Is there anything else I can do to get the patch included in the source? Could I submit a pull request somehow? -- 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
