Title: [213077] branches/safari-603.1.30.0-branch/Source/WebCore
Revision
213077
Author
matthew_han...@apple.com
Date
2017-02-27 09:39:10 -0800 (Mon, 27 Feb 2017)

Log Message

Merge r212987. rdar://problem/30704432

Modified Paths

Diff

Modified: branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog (213076 => 213077)


--- branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog	2017-02-27 17:39:07 UTC (rev 213076)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/ChangeLog	2017-02-27 17:39:10 UTC (rev 213077)
@@ -1,5 +1,20 @@
 2017-02-27  Matthew Hanson  <matthew_han...@apple.com>
 
+        Merge r212987. rdar://problem/30704432
+
+    2017-02-24  Chris Dumez  <cdu...@apple.com>
+
+            Unreviewed, follow-up fix after r212972.
+
+            Fixes a few assertions on the debug build bots.
+            URL needs to be exactly the same as the parsed one given
+            that we are calling the ParsedURLString constructor.
+
+            * platform/network/ResourceResponseBase.cpp:
+            (WebCore::ResourceResponseBase::sanitizeSuggestedFilename):
+
+2017-02-27  Matthew Hanson  <matthew_han...@apple.com>
+
         Merge r212972. rdar://problem/30704432
 
     2017-02-24  Chris Dumez  <cdu...@apple.com>

Modified: branches/safari-603.1.30.0-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp (213076 => 213077)


--- branches/safari-603.1.30.0-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp	2017-02-27 17:39:07 UTC (rev 213076)
+++ branches/safari-603.1.30.0-branch/Source/WebCore/platform/network/ResourceResponseBase.cpp	2017-02-27 17:39:10 UTC (rev 213077)
@@ -229,7 +229,7 @@
     if (suggestedFilename.isEmpty())
         return suggestedFilename;
 
-    ResourceResponse response(URL(ParsedURLString, "http://example.com"), String(), -1, String());
+    ResourceResponse response(URL(ParsedURLString, "http://example.com/"), String(), -1, String());
     response.setHTTPStatusCode(200);
     String escapedSuggestedFilename = String(suggestedFilename).replace('\"', "\\\"");
     String value = makeString("attachment; filename=\"", escapedSuggestedFilename, '"');
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to