Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 817531. Fix the referrer header for background image loads. r=khuey

Browse Source 
--HG--
rename : image/test/reftest/generic/green.png => layout/reftests/backgrounds/background-referrer-image.png
rename : image/test/reftest/generic/accept-image-catchall-ref.html => layout/reftests/backgrounds/background-referrer-ref.html
rename : image/test/reftest/generic/accept-image-catchall.html => layout/reftests/backgrounds/background-referrer.html
rename : image/test/reftest/generic/check-header.sjs => layout/reftests/backgrounds/background-referrer.sjs
This commit is contained in:
Boris Zbarsky 2012-12-06 15:21:19 -05:00
parent d23130821b
commit 7b58ca3a2a
6 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -1994,7 +1994,8 @@ nsGenericHTMLElement::ParseBackgroundAttribute(int32_t aNamespaceID,
}
mozilla::css::URLValue *url =
new mozilla::css::URLValue(buffer, baseURI, uri, NodePrincipal());
new mozilla::css::URLValue(uri, buffer, doc->GetDocumentURI(),
NodePrincipal());
aResult.SetTo(url, &aValue);
return true;
}

BIN
layout/reftests/backgrounds/background-referrer-image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

11
layout/reftests/backgrounds/background-referrer-ref.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=817531
-->
<html>
<head>
<title>Referer: header should be correct</title>
</head>
<body background="background-referrer-image.png">
</body>
</html>

11
layout/reftests/backgrounds/background-referrer.html Normal file
View File

@ -0,0 +1,11 @@
<!DOCTYPE html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=817531
-->
<html>
<head>
<title>Referer: header should be correct</title>
</head>
<body background="background-referrer.sjs">
</body>
</html>

66
layout/reftests/backgrounds/background-referrer.sjs Normal file
View File

@ -0,0 +1,66 @@
const BinaryOutputStream = Components.Constructor("@mozilla.org/binaryoutputstream;1", "nsIBinaryOutputStream", "setOutputStream");
/*
# Python used to generate the following byte array
def toHex(n):
if n < 16: return "0x" + hex(n)[2:].upper()
return "0x" + hex(n)[2:].upper()
def hexFile(name):
f = open(name, "rb")
try:
while True:
print toHex(ord(f.read(1))) + ", ",
except:
pass
hexFile("layout/reftests/backgrounds/background-referrer-image.png")
*/
const IMAGE_DATA =
[
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00,
0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00,
0x00, 0x64, 0x08, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x80, 0x02, 0x03,
0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xAE, 0xCE,
0x1C, 0xE9, 0x00, 0x00, 0x00, 0x9E, 0x49, 0x44, 0x41, 0x54, 0x78,
0xDA, 0xED, 0xD0, 0x31, 0x01, 0x00, 0x00, 0x08, 0x03, 0xA0, 0x69,
0xFF, 0xCE, 0x5A, 0xC1, 0xCF, 0x07, 0x22, 0x50, 0x99, 0x70, 0xD4,
0x0A, 0x64, 0xC9, 0x92, 0x25, 0x4B, 0x96, 0x2C, 0x05, 0xB2, 0x64,
0xC9, 0x92, 0x25, 0x4B, 0x96, 0x02, 0x59, 0xB2, 0x64, 0xC9, 0x92,
0x25, 0x4B, 0x81, 0x2C, 0x59, 0xB2, 0x64, 0xC9, 0x92, 0xA5, 0x40,
0x96, 0x2C, 0x59, 0xB2, 0x64, 0xC9, 0x52, 0x20, 0x4B, 0x96, 0x2C,
0x59, 0xB2, 0x64, 0x29, 0x90, 0x25, 0x4B, 0x96, 0x2C, 0x59, 0xB2,
0x14, 0xC8, 0x92, 0x25, 0x4B, 0x96, 0x2C, 0x59, 0x0A, 0x64, 0xC9,
0x92, 0x25, 0x4B, 0x96, 0x2C, 0x05, 0xB2, 0x64, 0xC9, 0x92, 0x25,
0x4B, 0x96, 0x02, 0x59, 0xB2, 0x64, 0xC9, 0x92, 0x25, 0x4B, 0x81,
0x2C, 0x59, 0xB2, 0x64, 0xC9, 0x92, 0xA5, 0x40, 0x96, 0x2C, 0x59,
0xB2, 0x64, 0xC9, 0x52, 0x20, 0x4B, 0x96, 0x2C, 0x59, 0xB2, 0x64,
0x29, 0x90, 0x25, 0x4B, 0x96, 0x2C, 0x59, 0xB2, 0x14, 0xC8, 0x92,
0x25, 0x4B, 0x96, 0x2C, 0x59, 0x0A, 0x64, 0xC9, 0xFA, 0xB6, 0x89,
0x5F, 0x01, 0xC7, 0x24, 0x83, 0xB2, 0x0C, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
];
function handleRequest(request, response)
{
response.setHeader("Content-Type", "text/plain", false);
response.setHeader("Cache-Control", "no-cache", false);
var referrer = request.hasHeader("Referer") ?
request.getHeader("Referer") : "";
// Test url looks like http://localhost:port/timestamp/number/background-referrer.html
if (/^http:\/\/localhost:[0-9]+\/[0-9]+\/[0-9]+\/background-referrer.html$/.test(referrer))
{
response.setHeader("Content-Type", "image/png", false);
var stream = new BinaryOutputStream(response.bodyOutputStream);
stream.writeByteArray(IMAGE_DATA, IMAGE_DATA.length);
}
else
{
response.setStatusLine(request.httpVersion, 404, "Not found");
response.write("Accept header contained: " + accept);
}
}

2
layout/reftests/backgrounds/reftest.list
View File

@ -138,3 +138,5 @@ random-if(bug685516) != div-background.html div-background-ref.html
random-if(bug685516) == background-repeat-1-ref.html background-repeat-1.html
random-if(bug685516) == multi-background-clip-content-border.html multi-background-clip-content-border-ref.html
HTTP == background-referrer.html background-referrer-ref.html