[tomcat] 02/02: Revert "Temporary workaround for broken DigiCert ONE REST API"
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
commit 1083bce76d6b6bff26fd388dfc3933ef18ea48c9
Author: Mark Thomas
AuthorDate: Tue Mar 8 16:42:46 2022 +
Revert "Temporary workaround for broken DigiCert ONE REST API"
This reverts commit 7c54e369e87f1eedd50e42f895c2b0cd058e30b8.
---
build.properties.default | 12 ++--
build.xml| 2 --
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index fd4ed58..64cb22e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -84,19 +84,11 @@ gpg.exec=/path/to/gpg
# Code signing of Windows installer
# See https://infra.apache.org/digicert-use.html for setup instructions
do.codesigning=false
-#codesigning.alias=Tomcat-PMC-cert-2021-11
+codesigning.alias=Tomcat-PMC-cert-2021-11
codesigning.digest=SHA-512
-#codesigning.storetype=DIGICERTONE
+codesigning.storetype=DIGICERTONE
# Set codesigning.storepass in build.properties with the following syntax
#codesigning.storepass=|/path/to/Certificate_pkcs12.p12|
-# Once DigiCert fix the broken REST API
-# - Uncomment alias & storetype above
-# - Remove the four lines below
-# - Remove the keystore field from build.xml
-codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.storepass=NONE
-codesigning.storetype=PKCS11
-codesigning.alias=Tomcat-PMC-key-2021-11
# - Settings to use when downloading files -
trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 39a8b32..8427711 100644
--- a/build.xml
+++ b/build.xml
@@ -2186,7 +2186,6 @@ skip.installer property in build.properties" />
unless="skip.installer"
depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
[tomcat] 02/02: Revert "Step 1 - merge BackLogTracker into AbstractStream"
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit aca188a85b607f5fad3457619ed453ba0b7180a7
Author: Mark Thomas
AuthorDate: Mon Sep 13 17:28:16 2021 +0100
Revert "Step 1 - merge BackLogTracker into AbstractStream"
This reverts commit 74681f56475541ff6069aadb1a88bd4d687e7446.
---
java/org/apache/coyote/http2/AbstractStream.java | 65 ---
.../apache/coyote/http2/Http2UpgradeHandler.java | 128 +
2 files changed, 107 insertions(+), 86 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractStream.java
b/java/org/apache/coyote/http2/AbstractStream.java
index d3195eb..c7374b6 100644
--- a/java/org/apache/coyote/http2/AbstractStream.java
+++ b/java/org/apache/coyote/http2/AbstractStream.java
@@ -40,9 +40,6 @@ abstract class AbstractStream {
private final Set childStreams =
Collections.newSetFromMap(new ConcurrentHashMap<>());
private long windowSize =
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
-volatile int remainingReservation;
-volatile int unusedAllocation;
-volatile boolean notifyInProgress;
AbstractStream(Integer identifier) {
this.identifier = identifier;
@@ -160,66 +157,4 @@ abstract class AbstractStream {
abstract String getConnectionId();
abstract int getWeight();
-
-
-/**
- * @return The number of bytes requiring an allocation from the
- * Connection flow control window
- */
-public int getRemainingReservation() {
-return remainingReservation;
-}
-
-/**
- *
- * @return The number of bytes allocated from the Connection flow
- * control window but not yet written
- */
-public int getUnusedAllocation() {
-return unusedAllocation;
-}
-
-/**
- * The purpose of this is to avoid the incorrect triggering of a timeout
- * for the following sequence of events:
- *
- * window update 1
- * allocation 1
- * notify 1
- * window update 2
- * allocation 2
- * act on notify 1 (using allocation 1 and 2)
- * notify 2
- * act on notify 2 (timeout due to no allocation)
- *
- *
- * @return {@code true} if a notify has been issued but the associated
- * allocation has not been used, otherwise {@code false}
- */
-public boolean isNotifyInProgress() {
-return notifyInProgress;
-}
-
-public void useAllocation() {
-unusedAllocation = 0;
-notifyInProgress = false;
-}
-
-public void startNotify() {
-notifyInProgress = true;
-}
-
-protected int allocate(int allocation) {
-if (remainingReservation >= allocation) {
-remainingReservation -= allocation;
-unusedAllocation += allocation;
-return 0;
-}
-
-int left = allocation - remainingReservation;
-unusedAllocation += remainingReservation;
-remainingReservation = 0;
-
-return left;
-}
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index b45dad0..f28ae6d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -20,9 +20,10 @@ import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.Queue;
import java.util.Set;
import java.util.TreeSet;
@@ -131,7 +132,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = getPingManager();
private volatile int newStreamsSinceLastPrune = 0;
-private final Set backLogStreams =
Collections.newSetFromMap(new ConcurrentHashMap<>());
+private final Map backLogStreams = new
ConcurrentHashMap<>();
private long backLogSize = 0;
// The time at which the connection will timeout unless data arrives before
// then. -1 means no timeout.
@@ -881,20 +882,21 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
long windowSize = getWindowSize();
if (windowSize < 1 || backLogSize > 0) {
// Has this stream been granted an allocation
-if (stream.remainingReservation == 0) {
-backLogStreams.add(stream);
-stream.remainingReservation = reservation;
+BacklogTracker tracker = backLogStreams.get(stream);
+if (tracker == null) {
+tr
[tomcat] 02/02: Revert
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 091f11ff5c31e32b8615347ec88cd97dc858885a Author: remm AuthorDate: Fri Jul 3 11:17:40 2020 +0200 Revert --- webapps/docs/changelog.xml | 8 1 file changed, 8 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 16e4fb2..fcd4cc8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -45,14 +45,6 @@ issues do not "pop up" wrt. others). --> - - - -Remove ALPN abstraction to simplify code. Tomcat now requires -Java 8 251 or 252 for TLS support. (remm) - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Revert "Avoid waste of resources due to reconstruction of objects"
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
commit 98b5abb03d2f888c8ed58f43494b47f66c2d1227
Author: Mark Thomas
AuthorDate: Thu May 14 10:11:16 2020 +0100
Revert "Avoid waste of resources due to reconstruction of objects"
This reverts commit bb788e126c9ba07e40b64ca78d92dd230c44552f.
---
.../apache/catalina/core/ApplicationContext.java | 2 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 2 +-
.../catalina/session/PersistentManagerBase.java| 2 +-
java/org/apache/juli/ClassLoaderLogManager.java| 2 +-
test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index dfd02a9..d19cdaa 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -190,7 +190,7 @@ public class ApplicationContext implements ServletContext {
/**
* Thread local data used during request dispatch.
*/
-private static final ThreadLocal dispatchData = new
ThreadLocal();
+private final ThreadLocal dispatchData = new
ThreadLocal();
/**
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index c5abeac..53ff3ea 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -92,7 +92,7 @@ public class ReplicationValve
/**
* crossContext session container
*/
-protected static ThreadLocal> crossContextSessions
=
+protected ThreadLocal> crossContextSessions =
new ThreadLocal>() ;
/**
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java
b/java/org/apache/catalina/session/PersistentManagerBase.java
index a935e4b..f4db615 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -199,7 +199,7 @@ public abstract class PersistentManagerBase extends
ManagerBase
* Session that is currently getting swapped in to prevent loading it more
* than once concurrently
*/
-private static final ThreadLocal sessionToSwapIn = new
ThreadLocal();
+private final ThreadLocal sessionToSwapIn = new
ThreadLocal();
// - Properties
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index aca6388..b3e1b5f 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -112,7 +112,7 @@ public class ClassLoaderLogManager extends LogManager {
* This prefix is used to allow using prefixes for the properties names
* of handlers and their subcomponents.
*/
-protected static ThreadLocal prefix = new ThreadLocal();
+protected ThreadLocal prefix = new ThreadLocal();
/**
diff --git a/test/org/apache/catalina/valves/Benchmarks.java
b/test/org/apache/catalina/valves/Benchmarks.java
index 2d0155f..882e7d6 100644
--- a/test/org/apache/catalina/valves/Benchmarks.java
+++ b/test/org/apache/catalina/valves/Benchmarks.java
@@ -76,14 +76,14 @@ public class Benchmarks {
return "ThreadLocals";
}
-private static ThreadLocal currentMillisLocal = new
ThreadLocal() {
+private ThreadLocal currentMillisLocal = new ThreadLocal()
{
@Override
protected Long initialValue() {
return Long.valueOf(0);
}
};
-private static ThreadLocal currentDateLocal = new
ThreadLocal();
+private ThreadLocal currentDateLocal = new ThreadLocal();
@Override
public void run() {
@@ -112,14 +112,14 @@ public class Benchmarks {
long value = 0;
}
-private static ThreadLocal currentMillisLocal = new
ThreadLocal() {
+private ThreadLocal currentMillisLocal = new
ThreadLocal() {
@Override
protected MutableLong initialValue() {
return new MutableLong();
}
};
-private static ThreadLocal currentDateLocal = new
ThreadLocal();
+private ThreadLocal currentDateLocal = new ThreadLocal();
@Override
public void run() {
@@ -149,7 +149,7 @@ public class Benchmarks {
public Date currentDate;
}
-private static ThreadLocal currentStruct = new
ThreadLocal() {
+private ThreadLocal currentStruct = new ThreadLocal() {
@Override
protected Struct initialValue() {
return new Struct();
@@ -266,33 +266,33 @@ p
