Skip to content

fix URLSession delegate ownership #1098

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

Merged
merged 1 commit into from
Jul 6, 2017
Merged

fix URLSession delegate ownership #1098

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
47 changes: 30 additions & 17 deletions Foundation/NSURLSession/http/EasyHandle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import Dispatch
/// `Dispatch` only -- it is intentionally **not** thread safe.
internal final class _EasyHandle {
let rawHandle = CFURLSessionEasyHandleInit()
unowned let delegate: _EasyHandleDelegate
weak var delegate: _EasyHandleDelegate?
fileprivate var headerList: _CurlStringList?
fileprivate var pauseState: _PauseState = []
internal var fileLength: Int64 = 0
Expand Down Expand Up @@ -88,7 +88,7 @@ extension _EasyHandle {

internal extension _EasyHandle {
func completedTransfer(withErrorCode errorCode: Int?) {
delegate.transferCompleted(withErrorCode: errorCode)
delegate?.transferCompleted(withErrorCode: errorCode)
}
}
internal protocol _EasyHandleDelegate: class {
Expand Down Expand Up @@ -479,12 +479,15 @@ fileprivate extension _EasyHandle {
func didReceive(data: UnsafeMutablePointer<Int8>, size: Int, nmemb: Int) -> Int {
let d: Int = {
let buffer = Data(bytes: data, count: size*nmemb)
switch delegate.didReceive(data: buffer) {
case .proceed: return size * nmemb
case .abort: return 0
case .pause:
switch delegate?.didReceive(data: buffer) {
case .some(.proceed): return size * nmemb
case .some(.abort): return 0
case .some(.pause):
pauseState.insert(.receivePaused)
return Int(CFURLSessionWriteFuncPause)
case .none:
/* the delegate disappeared */
return 0
}
}()
return d
Expand All @@ -497,12 +500,15 @@ fileprivate extension _EasyHandle {
self.fileLength = Int64(fileLength)
let d: Int = {
let buffer = Data(bytes: data, count: size*nmemb)
switch delegate.didReceive(headerData: buffer) {
case .proceed: return size * nmemb
case .abort: return 0
case .pause:
switch delegate?.didReceive(headerData: buffer) {
case .some(.proceed): return size * nmemb
case .some(.abort): return 0
case .some(.pause):
pauseState.insert(.receivePaused)
return Int(CFURLSessionWriteFuncPause)
case .none:
/* the delegate disappeared */
return 0
}
}()
return d
Expand All @@ -514,14 +520,17 @@ fileprivate extension _EasyHandle {
func fill(writeBuffer data: UnsafeMutablePointer<Int8>, size: Int, nmemb: Int) -> Int {
let d: Int = {
let buffer = UnsafeMutableBufferPointer(start: data, count: size * nmemb)
switch delegate.fill(writeBuffer: buffer) {
case .pause:
switch delegate?.fill(writeBuffer: buffer) {
case .some(.pause):
pauseState.insert(.sendPaused)
return Int(CFURLSessionReadFuncPause)
case .abort:
case .some(.abort):
return Int(CFURLSessionReadFuncAbort)
case .bytes(let length):
case .some(.bytes(let length)):
return length
case .none:
/* the delegate disappeared */
return Int(CFURLSessionReadFuncAbort)
}
}()
return d
Expand All @@ -541,16 +550,20 @@ fileprivate extension _EasyHandle {
// <https://en.wikipedia.org/wiki/Quality_of_service>
}
func updateProgressMeter(with propgress: _Progress) {
delegate.updateProgressMeter(with: propgress)
delegate?.updateProgressMeter(with: propgress)
}

func seekInputStream(offset: Int64, origin: CInt) -> CInt {
let d: Int32 = {
/// libcurl should only use SEEK_SET
guard origin == SEEK_SET else { fatalError("Unexpected 'origin' in seek.") }
do {
try delegate.seekInputStream(to: UInt64(offset))
return CFURLSessionSeekOk
if let delegate = delegate {
try delegate.seekInputStream(to: UInt64(offset))
return CFURLSessionSeekOk
} else {
return CFURLSessionSeekCantSeek
}
} catch {
return CFURLSessionSeekCantSeek
}
Expand Down