netsurf: branch master updated. 0586b97f2562a1356c21eb6b8835dc9f9bf833b5

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Sun Nov 4 10:57:16 GMT 2012


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/0586b97f2562a1356c21eb6b8835dc9f9bf833b5
...commit http://git.netsurf-browser.org/netsurf.git/commit/0586b97f2562a1356c21eb6b8835dc9f9bf833b5
...tree http://git.netsurf-browser.org/netsurf.git/tree/0586b97f2562a1356c21eb6b8835dc9f9bf833b5

The branch, master has been updated
       via  0586b97f2562a1356c21eb6b8835dc9f9bf833b5 (commit)
      from  d31e8a7b29ea7b3dd3838c628fcfe30d2269859d (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/commitdiff/0586b97f2562a1356c21eb6b8835dc9f9bf833b5
commit 0586b97f2562a1356c21eb6b8835dc9f9bf833b5
Author: John-Mark Bell <jmb at netsurf-browser.org>
Commit: John-Mark Bell <jmb at netsurf-browser.org>

    Revert "Suppress BEAST workaround."
    
    This reverts commit d31e8a7b29ea7b3dd3838c628fcfe30d2269859d.

diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index d4b80ce..f33dfde 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -645,9 +645,6 @@ fetch_curl_set_options(struct curl_fetch_info *f)
 		/* do verification */
 		SETOPT(CURLOPT_SSL_VERIFYPEER, 1L);
 		SETOPT(CURLOPT_SSL_VERIFYHOST, 2L);
-#if LIBCURL_VERSION_NUM >= 0x071900
-		SETOPT(CURLOPT_SSL_OPTIONS, CURLSSLOPT_ALLOW_BEAST);
-#endif
 		if (curl_with_openssl) {
 			SETOPT(CURLOPT_SSL_CTX_FUNCTION, fetch_curl_sslctxfun);
 			SETOPT(CURLOPT_SSL_CTX_DATA, f);


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

Summary of changes:
 content/fetchers/curl.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index d4b80ce..f33dfde 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -645,9 +645,6 @@ fetch_curl_set_options(struct curl_fetch_info *f)
 		/* do verification */
 		SETOPT(CURLOPT_SSL_VERIFYPEER, 1L);
 		SETOPT(CURLOPT_SSL_VERIFYHOST, 2L);
-#if LIBCURL_VERSION_NUM >= 0x071900
-		SETOPT(CURLOPT_SSL_OPTIONS, CURLSSLOPT_ALLOW_BEAST);
-#endif
 		if (curl_with_openssl) {
 			SETOPT(CURLOPT_SSL_CTX_FUNCTION, fetch_curl_sslctxfun);
 			SETOPT(CURLOPT_SSL_CTX_DATA, f);


-- 
NetSurf Browser



More information about the netsurf-commits mailing list