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

[swizzlr]

#637 introduced a subtle bug – easyHandle.set(customHeaders: [String]) is a straight overwrite, not a merge. This can induce all kinds of headache inducing complexity into an app. Furthermore, it also prevented the curlHeadersToRemove/Set functionality from working, leading to undesirable Expect header assignment.

This PR resolves the issue by merging in a Content-Type header in the special case.

I know it's late in the day but this is really the sort of thing we could do with in 3.1 release.

[parkera]

Do we have the change in the master branch yet?

[swizzlr]

Oh bloody hell, I never remember which way round this is meant to be. I'll land it in the morning.

Concept wise, this ok?

[parkera]

Seems reasonable; cc @mamabusi

[pushkarnk]

This was a good find. The fix looks good too.

@swizzlr Once you have a PR on the master, we can merge both.

[swizzlr]

@pushkarnk @parkera there you go!

[alblue]

@swift-ci please test

[swizzlr]

@swift-ci please test

[swizzlr]

:(

[alblue]

There is a conflict marker in this change.

[alblue]

This looks bad.

[swizzlr]

Bollocks

[swizzlr]

@alblue fixed!

[pushkarnk]

The related PR on the master was merged. Once we are done with the code review here, we can merge this.

[pushkarnk]

I see the tests for test_taskCancel and test_taskTimeout in the patch. I don't think we have cherry-picked #689 and #911 on 3.1. Can you please take a look @swizzlr ? May be we should just cherry-pick the commit related to #915 here ? Thanks :)

[alblue]

Can you squash the bad commit and the fix up instead of leaving it in the history? Otherwise it might break bisect operations. Sent from my iPhone 📱

…

On 14 Mar 2017, at 10:48, Thomas Catterall ***@***.***> wrote: @alblue fixed! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

[pushkarnk]

Any updates on this one?

[swizzlr]

@pushkarnk sorted

[pushkarnk]

Thanks @swizzlr

However, I still see some unrelated code in TestNSURLSession in the patch viz. the tests:

+            ("test_cancelTask", test_cancelTask),
+            ("test_taskTimeout", test_taskTimeout),

These are related to #911 and #689 which haven't been cherry picked to 3.1 yet. I can see that these come from the commit that added the test case, but I'm not sure how I could help with that.

[ianpartridge]

@swizzlr @pushkarnk I think this is still important, yeah?

[pushkarnk]

The related commit was cherry-picked to 3.1 as a part of #970

I am closing this PR. Thanks!