Skip to content

Commit 932a22f

Browse files
authored
Increase stream-cancellation-delay default to 1000 millis (apache#590)
1 parent 4349a03 commit 932a22f

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

docs/src/main/paradox/release-notes/releases-1.1.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ All the changes in the @ref:[1.0.x releases](releases-1.0.md) up to and includin
1212
### Changes
1313
* Changed names of HTTP status codes 413 and 422 ([PR87](https://github.com/apache/pekko-http/pull/87))
1414
* Parse entire HTTP chunk size ([PR528](https://github.com/apache/pekko-http/pull/528))
15+
* 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))
1516

1617
### Additions
1718
* Add UnsupportedContentTypeException Java DSL ([PR376](https://github.com/apache/pekko-http/pull/376))

http-core/src/main/resources/reference.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ pekko.http {
222222
# In most cases, there should be no reason to change this setting.
223223
#
224224
# Set to 0 to disable the delay.
225-
stream-cancellation-delay = 100 millis
225+
stream-cancellation-delay = 1000 millis
226226

227227
http2 {
228228
# The maximum number of request per connection concurrently dispatched to the request handler.
@@ -532,7 +532,7 @@ pekko.http {
532532
# In most cases, there should be no reason to change this setting.
533533
#
534534
# Set to 0 to disable the delay.
535-
stream-cancellation-delay = 100 millis
535+
stream-cancellation-delay = 1000 millis
536536
}
537537
#client-settings
538538

http-core/src/test/resources/reference.conf

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ pekko {
66
default-dispatcher.throughput = 1
77
}
88
stream.materializer.debug.fuzzing-mode = off
9+
stream.testkit.all-stages-stopped-timeout = 20 s
910
}

http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala

+1
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ class H2SpecIntegrationSpec extends PekkoFreeSpec(
306306
executable,
307307
"-k", "-t",
308308
"-p", port.toString,
309+
"-o", "9",
309310
"-j", junitOutput.getPath) ++
310311
specSectionNumber.toList.map(number => s"http2/$number")
311312

0 commit comments

Comments
 (0)