Skip to content
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.

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

Revert "Explicitly use sync versions of cookie functions" #1121

Merged
merged 2 commits into from Oct 2, 2014

Conversation

Projects
None yet
2 participants
@nylen
Copy link
Member

commented Oct 2, 2014

Reverts #1031

@lalitkapoor found a bug introduced by this change.

request.js Outdated
@@ -1483,11 +1483,15 @@ Request.prototype.jar = function (jar) {
cookies = false
this._disableCookies = true
} else {
<<<<<<< HEAD

This comment has been minimized.

Copy link
@lalitkapoor

lalitkapoor Oct 2, 2014

Member

this part needs some lovin'

This comment has been minimized.

Copy link
@nylen

nylen Oct 2, 2014

Author Member

Merge fail. Also why CI is great.

This comment has been minimized.

Copy link
@lalitkapoor

@nylen nylen force-pushed the nylen:revert-1031-cookie_sync branch from 64ba3a9 to 135c51d Oct 2, 2014

nylen added a commit that referenced this pull request Oct 2, 2014

Merge pull request #1121 from nylen/revert-1031-cookie_sync
Revert "Explicitly use sync versions of cookie functions"

@nylen nylen merged commit 8eeeafe into request:master Oct 2, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

nylen added a commit to nylen/request that referenced this pull request Oct 4, 2014

nylen added a commit to nylen/request that referenced this pull request Oct 11, 2014

nylen added a commit to nylen/request that referenced this pull request Oct 17, 2014

Merge pull request request#1121 from nylen/revert-1031-cookie_sync
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
You can’t perform that action at this time.