Use system ca file from libsoup if possible

diff --git a/midori/main.c b/midori/main.c
index 9e4d622f6f50d3ef327184e928ef2ef536c59cfb..84846ac197ab21fe750c828a20553d591d932f6c 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -993,7 +993,12 @@ midori_load_soup_session (gpointer settings)
 {
     SoupSession* session = webkit_get_default_session ();
 
-    #if defined (HAVE_LIBSOUP_2_29_91)
+    #if defined (HAVE_LIBSOUP_2_37_1)
+    g_object_set (session,
+                  "ssl-use-system-ca-file", TRUE,
+                  "ssl-strict", FALSE,
+                  NULL);
+    #elif defined (HAVE_LIBSOUP_2_29_91)
     const gchar* certificate_files[] =
     {
         "/etc/pki/tls/certs/ca-bundle.crt",

diff --git a/wscript b/wscript
index f18090e2dbf0b020f75202fdcb446f9aa612aa9d..97c5be322176f663f4c183bc5e6b6783dc482994 100644 (file)
--- a/wscript
+++ b/wscript
@@ -243,6 +243,7 @@ def configure (conf):
     conf.define ('HAVE_LIBSOUP_2_27_90', 1)
     check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3')
     check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91')
+    check_pkg ('libsoup-2.4', '2.37.1', False, var='LIBSOUP_2_37_1')
     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
     check_pkg ('libxml-2.0', '2.6')
     check_pkg ('sqlite3', '3.0', True, var='SQLITE')