raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htc optimize rendering for Strict entities

Browse source
This commit is contained in:
Johannes Rudolph 2014-11-12 16:54:05 +01:00
parent 7bf97c768b
commit f4daef75d9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
View file

@ -111,7 +111,7 @@ private[http] class HttpRequestRendererFactory(userAgentHeader: Option[headers.`
case HttpEntity.Strict(_, data) ⇒ case HttpEntity.Strict(_, data) ⇒
renderContentLength(data.length) renderContentLength(data.length)
Source(r.get :: data :: Nil) :: Nil Source.singleton(r.get ++ data) :: Nil
case HttpEntity.Default(_, contentLength, data) ⇒ case HttpEntity.Default(_, contentLength, data) ⇒
renderContentLength(contentLength) renderContentLength(contentLength)

4
akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
View file

@ -143,8 +143,8 @@ private[http] class HttpResponseRendererFactory(serverHeader: Option[headers.Ser
renderHeaders(headers.toList) renderHeaders(headers.toList)
renderEntityContentType(r, entity) renderEntityContentType(r, entity)
r ~~ `Content-Length` ~~ data.length ~~ CrLf ~~ CrLf r ~~ `Content-Length` ~~ data.length ~~ CrLf ~~ CrLf
val entityBytes = if (noEntity) Nil else data :: Nil val entityBytes = if (noEntity) ByteString.empty else data
Source(r.get :: entityBytes) :: Nil Source.singleton(r.get ++ entityBytes) :: Nil
case HttpEntity.Default(_, contentLength, data) ⇒ case HttpEntity.Default(_, contentLength, data) ⇒
renderHeaders(headers.toList) renderHeaders(headers.toList)