Re: Verifying reproducible release builds
Hi Christopher, Le 12/01/2023 à 23:24, Christopher Schultz a écrit : I spent some time today verifying that the release artifacts that Mark published the other day for 10.1.5 were indeed reproducible by me. Fortunately, they were, but it was a little bit of a process so I went ahead and documented it. https://cwiki.apache.org/confluence/display/TOMCAT/Verifying+a+Release+Build A couple of suggestions: - I'd use shasum rather than diff to compare the artifacts - if the artifacts are not identical, the diffoscope tool [1] can help identify the differences Emmanuel Bourg [1] https://diffoscope.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Align with 11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new ecc9a84aeb Align with 11.0.x
ecc9a84aeb is described below
commit ecc9a84aeb63dc266b9721a6665486aa182a4808
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:12:57 2023 +
Align with 11.0.x
---
java/org/apache/coyote/AsyncStateMachine.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 472a48b18e..fb9b2b11aa 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -481,7 +481,6 @@ class AsyncStateMachine {
sm.getString("asyncStateMachine.invalidAsyncState",
"asyncRun()", state));
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Align with 11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new fe430a5912 Align with 11.0.x
fe430a5912 is described below
commit fe430a59129ebfa1f0e961db29faab8276b7f8df
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:13:31 2023 +
Align with 11.0.x
---
java/org/apache/jasper/runtime/PageContextImpl.java | 6 ++
java/org/apache/juli/ClassLoaderLogManager.java | 12 ++--
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java
b/java/org/apache/jasper/runtime/PageContextImpl.java
index 30476ab09a..5d2ecbd4e5 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -615,10 +615,8 @@ public class PageContextImpl extends PageContext {
request.setAttribute(PageContext.EXCEPTION, t);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
-request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
-((HttpServletRequest) request).getRequestURI());
-request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
-config.getServletName());
+request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
((HttpServletRequest) request).getRequestURI());
+request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
config.getServletName());
try {
forward(errorPageURL);
} catch (IllegalStateException ise) {
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index b4ab262601..588146e6b2 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -305,24 +305,16 @@ public class ClassLoaderLogManager extends LogManager {
}
@Override
-public void readConfiguration()
-throws IOException, SecurityException {
-
+public void readConfiguration() throws IOException, SecurityException {
checkAccess();
-
readConfiguration(getClassLoader());
-
}
@Override
-public void readConfiguration(InputStream is)
-throws IOException, SecurityException {
-
+public void readConfiguration(InputStream is) throws IOException,
SecurityException {
checkAccess();
reset();
-
readConfiguration(is, getClassLoader());
-
}
@Override
-
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: Align with 10.0.x
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 330ad1e977 Align with 10.0.x
330ad1e977 is described below
commit 330ad1e977300ffc68ed8b92c86fb4aa92f73721
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:14:27 2023 +
Align with 10.0.x
---
java/org/apache/coyote/AsyncStateMachine.java| 1 -
java/org/apache/coyote/RequestInfo.java | 20 ++--
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
.../apache/coyote/http11/LocalStrings_fr.properties | 1 +
.../apache/coyote/http11/LocalStrings_ja.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/el/MethodExpressionImpl.java | 1 -
java/org/apache/jasper/JspCompilationContext.java| 6 ++
java/org/apache/jasper/runtime/PageContextImpl.java | 6 ++
java/org/apache/juli/ClassLoaderLogManager.java | 12 ++--
10 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 472a48b18e..fb9b2b11aa 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -481,7 +481,6 @@ class AsyncStateMachine {
sm.getString("asyncStateMachine.invalidAsyncState",
"asyncRun()", state));
}
-
}
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 9a6b7778b1..08b599b712 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -162,21 +162,21 @@ public class RequestInfo {
* statistic information.
*/
void updateCounters() {
-bytesReceived+=req.getBytesRead();
-bytesSent+=req.getResponse().getContentWritten();
+bytesReceived += req.getBytesRead();
+bytesSent += req.getResponse().getContentWritten();
requestCount++;
-if( req.getResponse().getStatus() >=400 ) {
+if (req.getResponse().getStatus() >= 400) {
errorCount++;
}
-long t0=req.getStartTime();
-long t1=System.currentTimeMillis();
-long time=t1-t0;
+long t0 = req.getStartTime();
+long t1 = System.currentTimeMillis();
+long time = t1 - t0;
this.lastRequestProcessingTime = time;
-processingTime+=time;
-if( maxTime < time ) {
-maxTime=time;
-maxRequestUri=req.requestURI().toString();
+processingTime += time;
+if (maxTime < time) {
+maxTime = time;
+maxRequestUri = req.requestURI().toString();
}
}
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 9bfbcdbc82..e822c29af9 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -204,7 +204,7 @@ public abstract class AbstractAjpProtocol extends
AbstractProtocol {
private int packetSize = Constants.MAX_PACKET_SIZE;
public int getPacketSize() { return packetSize; }
public void setPacketSize(int packetSize) {
-if(packetSize < Constants.MAX_PACKET_SIZE) {
+if (packetSize < Constants.MAX_PACKET_SIZE) {
this.packetSize = Constants.MAX_PACKET_SIZE;
} else {
this.packetSize = packetSize;
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index bbf6464b8f..16453c4c91 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=La requête
contenait un en-têt
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
http11processor.response.finish=Erreur en finissant la réponse
+http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
http11processor.socket.info=Exception pendant la requête d'information sur le
socket.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 28b31127a2..c77d8069aa 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLe
[tomcat] branch 10.1.x updated: 10.1.x is no longer the main branch
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3b0af7cd7f 10.1.x is no longer the main branch
3b0af7cd7f is described below
commit 3b0af7cd7ff6bb0532677969d72cadee63d42da1
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:25:50 2023 +
10.1.x is no longer the main branch
---
java/org/apache/tomcat/buildutil/translate/Import.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 0c6b8eeefe..6ce869941d 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -43,12 +43,8 @@ public class Import {
private static void processFile(File f) throws IOException {
String language = Utils.getLanguage(f.getName());
-// Skip the original
-if (language.length() == 0) {
-// Comment this line out if the originals need to be imported.
-return;
-}
-
+// Unlike the main branch, don't skip the original so we can import
+// updates to the English translations
Properties props = Utils.load(f);
Object[] objKeys = props.keySet().toArray();
Arrays.sort(objKeys);
-
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: Branch name update
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 0220c6d577 Branch name update
0220c6d577 is described below
commit 0220c6d577e78b1266fb8e777639b426a800adc3
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:32:53 2023 +
Branch name update
---
java/org/apache/tomcat/buildutil/translate/Import.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index b7b909cb18..384387461c 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -43,7 +43,7 @@ public class Import {
private static void processFile(File f) throws IOException {
String language = Utils.getLanguage(f.getName());
-// Unlike the master branch, don't skip the original so we can import
+// Unlike the main branch, don't skip the original so we can import
// updates to the English translations
Properties props = Utils.load(f);
Object[] objKeys = props.keySet().toArray();
-
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: Branch name update
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 92b8bdf60b Branch name update
92b8bdf60b is described below
commit 92b8bdf60b9fbf6ad85b7e7f08b153240ef5fe07
Author: Mark Thomas
AuthorDate: Sun Jan 15 17:32:53 2023 +
Branch name update
---
java/org/apache/tomcat/buildutil/translate/Import.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java
b/java/org/apache/tomcat/buildutil/translate/Import.java
index b7b909cb18..384387461c 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -43,7 +43,7 @@ public class Import {
private static void processFile(File f) throws IOException {
String language = Utils.getLanguage(f.getName());
-// Unlike the master branch, don't skip the original so we can import
+// Unlike the main branch, don't skip the original so we can import
// updates to the English translations
Properties props = Utils.load(f);
Object[] objKeys = props.keySet().toArray();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb2_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/629 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] fe430a59129ebfa1f0e961db29faab8276b7f8df Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
