From ef1228e4d24fc43e517e2e55df15af761b69579e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 12 Sep 2024 13:13:38 +0100 Subject: [PATCH] Revert "Increase stream-cancellation-delay default to 1000 millis (#590)" This reverts commit 932a22ff496eb102a0805ee4aef24378fa5276ca. --- docs/src/main/paradox/release-notes/releases-1.1.md | 1 - http-core/src/main/resources/reference.conf | 4 ++-- http-core/src/test/resources/reference.conf | 1 - .../pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/src/main/paradox/release-notes/releases-1.1.md b/docs/src/main/paradox/release-notes/releases-1.1.md index 8ce2961e7..aa3f8b7c3 100644 --- a/docs/src/main/paradox/release-notes/releases-1.1.md +++ b/docs/src/main/paradox/release-notes/releases-1.1.md @@ -12,7 +12,6 @@ All the changes in the @ref:[1.0.x releases](releases-1.0.md) up to and includin ### Changes * Changed names of HTTP status codes 413 and 422 ([PR87](https://github.com/apache/pekko-http/pull/87)) * Parse entire HTTP chunk size ([PR528](https://github.com/apache/pekko-http/pull/528)) -* Increased default value of `pekko.http.server.stream-cancellation-delay` and `pekko.http.client.stream-cancellation-delay` from 100 to 1000 millis ([PR590](https://github.com/apache/pekko-http/pull/590)) ### Additions * Add UnsupportedContentTypeException Java DSL ([PR376](https://github.com/apache/pekko-http/pull/376)) diff --git a/http-core/src/main/resources/reference.conf b/http-core/src/main/resources/reference.conf index 4daa2f7a0..ec2c1b7d6 100644 --- a/http-core/src/main/resources/reference.conf +++ b/http-core/src/main/resources/reference.conf @@ -222,7 +222,7 @@ pekko.http { # In most cases, there should be no reason to change this setting. # # Set to 0 to disable the delay. - stream-cancellation-delay = 1000 millis + stream-cancellation-delay = 100 millis http2 { # The maximum number of request per connection concurrently dispatched to the request handler. @@ -532,7 +532,7 @@ pekko.http { # In most cases, there should be no reason to change this setting. # # Set to 0 to disable the delay. - stream-cancellation-delay = 1000 millis + stream-cancellation-delay = 100 millis } #client-settings diff --git a/http-core/src/test/resources/reference.conf b/http-core/src/test/resources/reference.conf index 1817e6c4b..90159c695 100644 --- a/http-core/src/test/resources/reference.conf +++ b/http-core/src/test/resources/reference.conf @@ -6,5 +6,4 @@ pekko { default-dispatcher.throughput = 1 } stream.materializer.debug.fuzzing-mode = off - stream.testkit.all-stages-stopped-timeout = 20 s } diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala index 37c8c5950..e1eeacba8 100644 --- a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala +++ b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala @@ -306,7 +306,6 @@ class H2SpecIntegrationSpec extends PekkoFreeSpec( executable, "-k", "-t", "-p", port.toString, - "-o", "9", "-j", junitOutput.getPath) ++ specSectionNumber.toList.map(number => s"http2/$number")