Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/1a836c9bc43b60384437bb6e9408b745691b326f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/1a836c9bc43b60384437bb6e9408b745691b326f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/1a836c9bc43b60384437bb6e9408b745691b326f
The branch, master has been updated
via 1a836c9bc43b60384437bb6e9408b745691b326f (commit)
from fcbc710ce5b3af8f9c19ad960f41efddda352cec (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=1a836c9bc43b60384437bb6e9408b745691b326f
commit 1a836c9bc43b60384437bb6e9408b745691b326f
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
fetchers/curl: Move report_certs function outside WITH_OPENSSL
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index f7b3b04..f9cafae 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -686,27 +686,6 @@ fetch_curl_store_certs_in_cache(struct curl_fetch_info *f)
}
/**
- * Report the certificate information in the fetch to the users
- */
-static void
-fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
-{
- fetch_msg msg;
- struct cert_chain *chain;
-
- chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
-
- if (chain != NULL) {
- msg.type = FETCH_CERTS;
- msg.data.chain = chain;
-
- fetch_send_callback(&msg, f->fetch_handle);
- }
-
- f->sent_ssl_chain = true;
-}
-
-/**
* OpenSSL Certificate verification callback
*
* Called for each certificate in a chain being verified. OpenSSL
@@ -866,6 +845,28 @@ fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx,
void *parm)
/**
+ * Report the certificate information in the fetch to the users
+ */
+static void
+fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
+{
+ fetch_msg msg;
+ struct cert_chain *chain;
+
+ chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
+
+ if (chain != NULL) {
+ msg.type = FETCH_CERTS;
+ msg.data.chain = chain;
+
+ fetch_send_callback(&msg, f->fetch_handle);
+ }
+
+ f->sent_ssl_chain = true;
+}
+
+
+/**
* Set options specific for a fetch.
*
* \param f The fetch to set options on.
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/curl.c | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index f7b3b04..f9cafae 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -686,27 +686,6 @@ fetch_curl_store_certs_in_cache(struct curl_fetch_info *f)
}
/**
- * Report the certificate information in the fetch to the users
- */
-static void
-fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
-{
- fetch_msg msg;
- struct cert_chain *chain;
-
- chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
-
- if (chain != NULL) {
- msg.type = FETCH_CERTS;
- msg.data.chain = chain;
-
- fetch_send_callback(&msg, f->fetch_handle);
- }
-
- f->sent_ssl_chain = true;
-}
-
-/**
* OpenSSL Certificate verification callback
*
* Called for each certificate in a chain being verified. OpenSSL
@@ -866,6 +845,28 @@ fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx,
void *parm)
/**
+ * Report the certificate information in the fetch to the users
+ */
+static void
+fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
+{
+ fetch_msg msg;
+ struct cert_chain *chain;
+
+ chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
+
+ if (chain != NULL) {
+ msg.type = FETCH_CERTS;
+ msg.data.chain = chain;
+
+ fetch_send_callback(&msg, f->fetch_handle);
+ }
+
+ f->sent_ssl_chain = true;
+}
+
+
+/**
* Set options specific for a fetch.
*
* \param f The fetch to set options on.
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
