From 121410788d6a45b3f8cbed84df4237494f614e65 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Nov 2006 20:54:37 +0000
Subject: [PATCH] Bug 356463: add X-Moz: livebookmark to live bookmark request
 headers, r=vlad, sr=biesi, a=jay

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@215570 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../bookmarks/src/nsBookmarksFeedHandler.cpp  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp
index 88ccd8c2843..7fd19bdcd1a 100644
--- a/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp
+++ b/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp
@@ -1029,20 +1029,9 @@ nsBookmarksService::UpdateLivemarkChildren(nsIRDFResource* aSource)
     }
 
     nsCOMPtr<nsIURI> uri;
-    nsCOMPtr<nsIChannel> uriChannel;
     rv = NS_NewURI(getter_AddRefs(uri), feedUrlString, nsnull, nsnull);
     if (NS_FAILED(rv)) UNLOCK_AND_RETURN_RV;
 
-    rv = NS_NewChannel(getter_AddRefs(uriChannel), uri, nsnull, nsnull, nsnull,
-                       nsIRequest::LOAD_BACKGROUND);
-    if (NS_FAILED(rv)) UNLOCK_AND_RETURN_RV;
-
-    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(uriChannel);
-    if (httpChannel) {
-        // XXXvladimir - handle POST livemarks
-        rv = httpChannel->SetRequestMethod(NS_LITERAL_CSTRING("GET"));
-    }
-    
     nsCOMPtr<nsFeedLoadListener> listener = new nsFeedLoadListener(this, mInner, uri, aSource);
 
     nsCOMPtr<nsIChannel> channel;
@@ -1050,6 +1039,15 @@ nsBookmarksService::UpdateLivemarkChildren(nsIRDFResource* aSource)
                        nsIRequest::LOAD_BACKGROUND | nsIRequest::VALIDATE_ALWAYS);
     if (NS_FAILED(rv)) UNLOCK_AND_RETURN_RV;
 
+    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
+    if (httpChannel) {
+        // Add a request header so that the request can easily be detected as a
+        // live bookmark update request.
+        rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("X-Moz"),
+                                           NS_LITERAL_CSTRING("livebookmarks"),
+                                           PR_FALSE);
+    }
+
     rv = channel->AsyncOpen(listener, nsnull);
     if (NS_FAILED(rv)) UNLOCK_AND_RETURN_RV;