Fix cherry-pick conflicts

Ololoshechkin · Ololoshechkin · commit f8797f0e4246 · 2021-10-29T21:29:38.000+03:00
diff --git a/ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/HttpCookies.kt b/ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/HttpCookies.kt
@@ -104,7 +104,7 @@ public class HttpCookies(
 
         override fun install(feature: HttpCookies, scope: HttpClient) {
             scope.requestPipeline.intercept(HttpRequestPipeline.State) {
-                plugin.captureHeaderCookies(context)
+                feature.captureHeaderCookies(context)
             }
             scope.sendPipeline.intercept(HttpSendPipeline.State) {
                 feature.sendCookiesWith(context)
diff --git a/ktor-io/common/src/io/ktor/utils/io/core/AbstractInput.kt b/ktor-io/common/src/io/ktor/utils/io/core/AbstractInput.kt
@@ -4,7 +4,6 @@ package io.ktor.utils.io.core
 
 import io.ktor.utils.io.bits.*
 import io.ktor.utils.io.core.internal.*
-import io.ktor.utils.io.core.internal.require
 import io.ktor.utils.io.pool.*
 
 /**
diff --git a/ktor-io/jvm/src/io/ktor/utils/io/core/IoBufferJVM.kt b/ktor-io/jvm/src/io/ktor/utils/io/core/IoBufferJVM.kt
@@ -4,7 +4,6 @@ package io.ktor.utils.io.core
 
 import io.ktor.utils.io.bits.*
 import io.ktor.utils.io.core.internal.*
-import io.ktor.utils.io.core.internal.require
 import io.ktor.utils.io.internal.jvm.*
 import io.ktor.utils.io.pool.*
 import io.ktor.utils.io.utils.*

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public class HttpCookies(`
`104`	`104`
`105`	`105`	`override fun install(feature: HttpCookies, scope: HttpClient) {`
`106`	`106`	`scope.requestPipeline.intercept(HttpRequestPipeline.State) {`
`107`		`- plugin.captureHeaderCookies(context)`
	`107`	`+ feature.captureHeaderCookies(context)`
`108`	`108`	`}`
`109`	`109`	`scope.sendPipeline.intercept(HttpSendPipeline.State) {`
`110`	`110`	`feature.sendCookiesWith(context)`