Skip to content

Commit d23672c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix_explicit_path
2 parents 698a45b + 943562d commit d23672c

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

cookiejar.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434
return this;
3535
}
36-
return new Cookie(cookiestr);
36+
return new Cookie(cookiestr, request_domain, request_path);
3737
}
3838
exports.Cookie = Cookie;
3939

@@ -247,7 +247,9 @@
247247
var successful = [],
248248
i,
249249
cookie;
250-
cookies = cookies.map(Cookie);
250+
cookies = cookies.map(function(item){
251+
return new Cookie(item, request_domain, request_path);
252+
});
251253
for (i = 0; i < cookies.length; i += 1) {
252254
cookie = cookies[i];
253255
if (this.setCookie(cookie, request_domain, request_path)) {

package.json

100644100755
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cookiejar",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"author": {
55
"name": "bradleymeck"
66
},
@@ -12,10 +12,13 @@
1212
},
1313
"scripts": {
1414
"prepublish": "jshint cookiejar.js && git tag $npm_package_version && git push origin master && git push origin --tags",
15-
"test": "tests/test.js"
15+
"test": "node tests/test.js"
1616
},
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/bmeck/node-cookiejar.git"
20+
},
21+
"dependencies": {
22+
"jshint": "^2.8.0"
2023
}
2124
}

0 commit comments

Comments
 (0)