diff --git a/toolkit/devtools/webconsole/NetworkHelper.jsm b/toolkit/devtools/webconsole/NetworkHelper.jsm index 74237140cafd..168530091547 100644 --- a/toolkit/devtools/webconsole/NetworkHelper.jsm +++ b/toolkit/devtools/webconsole/NetworkHelper.jsm @@ -290,7 +290,9 @@ this.NetworkHelper = let result = []; cookies.forEach(function(aCookie) { - let [name, value] = aCookie.split("="); + let equal = aCookie.indexOf("="); + let name = aCookie.substr(0, equal); + let value = aCookie.substr(equal + 1); result.push({name: unescape(name.trim()), value: unescape(value.trim())}); }); @@ -314,8 +316,9 @@ this.NetworkHelper = let cookies = []; rawCookies.forEach(function(aCookie) { - let name = unescape(aCookie.substr(0, aCookie.indexOf("=")).trim()); - let parts = aCookie.substr(aCookie.indexOf("=") + 1).split(";"); + let equal = aCookie.indexOf("="); + let name = unescape(aCookie.substr(0, equal).trim()); + let parts = aCookie.substr(equal + 1).split(";"); let value = unescape(parts.shift().trim()); let cookie = {name: name, value: value}; diff --git a/toolkit/devtools/webconsole/test/network_requests_iframe.html b/toolkit/devtools/webconsole/test/network_requests_iframe.html index a157b68bf8fb..ec4f55604e90 100644 --- a/toolkit/devtools/webconsole/test/network_requests_iframe.html +++ b/toolkit/devtools/webconsole/test/network_requests_iframe.html @@ -30,6 +30,7 @@ document.cookie = "foobar=fooval"; document.cookie = "omgfoo=bug768096"; + document.cookie = "badcookie=bug826798=st3fan"; // --> diff --git a/toolkit/devtools/webconsole/test/test_network_get.html b/toolkit/devtools/webconsole/test/test_network_get.html index dca77a978ab5..63ba2378a4cd 100644 --- a/toolkit/devtools/webconsole/test/test_network_get.html +++ b/toolkit/devtools/webconsole/test/test_network_get.html @@ -74,7 +74,7 @@ function onNetworkEventUpdate(aState, aType, aPacket) break; case "requestCookies": expectedPacket = { - cookies: 2, + cookies: 3, }; break; case "requestPostData": @@ -151,11 +151,12 @@ function onRequestCookies(aState, aResponse) { info("checking request cookies"); - is(aResponse.cookies.length, 2, "request cookies length"); + is(aResponse.cookies.length, 3, "request cookies length"); checkHeadersOrCookies(aResponse.cookies, { foobar: "fooval", omgfoo: "bug768096", + badcookie: "bug826798=st3fan", }); onRequestPostData = onRequestPostData.bind(null, aState); diff --git a/toolkit/devtools/webconsole/test/test_network_longstring.html b/toolkit/devtools/webconsole/test/test_network_longstring.html index 7ce57091edc9..9c1cdfba2428 100644 --- a/toolkit/devtools/webconsole/test/test_network_longstring.html +++ b/toolkit/devtools/webconsole/test/test_network_longstring.html @@ -96,7 +96,7 @@ function onNetworkEventUpdate(aState, aType, aPacket) break; case "requestCookies": expectedPacket = { - cookies: 2, + cookies: 3, }; break; case "requestPostData": @@ -174,11 +174,12 @@ function onRequestCookies(aState, aResponse) { info("checking request cookies"); - is(aResponse.cookies.length, 2, "request cookies length"); + is(aResponse.cookies.length, 3, "request cookies length"); checkHeadersOrCookies(aResponse.cookies, { foobar: "fooval", omgfoo: "bug768096", + badcookie: "bug826798=st3fan", }); onRequestPostData = onRequestPostData.bind(null, aState); diff --git a/toolkit/devtools/webconsole/test/test_network_post.html b/toolkit/devtools/webconsole/test/test_network_post.html index 2c114560fea6..b8288f8e56d8 100644 --- a/toolkit/devtools/webconsole/test/test_network_post.html +++ b/toolkit/devtools/webconsole/test/test_network_post.html @@ -89,7 +89,7 @@ function onNetworkEventUpdate(aState, aType, aPacket) break; case "requestCookies": expectedPacket = { - cookies: 2, + cookies: 3, }; break; case "requestPostData": @@ -167,11 +167,12 @@ function onRequestCookies(aState, aResponse) { info("checking request cookies"); - is(aResponse.cookies.length, 2, "request cookies length"); + is(aResponse.cookies.length, 3, "request cookies length"); checkHeadersOrCookies(aResponse.cookies, { foobar: "fooval", omgfoo: "bug768096", + badcookie: "bug826798=st3fan", }); onRequestPostData = onRequestPostData.bind(null, aState);