diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index eeffff82eb6..b6edd277f99 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -204,13 +204,10 @@ nsJARChannel::nsJARChannel() , mOpeningRemote(false) , mSynthesizedStreamLength(0) , mForceNoIntercept(false) - , mBlockRemoteFiles(false) { if (!gJarProtocolLog) gJarProtocolLog = PR_NewLogModule("nsJarProtocol"); - mBlockRemoteFiles = Preferences::GetBool("network.jar.block-remote-files", false); - // hold an owning reference to the jar handler NS_ADDREF(gJarHandler); } @@ -1009,13 +1006,6 @@ nsJARChannel::ContinueAsyncOpen() if (!mJarFile) { // Not a local file... - - // Check preferences to see if all remote jar support should be disabled - if (mBlockRemoteFiles) { - mIsUnsafe = true; - return NS_ERROR_UNSAFE_CONTENT_TYPE; - } - // kick off an async download of the base URI... nsCOMPtr downloader = new MemoryDownloader(this); uint32_t loadFlags = @@ -1195,10 +1185,6 @@ nsJARChannel::OnDownloadComplete(MemoryDownloader* aDownloader, mContentDisposition = NS_GetContentDispositionFromHeader(mContentDispositionHeader, this); } - // This is a defense-in-depth check for the preferences to see if all remote jar - // support should be disabled. This check may not be needed. - MOZ_RELEASE_ASSERT(!mBlockRemoteFiles); - if (NS_SUCCEEDED(status) && mIsUnsafe && !Preferences::GetBool("network.jar.open-unsafe-types", false)) { status = NS_ERROR_UNSAFE_CONTENT_TYPE; diff --git a/modules/libjar/nsJARChannel.h b/modules/libjar/nsJARChannel.h index 6f205497f4d..07ca431d0a8 100644 --- a/modules/libjar/nsJARChannel.h +++ b/modules/libjar/nsJARChannel.h @@ -139,8 +139,6 @@ private: // True if this channel should skip any interception checks. bool mForceNoIntercept; - // True if this channel should not download any remote files. - bool mBlockRemoteFiles; friend class mozilla::net::InterceptedJARChannel; }; diff --git a/modules/libjar/test/mochitest/mochitest.ini b/modules/libjar/test/mochitest/mochitest.ini index b31b07a39aa..9ed0efee735 100644 --- a/modules/libjar/test/mochitest/mochitest.ini +++ b/modules/libjar/test/mochitest/mochitest.ini @@ -8,4 +8,3 @@ support-files = [test_bug403331.html] [test_bug1034143_mapped.html] run-if = os == 'linux' -[test_bug1173171.html] \ No newline at end of file diff --git a/modules/libjar/test/mochitest/test_bug1173171.html b/modules/libjar/test/mochitest/test_bug1173171.html deleted file mode 100644 index cd767a6f013..00000000000 --- a/modules/libjar/test/mochitest/test_bug1173171.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Test for Bug 1173171 - - - - - - - - -
-
-
- - - diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 3735690d5e9..43157f82ccb 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1503,8 +1503,6 @@ pref("dom.server-events.default-reconnection-time", 5000); // in milliseconds // application/java-archive or application/x-jar will not be opened // by the jar channel. pref("network.jar.open-unsafe-types", false); -// If true, loading remote JAR files using the jar: protocol will be prevented. -pref("network.jar.block-remote-files", false); // This preference, if true, causes all UTF-8 domain names to be normalized to // punycode. The intention is to allow UTF-8 domain names as input, but never