From 3c39f71cbaeae1f0f8142ef1abcdd863bf8999e7 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Mon, 10 Aug 2015 15:33:46 +0200 Subject: [PATCH] =htc fix scaladoc of Http.bindAndHandle* --- .../main/scala/akka/http/javadsl/Http.scala | 30 ++++++++----------- .../main/scala/akka/http/scaladsl/Http.scala | 15 ++++------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala index 6c7deabcc0..632c1fddca 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala @@ -113,9 +113,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandle(handler: Flow[HttpRequest, HttpResponse, _], interface: String, port: Int, @@ -128,9 +127,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandle(handler: Flow[HttpRequest, HttpResponse, _], interface: String, port: Int, @@ -146,9 +144,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleSync(handler: Function[HttpRequest, HttpResponse], interface: String, port: Int, @@ -160,9 +157,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleSync(handler: Function[HttpRequest, HttpResponse], interface: String, port: Int, @@ -178,9 +174,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleAsync(handler: Function[HttpRequest, Future[HttpResponse]], interface: String, port: Int, @@ -192,9 +187,8 @@ class Http(system: ExtendedActorSystem) extends akka.actor.Extension { * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleAsync(handler: Function[HttpRequest, Future[HttpResponse]], interface: String, port: Int, diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala index 8479b457bd..b93cc8ace2 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala @@ -74,9 +74,8 @@ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.E * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandle(handler: Flow[HttpRequest, HttpResponse, Any], interface: String, port: Int = -1, @@ -113,9 +112,8 @@ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.E * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleSync(handler: HttpRequest ⇒ HttpResponse, interface: String, port: Int = -1, @@ -128,9 +126,8 @@ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.E * Convenience method which starts a new HTTP server at the given endpoint and uses the given ``handler`` * [[Flow]] for processing all incoming connections. * - * Note that there is no backpressure being applied to the `connections` [[Source]], i.e. all - * connections are being accepted at maximum rate, which, depending on the applications, might - * present a DoS risk! + * The number of concurrently accepted connections can be configured by overriding + * the `akka.http.server.max-connections` setting. */ def bindAndHandleAsync(handler: HttpRequest ⇒ Future[HttpResponse], interface: String, port: Int = -1,