Skip to content

Ensure curl headers are not overwritten but merged in special case. #915

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

Closed
wants to merge 2 commits into from
Closed

Ensure curl headers are not overwritten but merged in special case. #915

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f7f2bc
Ensure curl headers are not overwritten but merged in special case.
swizzlr Mar 9, 2017
1f745ce
test for 915
Mar 10, 2017
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
Next Next commit
Ensure curl headers are not overwritten but merged in special case.
  • Loading branch information
@swizzlr
swizzlr committed Mar 9, 2017
commit 7f7f2bc01a272a3f5ebb1036d4d68a76706410d8
13 changes: 10 additions & 3 deletions Foundation/NSURLSession/NSURLSessionTask.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,16 @@ fileprivate extension URLSessionTask {

// HTTP Options:
easyHandle.set(followLocation: false)
easyHandle.set(customHeaders: curlHeaders(for: request))

let customHeaders: [String]
let headersForRequest = curlHeaders(for: request)
if ((request.httpMethod == "POST") && (request.value(forHTTPHeaderField: "Content-Type") == nil)) {
customHeaders = headersForRequest + ["Content-Type:application/x-www-form-urlencoded"]
} else {
customHeaders = headersForRequest
}

easyHandle.set(customHeaders: customHeaders)

//Options unavailable on Ubuntu 14.04 (libcurl 7.36)
//TODO: Introduce something like an #if
Expand All @@ -564,8 +573,6 @@ fileprivate extension URLSessionTask {
easyHandle.set(requestMethod: request.httpMethod ?? "GET")
if request.httpMethod == "HEAD" {
easyHandle.set(noBody: true)
} else if ((request.httpMethod == "POST") && (request.value(forHTTPHeaderField: "Content-Type") == nil)) {
easyHandle.set(customHeaders: ["Content-Type:application/x-www-form-urlencoded"])
}
}
}
Expand Down