Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/87177d8aa109206d131e0d80a2080ce55dab01c7
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/87177d8aa109206d131e0d80a2080ce55dab01c7
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/87177d8aa109206d131e0d80a2080ce55dab01c7

The branch, master has been updated
       via  87177d8aa109206d131e0d80a2080ce55dab01c7 (commit)
      from  c798d18a607ac010784e473f98f24c01a3fc4fb5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=87177d8aa109206d131e0d80a2080ce55dab01c7
commit 87177d8aa109206d131e0d80a2080ce55dab01c7
Author: Samuel Dionne-Riel <[email protected]>
Commit: Daniel Silverstone <[email protected]>

    GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
    
    On distributions that ship only a ca-bundle in `/etc/ssl`, the
    configuration set at initialization will force curl to look for
    certificates that are not present in this directory.
    
    Removing the setting instead makes curl use its internal default.
    
    The framebuffer frontend will not set this option, and the only
    other frontend that sets it is BeOS.
    
    This issue can be observed (likely among other) on the NixOS Linux
    distribution.

diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 3163be1..143a104 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -200,15 +200,11 @@ static nserror set_defaults(struct nsoption_s *defaults)
                nsoption_setnull_charp(downloads_directory, strdup(fname));
        }
 
-       /* default path to certificates */
-       nsoption_setnull_charp(ca_path, strdup("/etc/ssl/certs"));
-
        if ((nsoption_charp(cookie_file) == NULL) ||
            (nsoption_charp(cookie_jar) == NULL) ||
            (nsoption_charp(url_file) == NULL) ||
            (nsoption_charp(hotlist_path) == NULL) ||
-           (nsoption_charp(downloads_directory) == NULL) ||
-           (nsoption_charp(ca_path) == NULL)) {
+           (nsoption_charp(downloads_directory) == NULL)) {
                NSLOG(netsurf, INFO,
                      "Failed initialising default resource paths");
                return NSERROR_BAD_PARAMETER;


-----------------------------------------------------------------------

Summary of changes:
 frontends/gtk/gui.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 3163be1..143a104 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -200,15 +200,11 @@ static nserror set_defaults(struct nsoption_s *defaults)
                nsoption_setnull_charp(downloads_directory, strdup(fname));
        }
 
-       /* default path to certificates */
-       nsoption_setnull_charp(ca_path, strdup("/etc/ssl/certs"));
-
        if ((nsoption_charp(cookie_file) == NULL) ||
            (nsoption_charp(cookie_jar) == NULL) ||
            (nsoption_charp(url_file) == NULL) ||
            (nsoption_charp(hotlist_path) == NULL) ||
-           (nsoption_charp(downloads_directory) == NULL) ||
-           (nsoption_charp(ca_path) == NULL)) {
+           (nsoption_charp(downloads_directory) == NULL)) {
                NSLOG(netsurf, INFO,
                      "Failed initialising default resource paths");
                return NSERROR_BAD_PARAMETER;


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to