Skip to content

Commit 9926082

Browse files
authored
Revert "Use a fixed size for DoH request body" (#9686)
This reverts commit 0070c2e.
1 parent 0070c2e commit 9926082

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

‎okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/internal/-DnsOverHttpsQuery.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,12 @@ internal fun DnsMessage.asQueryParameter(): String {
166166
}
167167

168168
internal class QueryRequestBody(
169-
query: DnsMessage,
169+
private val query: DnsMessage,
170170
) : RequestBody() {
171-
private val content = Buffer().also { DnsMessageWriter(it).write(query) }.readByteString()
172-
173171
override fun contentType() = DNS_MESSAGE
174172

175-
// Cloudflare doesn't support chunked encoding
176-
override fun contentLength() = content.size.toLong()
177-
178173
override fun writeTo(sink: BufferedSink) {
179-
sink.write(content)
174+
DnsMessageWriter(sink.buffer).write(query)
180175
sink.emitCompleteSegments()
181176
}
182177
}

‎okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsTest.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ import assertk.assertions.containsExactly
2121
import assertk.assertions.hasMessage
2222
import assertk.assertions.hasSize
2323
import assertk.assertions.isEqualTo
24-
import assertk.assertions.isGreaterThan
2524
import assertk.assertions.isInstanceOf
26-
import assertk.assertions.isNotNull
2725
import assertk.assertions.isNull
2826
import assertk.assertions.isTrue
2927
import java.io.EOFException
@@ -384,11 +382,6 @@ class DnsOverHttpsTest(
384382
assertThat(httpsRequest1!!.method).isEqualTo("POST")
385383
assertThat(httpsRequest1.url.encodedQuery)
386384
.isEqualTo("ct")
387-
// Cloudflare fails on chunked encoding
388-
assertThat(httpsRequest1.headers["Content-Length"]?.toLong())
389-
.isNotNull()
390-
.isGreaterThan(12L) // A DNS message has a 12-byte header followed by its questions.
391-
assertThat(httpsRequest1.chunkSizes).isNull()
392385

393386
assertThat(cacheEvents()).containsExactly(CacheMiss::class)
394387

0 commit comments

Comments
 (0)