Revert "attempt to make bufferMaxSize parameter of CachingChunkWriter…

… configurable" This reverts commit 0279b70.
augi · Jan 21, 2019 · f37c1a7 · f37c1a7
1 parent 0279b70
commit f37c1a7
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 27 deletions.
diff --git a/blaze-client/src/main/scala/org/http4s/client/blaze/BlazeClientBuilder.scala b/blaze-client/src/main/scala/org/http4s/client/blaze/BlazeClientBuilder.scala
@@ -26,7 +26,6 @@ sealed abstract class BlazeClientBuilder[F[_]] private (
     val maxResponseLineSize: Int,
     val maxHeaderLength: Int,
     val maxChunkSize: Int,
-    val chunkBufferMaxSize: Int,
     val parserMode: ParserMode,
     val bufferSize: Int,
     val executionContext: ExecutionContext,
@@ -69,7 +68,6 @@ sealed abstract class BlazeClientBuilder[F[_]] private (
       maxResponseLineSize = maxResponseLineSize,
       maxHeaderLength = maxHeaderLength,
       maxChunkSize = maxChunkSize,
-      chunkBufferMaxSize = chunkBufferMaxSize,
       parserMode = parserMode,
       bufferSize = bufferSize,
       executionContext = executionContext,
@@ -168,7 +166,6 @@ sealed abstract class BlazeClientBuilder[F[_]] private (
       maxResponseLineSize = maxResponseLineSize,
       maxHeaderLength = maxHeaderLength,
       maxChunkSize = maxChunkSize,
-      chunkBufferMaxSize = chunkBufferMaxSize,
       parserMode = parserMode,
       userAgent = userAgent,
       channelOptions = channelOptions
@@ -203,7 +200,6 @@ object BlazeClientBuilder {
       maxResponseLineSize = 4096,
       maxHeaderLength = 40960,
       maxChunkSize = Int.MaxValue,
-      chunkBufferMaxSize = 1024 * 1024,
       parserMode = ParserMode.Strict,
       bufferSize = 8192,
       executionContext = executionContext,

diff --git a/blaze-client/src/main/scala/org/http4s/client/blaze/BlazeClientConfig.scala b/blaze-client/src/main/scala/org/http4s/client/blaze/BlazeClientConfig.scala
@@ -53,7 +53,6 @@ final case class BlazeClientConfig( // HTTP properties
     maxResponseLineSize: Int,
     maxHeaderLength: Int,
     maxChunkSize: Int,
-    chunkBufferMaxSize: Int,
     lenientParser: Boolean,
     // pipeline management
     bufferSize: Int,
@@ -81,7 +80,6 @@ object BlazeClientConfig {
       maxResponseLineSize = 4 * 1024,
       maxHeaderLength = 40 * 1024,
       maxChunkSize = Integer.MAX_VALUE,
-      chunkBufferMaxSize = 1024 * 1024,
       lenientParser = false,
       bufferSize = bits.DefaultBufferSize,
       executionContext = ExecutionContext.global,

diff --git a/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Client.scala b/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Client.scala
@@ -26,7 +26,6 @@ object Http1Client {
       maxResponseLineSize = config.maxResponseLineSize,
       maxHeaderLength = config.maxHeaderLength,
       maxChunkSize = config.maxChunkSize,
-      chunkBufferMaxSize = config.chunkBufferMaxSize,
       parserMode = if (config.lenientParser) ParserMode.Lenient else ParserMode.Strict,
       userAgent = config.userAgent,
       channelOptions = ChannelOptions(Vector.empty)

diff --git a/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Connection.scala b/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Connection.scala
@@ -27,7 +27,6 @@ private final class Http1Connection[F[_]](
     maxResponseLineSize: Int,
     maxHeaderLength: Int,
     maxChunkSize: Int,
-    override val chunkBufferMaxSize: Int,
     parserMode: ParserMode,
     userAgent: Option[`User-Agent`]
 )(implicit protected val F: ConcurrentEffect[F])

diff --git a/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Support.scala b/blaze-client/src/main/scala/org/http4s/client/blaze/Http1Support.scala
@@ -28,7 +28,6 @@ final private class Http1Support[F[_]](
     maxResponseLineSize: Int,
     maxHeaderLength: Int,
     maxChunkSize: Int,
-    chunkBufferMaxSize: Int,
     parserMode: ParserMode,
     userAgent: Option[`User-Agent`],
     channelOptions: ChannelOptions
@@ -66,7 +65,6 @@ final private class Http1Support[F[_]](
       maxResponseLineSize = maxResponseLineSize,
       maxHeaderLength = maxHeaderLength,
       maxChunkSize = maxChunkSize,
-      chunkBufferMaxSize = chunkBufferMaxSize,
       parserMode = parserMode,
       userAgent = userAgent
     )

diff --git a/blaze-core/src/main/scala/org/http4s/blazecore/Http1Stage.scala b/blaze-core/src/main/scala/org/http4s/blazecore/Http1Stage.scala
@@ -20,8 +20,6 @@ import scala.util.{Failure, Success}
 /** Utility bits for dealing with the HTTP 1.x protocol */
 trait Http1Stage[F[_]] { self: TailStage[ByteBuffer] =>
 
-  protected val chunkBufferMaxSize: Int
-
   /** ExecutionContext to be used for all Future continuations
     * '''WARNING:''' The ExecutionContext should trampoline or risk possibly unhandled stack overflows */
   protected implicit def executionContext: ExecutionContext
@@ -123,7 +121,7 @@ trait Http1Stage[F[_]] { self: TailStage[ByteBuffer] =>
 
           case None => // use a cached chunk encoder for HTTP/1.1 without length of transfer encoding
             logger.trace("Using Caching Chunk Encoder")
-            new CachingChunkWriter(this, trailer, chunkBufferMaxSize)
+            new CachingChunkWriter(this, trailer)
         }
   }
 

diff --git a/blaze-core/src/main/scala/org/http4s/blazecore/util/CachingChunkWriter.scala b/blaze-core/src/main/scala/org/http4s/blazecore/util/CachingChunkWriter.scala
@@ -14,7 +14,9 @@ import scala.concurrent._
 private[http4s] class CachingChunkWriter[F[_]](
     pipe: TailStage[ByteBuffer],
     trailer: F[Headers],
-    bufferMaxSize: Int)(implicit protected val F: Effect[F], protected val ec: ExecutionContext)
+    bufferMaxSize: Int = 10 * 1024)(
+    implicit protected val F: Effect[F],
+    protected val ec: ExecutionContext)
     extends Http1Writer[F] {
   import ChunkWriter._
 

diff --git a/blaze-core/src/test/scala/org/http4s/blazecore/util/Http1WriterSpec.scala b/blaze-core/src/test/scala/org/http4s/blazecore/util/Http1WriterSpec.scala
@@ -92,11 +92,11 @@ class Http1WriterSpec extends Http4sSpec {
   }
 
   "CachingChunkWriter" should {
-    runNonChunkedTests(tail => new CachingChunkWriter[IO](tail, IO.pure(Headers()), 1024))
+    runNonChunkedTests(tail => new CachingChunkWriter[IO](tail, IO.pure(Headers())))
   }
 
   "CachingStaticWriter" should {
-    runNonChunkedTests(tail => new CachingChunkWriter[IO](tail, IO.pure(Headers()), 1024))
+    runNonChunkedTests(tail => new CachingChunkWriter[IO](tail, IO.pure(Headers())))
   }
 
   "FlushingChunkWriter" should {

diff --git a/blaze-server/src/main/scala/org/http4s/server/blaze/BlazeServerBuilder.scala b/blaze-server/src/main/scala/org/http4s/server/blaze/BlazeServerBuilder.scala
@@ -72,7 +72,6 @@ class BlazeServerBuilder[F[_]](
     isHttp2Enabled: Boolean,
     maxRequestLineLen: Int,
     maxHeadersLen: Int,
-    chunkBufferMaxSize: Int,
     httpApp: HttpApp[F],
     serviceErrorHandler: ServiceErrorHandler[F],
     banner: immutable.Seq[String],
@@ -115,7 +114,6 @@ class BlazeServerBuilder[F[_]](
       http2Support,
       maxRequestLineLen,
       maxHeadersLen,
-      chunkBufferMaxSize,
       httpApp,
       serviceErrorHandler,
       banner,
@@ -243,7 +241,6 @@ class BlazeServerBuilder[F[_]](
               enableWebSockets,
               maxRequestLineLen,
               maxHeadersLen,
-              chunkBufferMaxSize,
               serviceErrorHandler,
               responseHeaderTimeout,
               idleTimeout,
@@ -256,7 +253,6 @@ class BlazeServerBuilder[F[_]](
               httpApp,
               maxRequestLineLen,
               maxHeadersLen,
-              chunkBufferMaxSize,
               requestAttributes(secure = true, engine.some),
               executionContext,
               serviceErrorHandler,
@@ -385,7 +381,6 @@ object BlazeServerBuilder {
       isHttp2Enabled = false,
       maxRequestLineLen = 4 * 1024,
       maxHeadersLen = 40 * 1024,
-      chunkBufferMaxSize = 1024 * 1024,
       httpApp = defaultApp[F],
       serviceErrorHandler = DefaultServiceErrorHandler[F],
       banner = defaults.Banner,

diff --git a/blaze-server/src/main/scala/org/http4s/server/blaze/Http1ServerStage.scala b/blaze-server/src/main/scala/org/http4s/server/blaze/Http1ServerStage.scala
@@ -31,7 +31,6 @@ private[blaze] object Http1ServerStage {
       enableWebSockets: Boolean,
       maxRequestLineLen: Int,
       maxHeadersLen: Int,
-      chunkBufferMaxSize: Int,
       serviceErrorHandler: ServiceErrorHandler[F],
       responseHeaderTimeout: Duration,
       idleTimeout: Duration,
@@ -45,7 +44,6 @@ private[blaze] object Http1ServerStage {
         executionContext,
         maxRequestLineLen,
         maxHeadersLen,
-        chunkBufferMaxSize,
         serviceErrorHandler,
         responseHeaderTimeout,
         idleTimeout,
@@ -57,7 +55,6 @@ private[blaze] object Http1ServerStage {
         executionContext,
         maxRequestLineLen,
         maxHeadersLen,
-        chunkBufferMaxSize,
         serviceErrorHandler,
         responseHeaderTimeout,
         idleTimeout,
@@ -70,7 +67,6 @@ private[blaze] class Http1ServerStage[F[_]](
     implicit protected val executionContext: ExecutionContext,
     maxRequestLineLen: Int,
     maxHeadersLen: Int,
-    override val chunkBufferMaxSize: Int,
     serviceErrorHandler: ServiceErrorHandler[F],
     responseHeaderTimeout: Duration,
     idleTimeout: Duration,

diff --git a/blaze-server/src/main/scala/org/http4s/server/blaze/ProtocolSelector.scala b/blaze-server/src/main/scala/org/http4s/server/blaze/ProtocolSelector.scala
@@ -19,7 +19,6 @@ private[blaze] object ProtocolSelector {
       httpApp: HttpApp[F],
       maxRequestLineLen: Int,
       maxHeadersLen: Int,
-      chunkBufferMaxSize: Int,
       requestAttributes: () => AttributeMap,
       executionContext: ExecutionContext,
       serviceErrorHandler: ServiceErrorHandler[F],
@@ -64,7 +63,6 @@ private[blaze] object ProtocolSelector {
         enableWebSockets = false,
         maxRequestLineLen,
         maxHeadersLen,
-        chunkBufferMaxSize,
         serviceErrorHandler,
         responseHeaderTimeout,
         idleTimeout,