mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 912337 - Followup: fix missing #include on a CLOSED TREE. (da77dc4ba0)
- Bug 1232977 - Remove redundant bitand with uint{8,16} and an all-bits-set mask. r=nbp, r=sunfish (164579d9d7)
- Bug 1249235 - Store RegExp flags into single slot. r=h4writer (6f030c9f06)
- Bug 1237445 - Use GCHashSet for RegExpShared sweeping, r=terrence (3aab1397e8)
- Bug 1238536 part 1 - Do not automatically exit fullscreen if restored from minimized state. r=jimm (05dd086d29)
- Bug 1238536 part 2 - Do not trigger fullscreen changed when switching between fullscreen and minimized. r=karlt (83e862cc7a)
- Bug 1233598 - HTMLInputElement must traverse/unlink the getFilesAndDirectories promise, r=smaug (1ff7260803)
- Bug 1187157 - new FormData::get() should return an empty string if the file is not set - part 1, r=smaug (9a255fd884)
- Bug 1187157 - new FormData::get() should return an empty string if the file is not set - part 2, r=smaug (f26712d951)
- Bug 1216793 - check against tracking protection list in XHR. r=gcp (3a827250bc)
- Bug 1203588 - Return the same Promise object from HTMLInputElement.getFilesAndDirectories when possible. r=baku (f036876c1b)
- Bug 1207088 - Don't show the "Choose folder..." button for a directory picking <input> on platforms that don't have a directory picker. r=jfkthame (c5742f75c9)
- Bug 1234192 - OSFileSystem should not be shared between Directory objects, r=smaug (ba258935b7)
- Bug 1202964 - Use the correct nsIFilePicker API for directory picking in HTMLInputElement::nsFilePickerShownCallback::Done. r=baku (ce11a83ace)
- Bug 1237674 - Rename nsFormData to mozilla::dom::FormData, r=smaug (0a18825b2b)
- Bug 1237595 - FormData ctor and form submission should create empty Blob/File when a input type=file is not set, r=smaug (2bce85bbe8)
- cleanup some stuff (cbd553db88)
- Bug 1238515 - nsIFilePicker methods should clearly say when they return directories and files, r=smaug (e903765f0c)
- Bug 1198256 - Replace deprecated GtkColorSelectionDialog with GtkColorChooserDialog in Gtk3. r=karlt (2ff87896a6)
- Bug 1198256 - Reactivate the old Gtk color picker for now. r=karlt (ea42685de9)
- Bug 1213632: Prevent WebExtensions from using versioned JavaScript. r=billm (9d3a9b7511)
- Bug 1219855, Part 1 - Make nsXULAlerts implement nsIAlertsService. r=MattN,wchen (6b21425554)
- Bug 1219855, Part 2 - Always use XUL notifications if the system backend fails. r=wchen (7c5b30fd2c)
- Bug 1219855, Part 3 - Fix variable shadowing in `OSXNotificationCenter::ShowAlert`. r=me (29e442fe45)
- Bug 1241377 - Part 1: Implement nsIFormPOSTActionChannel for the channel accepts form POST. r=mayhemer (f03e9dbece)
- Bug 1241377 - Part 2: Add test for nsIFormPOSTActionChannel. r=mayhemer (0a9e7aab1f)
- Bug 1207824: Add Telemetry for WebRTC call type, simultaneous tracks, and renegotiations r=bwc (38085ce155)
- Bug 1175609 - Bring onnegotiationneeded in line with spec. r=mt (398c03db6e)
- Bug 1209252 - Part 2: typo fix for compile issue. r=bustage on a CLOSED TREE (e1b8f43993)
- Bug 1221786: clear about:webrtc logs for private browsing sessions. r=jib (49615cc3c6)
- Bug 1232082 - add RTCRtpReceiver for each remote track. r=jesup (1231223782)
- Bug 1219711 - Remove fakeness from webrtc tests. r=jib (b421c55124)
- Bug 1232082 - add pc.ontrack and RTCTrackEvent r=jesup,smaug (f915ecc77c)
- Bug 1222127: Use the inner window to compute style. r=baku (a3ea812154)
- Bug 1209634 - Remove unused WindowTarget. r=past (1f2d218cb4)
- Bug 1209634 - Remove unused target.version. r=past (7ddf6cdfb1)
- Bug 1209634 - Reformat target.js to match ESLint rules. r=past (8fe93b4737)
- Bug 1168853 - Implement WorkerDebugger.isInitialized;r=khuey (318bd9516c)
- Bug 1150444 - Intermittent test_WorkerDebugger.isFrozen.xul;r=khuey (e787b9c935)
- Mark test_bug883784.jsm as a support file, no bug (c6c987138d)
- Bug 1178726 - Simplify how we deal with freezing/thawing workers;r=jlongster,khuey (88c7341f8f)
- Bug 1228382 - Expose an API to relate nsIWorkerDebugger to its nsIServiceWorkerInfo instance. r=ejpbruel (26ce55693f)
This commit is contained in:
@@ -104,6 +104,7 @@
|
||||
#include "nsEscape.h"
|
||||
|
||||
// Interfaces Needed
|
||||
#include "nsIFormPOSTActionChannel.h"
|
||||
#include "nsIUploadChannel.h"
|
||||
#include "nsIUploadChannel2.h"
|
||||
#include "nsIWebProgress.h"
|
||||
@@ -10777,23 +10778,21 @@ nsDocShell::DoURILoad(nsIURI* aURI,
|
||||
aReferrerURI);
|
||||
}
|
||||
|
||||
//
|
||||
// If this is a HTTP channel, then set up the HTTP specific information
|
||||
// (ie. POST data, referrer, ...)
|
||||
//
|
||||
if (httpChannel) {
|
||||
nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(httpChannel));
|
||||
/* Get the cache Key from SH */
|
||||
nsCOMPtr<nsISupports> cacheKey;
|
||||
nsCOMPtr<nsICacheInfoChannel> cacheChannel(do_QueryInterface(channel));
|
||||
/* Get the cache Key from SH */
|
||||
nsCOMPtr<nsISupports> cacheKey;
|
||||
if (cacheChannel) {
|
||||
if (mLSHE) {
|
||||
mLSHE->GetCacheKey(getter_AddRefs(cacheKey));
|
||||
} else if (mOSHE) { // for reload cases
|
||||
mOSHE->GetCacheKey(getter_AddRefs(cacheKey));
|
||||
}
|
||||
}
|
||||
|
||||
// figure out if we need to set the post data stream on the channel...
|
||||
// right now, this is only done for http channels.....
|
||||
if (aPostData) {
|
||||
// figure out if we need to set the post data stream on the channel...
|
||||
if (aPostData) {
|
||||
nsCOMPtr<nsIFormPOSTActionChannel> postChannel(do_QueryInterface(channel));
|
||||
if (postChannel) {
|
||||
// XXX it's a bit of a hack to rewind the postdata stream here but
|
||||
// it has to be done in case the post data is being reused multiple
|
||||
// times.
|
||||
@@ -10804,44 +10803,45 @@ nsDocShell::DoURILoad(nsIURI* aURI,
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIUploadChannel> uploadChannel(do_QueryInterface(httpChannel));
|
||||
NS_ASSERTION(uploadChannel, "http must support nsIUploadChannel");
|
||||
|
||||
// we really need to have a content type associated with this stream!!
|
||||
uploadChannel->SetUploadStream(aPostData, EmptyCString(), -1);
|
||||
/* If there is a valid postdata *and* it is a History Load,
|
||||
* set up the cache key on the channel, to retrieve the
|
||||
* data *only* from the cache. If it is a normal reload, the
|
||||
* cache is free to go to the server for updated postdata.
|
||||
*/
|
||||
if (cacheChannel && cacheKey) {
|
||||
if (mLoadType == LOAD_HISTORY ||
|
||||
mLoadType == LOAD_RELOAD_CHARSET_CHANGE) {
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
uint32_t loadFlags;
|
||||
if (NS_SUCCEEDED(channel->GetLoadFlags(&loadFlags))) {
|
||||
channel->SetLoadFlags(
|
||||
loadFlags | nsICachingChannel::LOAD_ONLY_FROM_CACHE);
|
||||
}
|
||||
} else if (mLoadType == LOAD_RELOAD_NORMAL) {
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* If there is no postdata, set the cache key on the channel, and
|
||||
* do not set the LOAD_ONLY_FROM_CACHE flag, so that the channel
|
||||
* will be free to get it from net if it is not found in cache.
|
||||
* New cache may use it creatively on CGI pages with GET
|
||||
* method and even on those that say "no-cache"
|
||||
*/
|
||||
postChannel->SetUploadStream(aPostData, EmptyCString(), -1);
|
||||
}
|
||||
|
||||
/* If there is a valid postdata *and* it is a History Load,
|
||||
* set up the cache key on the channel, to retrieve the
|
||||
* data *only* from the cache. If it is a normal reload, the
|
||||
* cache is free to go to the server for updated postdata.
|
||||
*/
|
||||
if (cacheChannel && cacheKey) {
|
||||
if (mLoadType == LOAD_HISTORY ||
|
||||
mLoadType == LOAD_RELOAD_NORMAL ||
|
||||
mLoadType == LOAD_RELOAD_CHARSET_CHANGE) {
|
||||
if (cacheChannel && cacheKey) {
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
uint32_t loadFlags;
|
||||
if (NS_SUCCEEDED(channel->GetLoadFlags(&loadFlags))) {
|
||||
channel->SetLoadFlags(
|
||||
loadFlags | nsICachingChannel::LOAD_ONLY_FROM_CACHE);
|
||||
}
|
||||
} else if (mLoadType == LOAD_RELOAD_NORMAL) {
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* If there is no postdata, set the cache key on the channel, and
|
||||
* do not set the LOAD_ONLY_FROM_CACHE flag, so that the channel
|
||||
* will be free to get it from net if it is not found in cache.
|
||||
* New cache may use it creatively on CGI pages with GET
|
||||
* method and even on those that say "no-cache"
|
||||
*/
|
||||
if (mLoadType == LOAD_HISTORY ||
|
||||
mLoadType == LOAD_RELOAD_NORMAL ||
|
||||
mLoadType == LOAD_RELOAD_CHARSET_CHANGE) {
|
||||
if (cacheChannel && cacheKey) {
|
||||
cacheChannel->SetCacheKey(cacheKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (httpChannel) {
|
||||
if (aHeadersData) {
|
||||
rv = AddHeadersToChannel(aHeadersData, httpChannel);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user