Changeset 117226 in webkit


Ignore:
Timestamp:
May 16, 2012 12:22:51 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r117206.
http://trac.webkit.org/changeset/117206
https://bugs.webkit.org/show_bug.cgi?id=86583

breaks chromium browser_tests (Requested by bashi1 on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-16

  • loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::continueAfterContentPolicy):

  • loader/archive/mhtml/MHTMLArchive.cpp:

(WebCore::MHTMLArchive::create):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r117225 r117226  
     12012-05-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r117206.
     4        http://trac.webkit.org/changeset/117206
     5        https://bugs.webkit.org/show_bug.cgi?id=86583
     6
     7        breaks chromium browser_tests (Requested by bashi1 on
     8        #webkit).
     9
     10        * loader/MainResourceLoader.cpp:
     11        (WebCore::MainResourceLoader::continueAfterContentPolicy):
     12        * loader/archive/mhtml/MHTMLArchive.cpp:
     13        (WebCore::MHTMLArchive::create):
     14
    1152012-05-16  Nikolas Zimmermann  <nzimmermann@rim.com>
    216
  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r117206 r117226  
    268268        // Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
    269269        bool isRemoteWebArchive = (equalIgnoringCase("application/x-webarchive", mimeType) || equalIgnoringCase("multipart/related", mimeType))
    270             && !m_substituteData.isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(url);
     270            && !m_substituteData.isValid() && !url.isLocalFile();
    271271        if (!frameLoader()->client()->canShowMIMEType(mimeType) || isRemoteWebArchive) {
    272272            frameLoader()->policyChecker()->cannotShowMIMEType(r);
  • trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp

    r117206 r117226  
    4242#include "PageSerializer.h"
    4343#include "QuotedPrintable.h"
    44 #include "SchemeRegistry.h"
    4544#include "SharedBuffer.h"
    4645
     
    105104{
    106105    // For security reasons we only load MHTML pages from the local file system.
    107     if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url))
     106    if (!url.isLocalFile())
    108107        return 0;
    109108
Note: See TracChangeset for help on using the changeset viewer.