Revert "Explicitly use sync versions of cookie functions" #1121
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: request.js
| @@ -1483,11 +1483,15 @@ Request.prototype.jar = function (jar) { | |||
| cookies = false | |||
| this._disableCookies = true | |||
| } else { | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Merge fail. Also why CI is great.
nylen
force-pushed
the
revert-1031-cookie_sync
branch
from
64ba3a9
to
135c51d
Compare
nylen
added a commit
that referenced
this pull request
Oct 2, 2014
Revert "Explicitly use sync versions of cookie functions"
nylen
added a commit
to nylen/request
that referenced
this pull request
Oct 4, 2014
This was referenced Oct 4, 2014
nylen
added a commit
to nylen/request
that referenced
this pull request
Oct 11, 2014
See request#1031, request#1121, request#1092 Conflicts: tests/test-cookies.js
nylen
added a commit
to nylen/request
that referenced
this pull request
Oct 17, 2014
Revert "Explicitly use sync versions of cookie functions"
nylen
added a commit
to nylen/request
that referenced
this pull request
Oct 17, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #1031
@lalitkapoor found a bug introduced by this change.