Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/79e406d951a7971853896492f90955ddf380c8ab
...commit
http://git.netsurf-browser.org/netsurf.git/commit/79e406d951a7971853896492f90955ddf380c8ab
...tree
http://git.netsurf-browser.org/netsurf.git/tree/79e406d951a7971853896492f90955ddf380c8ab
The branch, master has been updated
via 79e406d951a7971853896492f90955ddf380c8ab (commit)
via c9296f79a8323bce56898f3b5021543807f1168f (commit)
from 0a3786fed26a7532e2256b4a36eff8ec2bde8803 (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=79e406d951a7971853896492f90955ddf380c8ab
commit 79e406d951a7971853896492f90955ddf380c8ab
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
alter some library defaults to rely on automatic pkg-config detection
diff --git a/Makefile.defaults b/Makefile.defaults
index 12c83a1..31d4a42 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -32,28 +32,28 @@
# ----------------------------------------------------------------------------
# Enable NetSurf's use of libcurl for fetching over http(s)
-# Valid options: YES, NO (highly recommended)
+# Valid options: YES, NO, AUTO (highly recommended)
NETSURF_USE_CURL := YES
-# Enable NetSurf's use of openssl for fetching over https
-# Valid options: YES, NO
-NETSURF_USE_OPENSSL := YES
+# Enable NetSurf's use of openssl for processing certificates
+# Valid options: YES, NO, AUTO
+NETSURF_USE_OPENSSL := AUTO
# Enable NetSurf's use of libnsbmp for displaying BMPs and ICOs
-# Valid options: YES, NO
-NETSURF_USE_BMP := YES
+# Valid options: YES, NO, AUTO
+NETSURF_USE_BMP := AUTO
# Enable NetSurf's use of libnsgif for displaying GIFs
-# Valid options: YES, NO (highly recommended)
-NETSURF_USE_GIF := YES
+# Valid options: YES, NO, AUTO (highly recommended)
+NETSURF_USE_GIF := AUTO
# Enable NetSurf's use of libjpeg for displaying JPEGs
# Valid options: YES, NO (highly recommended)
NETSURF_USE_JPEG := YES
# Enable NetSurf's use of libpng for displaying PNGs.
-# Valid options: YES, NO (highly recommended)
-NETSURF_USE_PNG := YES
+# Valid options: YES, NO, AUTO (highly recommended)
+NETSURF_USE_PNG := AUTO
# Enable NetSurf's use of gstreamer for displaying videos
# Valid options: YES, NO
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c9296f79a8323bce56898f3b5021543807f1168f
commit c9296f79a8323bce56898f3b5021543807f1168f
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
Use curl API (versions after 7.56.0) to determine if openssl is in use
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 8e1ebad..f24e3de 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1592,6 +1592,18 @@ nserror fetch_curl_register(void)
.finalise = fetch_curl_finalise
};
+#if LIBCURL_VERSION_NUM >= 0x073800
+ /* version 7.56.0 can select which SSL backend to use */
+ CURLsslset setres;
+
+ setres = curl_global_sslset(CURLSSLBACKEND_OPENSSL, NULL, NULL);
+ if (setres == CURLSSLSET_OK) {
+ curl_with_openssl = true;
+ } else {
+ curl_with_openssl = false;
+ }
+#endif
+
NSLOG(netsurf, INFO, "curl_version %s", curl_version());
code = curl_global_init(CURL_GLOBAL_ALL);
@@ -1673,17 +1685,24 @@ nserror fetch_curl_register(void)
SETOPT(CURLOPT_CAPATH, nsoption_charp(ca_path));
}
- /* Detect whether the SSL CTX function API works */
- code = curl_easy_setopt(fetch_blank_curl,
- CURLOPT_SSL_CTX_FUNCTION, NULL);
+#if LIBCURL_VERSION_NUM < 0x073800
+ /*
+ * before 7.56.0 Detect openssl from whether the SSL CTX
+ * function API works
+ */
+ code = curl_easy_setopt(fetch_blank_curl, CURLOPT_SSL_CTX_FUNCTION,
NULL);
if (code != CURLE_OK) {
curl_with_openssl = false;
} else {
+ curl_with_openssl = true;
+ }
+#endif
+
+ if (curl_with_openssl) {
/* only set the cipher list with openssl otherwise the
* fetch fails with "Unknown cipher in list"
*/
SETOPT(CURLOPT_SSL_CIPHER_LIST, CIPHER_LIST);
- curl_with_openssl = true;
}
NSLOG(netsurf, INFO, "cURL %slinked against openssl",
-----------------------------------------------------------------------
Summary of changes:
Makefile.defaults | 20 ++++++++++----------
content/fetchers/curl.c | 27 +++++++++++++++++++++++----
2 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/Makefile.defaults b/Makefile.defaults
index 12c83a1..31d4a42 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -32,28 +32,28 @@
# ----------------------------------------------------------------------------
# Enable NetSurf's use of libcurl for fetching over http(s)
-# Valid options: YES, NO (highly recommended)
+# Valid options: YES, NO, AUTO (highly recommended)
NETSURF_USE_CURL := YES
-# Enable NetSurf's use of openssl for fetching over https
-# Valid options: YES, NO
-NETSURF_USE_OPENSSL := YES
+# Enable NetSurf's use of openssl for processing certificates
+# Valid options: YES, NO, AUTO
+NETSURF_USE_OPENSSL := AUTO
# Enable NetSurf's use of libnsbmp for displaying BMPs and ICOs
-# Valid options: YES, NO
-NETSURF_USE_BMP := YES
+# Valid options: YES, NO, AUTO
+NETSURF_USE_BMP := AUTO
# Enable NetSurf's use of libnsgif for displaying GIFs
-# Valid options: YES, NO (highly recommended)
-NETSURF_USE_GIF := YES
+# Valid options: YES, NO, AUTO (highly recommended)
+NETSURF_USE_GIF := AUTO
# Enable NetSurf's use of libjpeg for displaying JPEGs
# Valid options: YES, NO (highly recommended)
NETSURF_USE_JPEG := YES
# Enable NetSurf's use of libpng for displaying PNGs.
-# Valid options: YES, NO (highly recommended)
-NETSURF_USE_PNG := YES
+# Valid options: YES, NO, AUTO (highly recommended)
+NETSURF_USE_PNG := AUTO
# Enable NetSurf's use of gstreamer for displaying videos
# Valid options: YES, NO
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 8e1ebad..f24e3de 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1592,6 +1592,18 @@ nserror fetch_curl_register(void)
.finalise = fetch_curl_finalise
};
+#if LIBCURL_VERSION_NUM >= 0x073800
+ /* version 7.56.0 can select which SSL backend to use */
+ CURLsslset setres;
+
+ setres = curl_global_sslset(CURLSSLBACKEND_OPENSSL, NULL, NULL);
+ if (setres == CURLSSLSET_OK) {
+ curl_with_openssl = true;
+ } else {
+ curl_with_openssl = false;
+ }
+#endif
+
NSLOG(netsurf, INFO, "curl_version %s", curl_version());
code = curl_global_init(CURL_GLOBAL_ALL);
@@ -1673,17 +1685,24 @@ nserror fetch_curl_register(void)
SETOPT(CURLOPT_CAPATH, nsoption_charp(ca_path));
}
- /* Detect whether the SSL CTX function API works */
- code = curl_easy_setopt(fetch_blank_curl,
- CURLOPT_SSL_CTX_FUNCTION, NULL);
+#if LIBCURL_VERSION_NUM < 0x073800
+ /*
+ * before 7.56.0 Detect openssl from whether the SSL CTX
+ * function API works
+ */
+ code = curl_easy_setopt(fetch_blank_curl, CURLOPT_SSL_CTX_FUNCTION,
NULL);
if (code != CURLE_OK) {
curl_with_openssl = false;
} else {
+ curl_with_openssl = true;
+ }
+#endif
+
+ if (curl_with_openssl) {
/* only set the cipher list with openssl otherwise the
* fetch fails with "Unknown cipher in list"
*/
SETOPT(CURLOPT_SSL_CIPHER_LIST, CIPHER_LIST);
- curl_with_openssl = true;
}
NSLOG(netsurf, INFO, "cURL %slinked against openssl",
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
