summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2010-02-28 11:48:05 +0000
committerStefan Bühler <stbuehler@web.de>2010-02-28 11:48:05 +0000
commit34fb1258e4f6b3b714da7c41adcca6c08dd2ccec (patch)
tree5e59dbb9d38dac82007cece906c58b052d1e7986
parent320e293038b6acc1fa22a1214481225b0136b4fd (diff)
downloadlighttpd-git-34fb1258e4f6b3b714da7c41adcca6c08dd2ccec.tar.gz
Fix handling return value of SSL_CTX_set_options (fixes #2157, thx mlcreech)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2716 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS2
-rw-r--r--src/network.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2aea7507..3f6822d7 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ NEWS
====
- 1.4.27 -
- *
+ * Fix handling return value of SSL_CTX_set_options (fixes #2157, thx mlcreech)
- 1.4.26 - 2010-02-07
* Fix request parser to handle packets with splitted \r\n\r\n (fixes #2105)
diff --git a/src/network.c b/src/network.c
index 4b076184..b3621291 100644
--- a/src/network.c
+++ b/src/network.c
@@ -525,7 +525,7 @@ int network_init(server *srv) {
if (!s->ssl_use_sslv2) {
/* disable SSLv2 */
- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
+ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
ERR_error_string(ERR_get_error(), NULL));
return -1;