Skip to content

HttpLoggingInterceptor: Recognize "br" (Brotli) as a known encoding #9420

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

Open
krahulshharmaa wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

HttpLoggingInterceptor: Recognize "br" (Brotli) as a known encoding #9420

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
3 changes: 2 additions & 1 deletion okhttp-logging-interceptor/src/main/kotlin/okhttp3/logging/HttpLoggingInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ class HttpLoggingInterceptor
private fun bodyHasUnknownEncoding(headers: Headers): Boolean {
val contentEncoding = headers["Content-Encoding"] ?: return false
return !contentEncoding.equals("identity", ignoreCase = true) &&
!contentEncoding.equals("gzip", ignoreCase = true)
!contentEncoding.equals("gzip", ignoreCase = true) &&
!contentEncoding.equals("br", ignoreCase = true)
}

private fun bodyIsStreaming(response: Response): Boolean {
Expand Down
6 changes: 3 additions & 3 deletions okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ class HttpLoggingInterceptorTest {
server.enqueue(
MockResponse
.Builder() // It's invalid to return this if not requested, but the server might anyway
.setHeader("Content-Encoding", "br")
.setHeader("Content-Encoding", "xyz")
.setHeader("Content-Type", PLAIN)
.body(Buffer().write("iwmASGVsbG8sIEhlbGxvLCBIZWxsbwoD".decodeBase64()!!))
.build(),
Expand All @@ -676,7 +676,7 @@ class HttpLoggingInterceptorTest {
.assertLogMatch(Regex("""User-Agent: okhttp/.+"""))
.assertLogEqual("--> END GET")
.assertLogMatch(Regex("""<-- 200 OK $url \(\d+ms\)"""))
.assertLogEqual("Content-Encoding: br")
.assertLogEqual("Content-Encoding: xyz")
.assertLogEqual("Content-Type: text/plain; charset=utf-8")
.assertLogMatch(Regex("""Content-Length: \d+"""))
.assertLogEqual("<-- END HTTP (encoded body omitted)")
Expand All @@ -685,7 +685,7 @@ class HttpLoggingInterceptorTest {
.assertLogEqual("--> GET $url")
.assertLogEqual("--> END GET")
.assertLogMatch(Regex("""<-- 200 OK $url \(\d+ms\)"""))
.assertLogEqual("Content-Encoding: br")
.assertLogEqual("Content-Encoding: xyz")
.assertLogEqual("Content-Type: text/plain; charset=utf-8")
.assertLogMatch(Regex("""Content-Length: \d+"""))
.assertLogEqual("<-- END HTTP (encoded body omitted)")
Expand Down