Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Connection persistence per RFC 9112, Section 9.3 #913

Closed
wants to merge 1 commit into from
Closed

Implement Connection persistence per RFC 9112, Section 9.3 #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions blaze-client/src/main/scala/org/http4s/blaze/client/Http1Connection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,9 @@ private final class Http1Connection[F[_]](
if (userAgent.nonEmpty && !req.headers.contains[`User-Agent`])
rr << userAgent.get << "\r\n"

val mustClose: Boolean = req.headers.get[HConnection] match {
case Some(conn) => checkCloseConnection(conn, rr)
case None => getHttpMinor(req) == 0
}
val mustClose: Boolean = checkRequestCloseConnection(req)
if (mustClose)
rr << "Connection: close\r\n"

val writeRequest: F[Boolean] = getChunkEncoder(req, mustClose, rr)
.write(rr, req.entity)
Expand Down
28 changes: 28 additions & 0 deletions blaze-core/src/main/scala/org/http4s/blaze/core/Http1Stage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.http4s.Entity.Empty
import org.http4s.Header
import org.http4s.Header.Raw
import org.http4s.Headers
import org.http4s.HttpVersion
import org.http4s.InvalidBodyException
import org.http4s.Method
import org.http4s.Request
Expand Down Expand Up @@ -67,6 +68,7 @@ private[blaze] trait Http1Stage[F[_]] { self: TailStage[ByteBuffer] =>
protected def contentComplete(): Boolean

/** Check Connection header and add applicable headers to response */
@deprecated("Use checkRequestCloseConnection(Request) instead", "0.23.17")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kept for binary compatibility, though we could do the MiMa dance.

protected final def checkCloseConnection(conn: Connection, rr: StringWriter): Boolean =
if (conn.hasKeepAlive) { // connection, look to the request
logger.trace("Found Keep-Alive header")
Expand All @@ -83,6 +85,32 @@ private[blaze] trait Http1Stage[F[_]] { self: TailStage[ByteBuffer] =>
true
}

private[http4s] final def checkRequestCloseConnection(req: Request[F]): Boolean = {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to fix the Boolean blindness, but it ripples to many places.

val conn = req.headers.get[Connection]
if (conn.fold(false)(_.hasClose)) {
logger.trace(s"Closing ${conn} due to explicit close option in request's Connection header")
true
} else if (req.httpVersion >= HttpVersion.`HTTP/1.1`) {
logger.trace(s"Keeping ${conn} alive per default behavior of HTTP >= 1.1")
false
} else if (req.httpVersion == HttpVersion.`HTTP/1.0`) {
if (conn.fold(false)(_.hasKeepAlive)) {
logger.trace(
s"Keeping ${conn} alive due to explicit keep-alive option in request's Connection header"
)
false
} else {
logger.trace(s"Closing ${conn} per default behavior of HTTP/1.0")
true
}
} else {
// It would be strange to serve HTTP/0.x, but we need a value and
// this is the rule.
logger.trace(s"Closing ${conn} for HTTP < 1.0")
true
}
}

/** Get the proper body encoder based on the request */
protected final def getEncoder(
req: Request[F],
Expand Down
19 changes: 9 additions & 10 deletions blaze-server/src/main/scala/org/http4s/blaze/server/Http1ServerStage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,7 @@ private[blaze] class Http1ServerStage[F[_]](
// Need to decide which encoder and if to close on finish
val closeOnFinish = respConn
.map(_.hasClose)
.orElse {
req.headers.get[Connection].map(checkCloseConnection(_, rr))
}
.getOrElse(
parser.minorVersion() == 0
) // Finally, if nobody specifies, http 1.0 defaults to close
.getOrElse(checkRequestCloseConnection(req))

// choose a body encoder. Will add a Transfer-Encoding header if necessary
val bodyEncoder: Http1Writer[F] =
Expand All @@ -274,10 +269,14 @@ private[blaze] class Http1ServerStage[F[_]](
case _ => // nop
}

// add KeepAlive to Http 1.0 responses if the header isn't already present
rr << (if (!closeOnFinish && parser.minorVersion() == 0 && respConn.isEmpty)
"Connection: keep-alive\r\n\r\n"
else "\r\n")
closeOnFinish match {
case true if respConn.isEmpty =>
rr << "Connection: close\r\n\r\n"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a buried side effect in the old code.

case false if parser.minorVersion() == 0 && respConn.isEmpty =>
rr << "Connection: keep-alive\r\n\r\n"
case _ =>
rr << "\r\n"
}

new BodylessWriter[F](this, closeOnFinish)
} else
Expand Down
Loading