Title: [213087] trunk/Source/WebCore
- Revision
- 213087
- Author
- commit-qu...@webkit.org
- Date
- 2017-02-27 12:51:43 -0800 (Mon, 27 Feb 2017)
Log Message
[WinCairo][MiniBrowser] Add ca-bundle to display secure pages
https://bugs.webkit.org/show_bug.cgi?id=168486
Patch by Basuke Suzuki <basuke.suz...@am.sony.com> on 2017-02-27
Reviewed by Alex Christensen.
change the order of path location search to make it possible to
configure with environment variable because bundled ca-bundle is
always available now.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::certificatePath):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (213086 => 213087)
--- trunk/Source/WebCore/ChangeLog 2017-02-27 20:46:49 UTC (rev 213086)
+++ trunk/Source/WebCore/ChangeLog 2017-02-27 20:51:43 UTC (rev 213087)
@@ -1,3 +1,17 @@
+2017-02-27 Basuke Suzuki <basuke.suz...@am.sony.com>
+
+ [WinCairo][MiniBrowser] Add ca-bundle to display secure pages
+ https://bugs.webkit.org/show_bug.cgi?id=168486
+
+ Reviewed by Alex Christensen.
+
+ change the order of path location search to make it possible to
+ configure with environment variable because bundled ca-bundle is
+ always available now.
+
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::certificatePath):
+
2017-02-27 Antoine Quint <grao...@apple.com>
[Modern Media Controls] Status text does not appear on iOS
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (213086 => 213087)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-27 20:46:49 UTC (rev 213086)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2017-02-27 20:51:43 UTC (rev 213087)
@@ -100,6 +100,10 @@
static CString certificatePath()
{
+ char* envPath = getenv("CURL_CA_BUNDLE_PATH");
+ if (envPath)
+ return envPath;
+
#if USE(CF)
CFBundleRef webKitBundleRef = webKitBundle();
if (webKitBundleRef) {
@@ -111,9 +115,6 @@
}
}
#endif
- char* envPath = getenv("CURL_CA_BUNDLE_PATH");
- if (envPath)
- return envPath;
return CString();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
