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 uri; - nsCOMPtr 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 httpChannel = do_QueryInterface(uriChannel); - if (httpChannel) { - // XXXvladimir - handle POST livemarks - rv = httpChannel->SetRequestMethod(NS_LITERAL_CSTRING("GET")); - } - nsCOMPtr listener = new nsFeedLoadListener(this, mInner, uri, aSource); nsCOMPtr channel; @@ -1050,6 +1039,15 @@ nsBookmarksService::UpdateLivemarkChildren(nsIRDFResource* aSource) nsIRequest::LOAD_BACKGROUND | nsIRequest::VALIDATE_ALWAYS); if (NS_FAILED(rv)) UNLOCK_AND_RETURN_RV; + nsCOMPtr 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;