Attachment 138422 Details for Bug 109553

[patch] Patch to do what I suggested in comment 11

test.patch (text/plain), 3.21 KB, created by Boris Zbarsky [:bzbarsky]

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Zbarsky [:bzbarsky]

Size: 3.21 KB

patch

obsolete

>Index: content/shared/public/nsHTMLAtomList.h
>===================================================================
>RCS file: /cvsroot/mozilla/content/shared/public/nsHTMLAtomList.h,v
>retrieving revision 3.58
>diff -d -p -u -u -1 -0 -r3.58 nsHTMLAtomList.h
>--- content/shared/public/nsHTMLAtomList.h	13 Jun 2003 05:00:35 -0000	3.58
>+++ content/shared/public/nsHTMLAtomList.h	5 Jan 2004 16:49:43 -0000
>@@ -104,20 +104,21 @@ HTML_ATOM(code, "code")
> HTML_ATOM(codebase, "codebase")
> HTML_ATOM(codetype, "codetype")
> HTML_ATOM(color, "color")
> HTML_ATOM(col, "col")
> HTML_ATOM(colgroup, "colgroup")
> HTML_ATOM(cols, "cols")
> HTML_ATOM(colspan, "colspan")
> HTML_ATOM(combobox, "combobox")
> HTML_ATOM(compact, "compact")
> HTML_ATOM(content, "content")
>+HTML_ATOM(contentLocation, "content-location")
> HTML_ATOM(coords, "coords")
> HTML_ATOM(dd, "dd")
> HTML_ATOM(defaultchecked, "defaultchecked")
> HTML_ATOM(defaultselected, "defaultselected")
> HTML_ATOM(defaultvalue, "defaultvalue")
> HTML_ATOM(declare, "declare")
> HTML_ATOM(defer, "defer")
> HTML_ATOM(dir, "dir")
> HTML_ATOM(div, "div")
> HTML_ATOM(disabled, "disabled")
>Index: content/base/src/nsContentSink.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/content/base/src/nsContentSink.cpp,v
>retrieving revision 1.11
>diff -d -p -u -u -1 -0 -r1.11 nsContentSink.cpp
>--- content/base/src/nsContentSink.cpp	24 Dec 2003 13:43:24 -0000	1.11
>+++ content/base/src/nsContentSink.cpp	5 Jan 2004 16:49:45 -0000
>@@ -281,20 +281,21 @@ nsContentSink::ProcessHTTPHeaders(nsICha
>   nsCOMPtr<nsIHttpChannel> httpchannel(do_QueryInterface(aChannel));
>   
>   if (!httpchannel) {
>     return NS_OK;
>   }
> 
>   static const char *const headers[] = {
>     "link",
>     "default-style",
>     "content-style-type",
>+    "content-location",
>     // add more http headers if you need
>     0
>   };
>   
>   const char *const *name = headers;
>   nsCAutoString tmp;
>   
>   while (*name) {
>     nsresult rv = httpchannel->GetResponseHeader(nsDependentCString(*name), tmp);
>     if (NS_SUCCEEDED(rv) && !tmp.IsEmpty()) {
>@@ -391,20 +392,30 @@ nsContentSink::ProcessHeaderData(nsIAtom
>   else if (aHeader == nsHTMLAtoms::link) {
>     rv = ProcessLinkHeader(aContent, aValue);
>   }
>   else if (aHeader == nsHTMLAtoms::msthemecompatible) {
>     // Disable theming for the presshell if the value is no.
>     nsAutoString value(aValue);
>     if (value.EqualsIgnoreCase("no")) {
>       nsIPresShell* shell = mDocument->GetShellAt(0);
>       if (shell) {
>         shell->DisableThemeSupport();
>+      }
>+    }
>+  }
>+  else if (aHeader == nsHTMLAtoms::contentLocation) {
>+    nsCOMPtr<nsIURI> newBase;
>+    rv = NS_NewURI(getter_AddRefs(newBase), aValue, nsnull, mDocumentBaseURL);
>+    if (NS_SUCCEEDED(rv)) {
>+      rv = mDocument->SetBaseURL(newBase); // does security check
>+      if (NS_SUCCEEDED(rv)) {
>+        mDocumentBaseURL = mDocument->GetBaseURL();
>       }
>     }
>   }
>   else if (mParser) {
>     // we also need to report back HTTP-EQUIV headers to the channel
>     // so that it can process things like pragma: no-cache or other
>     // cache-control headers. Ideally this should also be the way for
>     // cookies to be set! But we'll worry about that in the next
>     // iteration
>     nsCOMPtr<nsIChannel> channel;

Flags:

jst: review+
darin.moz: superreview+

Actions: View | Diff | Review

Attachments on bug 109553: 138422