Changeset 207253 in webkit


Ignore:
Timestamp:
Oct 12, 2016 4:01:55 PM (8 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r204266. rdar://problem/28216261

Location:
branches/safari-602.2.14.0-branch
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog

    r207249 r207253  
     12016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r204266. rdar://problem/28216261
     4
     5    2016-08-08  John Wilander  <wilander@apple.com>
     6
     7            Popups opened from a sandboxed iframe should themselves be sandboxed
     8            https://bugs.webkit.org/show_bug.cgi?id=134850
     9            <rdar://problem/27375388>
     10
     11            Reviewed by Brent Fulgham.
     12
     13            * http/tests/security/resources/anchor-tag-with-blank-target.html: Added.
     14            * http/tests/security/resources/page-executing-javascript.html: Added.
     15            * http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox-expected.txt: Added.
     16            * http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html: Added.
     17
    1182016-10-11  Matthew Hanson  <matthew_hanson@apple.com>
    219

  • branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog

    r207251 r207253  
     12016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r204266. rdar://problem/28216261
     4
     5    2016-08-08  John Wilander  <wilander@apple.com>
     6
     7            Popups opened from a sandboxed iframe should themselves be sandboxed
     8            https://bugs.webkit.org/show_bug.cgi?id=134850
     9            <rdar://problem/27375388>
     10
     11            Reviewed by Brent Fulgham.
     12
     13            Test: http/tests/security/window-opened-from-sandboxed-iframe-should-inherit-sandbox.html
     14
     15            * loader/FrameLoader.cpp:
     16            (WebCore::FrameLoader::continueLoadAfterNewWindowPolicy):
     17                Now copies the opener's frame loader effective sandbox flags to the
     18                new frame loader.
     19
    1202016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
    221

  • branches/safari-602.2.14.0-branch/Source/WebCore/loader/FrameLoader.cpp

    r206053 r207253  
    31203120        return;
    31213121
     3122    mainFrame->loader().forceSandboxFlags(frame->loader().effectiveSandboxFlags());
     3123
    31223124    if (frameName != "_blank")
    31233125        mainFrame->tree().setName(frameName);
Note: See TracChangeset for help on using the changeset viewer.