aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-11-07 15:11:41 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-11-07 15:11:41 +0000
commita9a6c4924e327fd9a333a2859807644cf9f127bc (patch)
tree67f587515af2de428f06ccb663af70f7d3ca189c
parentMerge branch 'bug/parallel-make' (diff)
parentUse SSL_MODE_RELEASE_BUFFERS if available (diff)
downloadw3m-a9a6c4924e327fd9a333a2859807644cf9f127bc.tar.gz
w3m-a9a6c4924e327fd9a333a2859807644cf9f127bc.zip
Merge branch 'bug/openssl'
-rw-r--r--url.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/url.c b/url.c
index d7b1d6e..fda9082 100644
--- a/url.c
+++ b/url.c
@@ -338,7 +338,15 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
if (strchr(ssl_forbid_method, 'T'))
option |= SSL_OP_NO_TLSv1;
}
+#ifdef SSL_OP_NO_COMPRESSION
+ option |= SSL_OP_NO_COMPRESSION;
+#endif
SSL_CTX_set_options(ssl_ctx, option);
+
+#ifdef SSL_MODE_RELEASE_BUFFERS
+ SSL_CTX_set_mode (ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
+#endif
+
#ifdef USE_SSL_VERIFY
/* derived from openssl-0.9.5/apps/s_{client,cb}.c */
#if 1 /* use SSL_get_verify_result() to verify cert */