Title: [198391] releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI
Revision
198391
Author
[email protected]
Date
2016-03-18 00:41:37 -0700 (Fri, 18 Mar 2016)

Log Message

Merge r198382 - REGRESSION (r197724): [GTK] Web Inspector: Images being blocked by CSP 2.0
https://bugs.webkit.org/show_bug.cgi?id=155432

Reviewed by Daniel Bates.

Allow Web Inspector to load resource: image resources.

* UserInterface/Main.html:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog (198390 => 198391)


--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog	2016-03-18 07:41:27 UTC (rev 198390)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog	2016-03-18 07:41:37 UTC (rev 198391)
@@ -1,3 +1,14 @@
+2016-03-17  Carlos Garcia Campos  <[email protected]>
+
+        REGRESSION (r197724): [GTK] Web Inspector: Images being blocked by CSP 2.0
+        https://bugs.webkit.org/show_bug.cgi?id=155432
+
+        Reviewed by Daniel Bates.
+
+        Allow Web Inspector to load resource: image resources.
+
+        * UserInterface/Main.html:
+
 2016-03-08  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: Images being blocked by CSP 2.0

Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Main.html (198390 => 198391)


--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Main.html	2016-03-18 07:41:27 UTC (rev 198390)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Main.html	2016-03-18 07:41:37 UTC (rev 198391)
@@ -26,7 +26,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob:; connect-src *; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource:; connect-src *; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
 
     <link rel="stylesheet" href=""
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to