wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 0a2a9972b4c7 (bug 815299) for M4 bustage.

Browse Source
This commit is contained in:
Nigel Babu 2015-09-09 09:12:28 +05:30
parent 4c832dd2e9
commit fe0cc1ec50
5 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/base/nsXMLHttpRequest.cpp
View File

@ -3104,13 +3104,8 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
mergeHeaders = false;
}
nsresult rv;
if (value.IsEmpty()) {
rv = httpChannel->SetEmptyRequestHeader(header);
} else {
// Merge headers depending on what we decided above.
rv = httpChannel->SetRequestHeader(header, value, mergeHeaders);
}
// Merge headers depending on what we decided above.
nsresult rv = httpChannel->SetRequestHeader(header, value, mergeHeaders);
if (rv == NS_ERROR_INVALID_ARG) {
return NS_ERROR_DOM_SYNTAX_ERR;
}
@ -3451,13 +3446,9 @@ nsXMLHttpRequest::OnRedirectVerifyCallback(nsresult result)
// Ensure all original headers are duplicated for the new channel (bug #553888)
for (uint32_t i = mModifiedRequestHeaders.Length(); i > 0; ) {
--i;
if (mModifiedRequestHeaders[i].value.IsEmpty()) {
httpChannel->SetEmptyRequestHeader(mModifiedRequestHeaders[i].header);
} else {
httpChannel->SetRequestHeader(mModifiedRequestHeaders[i].header,
mModifiedRequestHeaders[i].value,
false);
}
httpChannel->SetRequestHeader(mModifiedRequestHeaders[i].header,
mModifiedRequestHeaders[i].value,
false);
}
}
} else {

6
dom/workers/test/serviceworkers/fetch/fetch_tests.js
View File

@ -185,12 +185,6 @@ fetchXHR('redirect_serviceworker.sjs', function(xhr) {
finish();
});
fetchXHR('empty-header', function(xhr) {
my_ok(xhr.status == 200, "load should be successful");
my_ok(xhr.responseText == "emptyheader", "load should have the expected content");
finish();
}, null, [["emptyheader", ""]]);
expectAsyncResult();
fetch('http://example.com/tests/dom/security/test/cors/file_CrossSiteXHR_server.sjs?status=200&allowOrigin=*')
.then(function(res) {

1
dom/workers/test/test_xhr_headers.html
View File

@ -31,7 +31,6 @@ info("Informing server about the current host");
var xhr = new XMLHttpRequest();
xhr.open("POST", path + serverFilename);
xhr.setRequestHeader("options-host", otherHost);
xhr.setRequestHeader("empty", "");
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
info("Launching worker");

14
dom/workers/test/xhr_headers_server.sjs
View File

@ -14,16 +14,9 @@ function handleRequest(request, response) {
if (optionsHost) {
setState("postHost", request.host);
setState("optionsHost", optionsHost);
return;
}
try {
var emptyHeader = "nada" + request.getHeader("empty");
} catch(e) { }
if (emptyHeader && emptyHeader == "nada") {
setState("emptyHeader", "nada");
}
return;
break;
case "OPTIONS":
if (getState("optionsHost") == request.host) {
@ -39,8 +32,7 @@ function handleRequest(request, response) {
response.setHeader("Cache-Control", "no-cache", false);
response.setHeader("Content-Type", "text/plain", false);
if (getState("postHost") == request.host &&
getState("emptyHeader") == "nada") {
if (getState("postHost") == request.host) {
var result = getState("optionsHeader");
if (result) {
response.write("Success: expected OPTIONS request with " + result +

5
testing/web-platform/meta/XMLHttpRequest/setrequestheader-allow-empty-value.htm.ini Normal file
View File

@ -0,0 +1,5 @@
[setrequestheader-allow-empty-value.htm]
type: testharness
[XMLHttpRequest: setRequestHeader() - empty header ()]
expected: FAIL