Changeset 213087 in webkit

Timestamp:

Feb 27, 2017 12:51:43 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo][MiniBrowser] Add ca-bundle to display secure pages
​https://bugs.webkit.org/show_bug.cgi?id=168486

Patch by Basuke Suzuki <​Basuke.Suzuki@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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-27  Basuke Suzuki  <Basuke.Suzuki@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  <graouts@apple.com>
 

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -101 +101 @@
 static CString certificatePath()
 {
+    char* envPath = getenv("CURL_CA_BUNDLE_PATH");
+    if (envPath)
+        return envPath;
+
 #if USE(CF)
     CFBundleRef webKitBundleRef = webKitBundle();
@@ -112 +116 @@
     }
 #endif
-    char* envPath = getenv("CURL_CA_BUNDLE_PATH");
-    if (envPath)
-       return envPath;
 
     return CString();