- rel 3; ssl fix

[packages/lighttpd.git] / lighttpd-branch.diff

# Revision 2717
Index: src/network.c
===================================================================
--- src/network.c	(.../tags/lighttpd-1.4.26)
+++ src/network.c	(.../branches/lighttpd-1.4.x)
@@ -525,7 +525,7 @@
 
 		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;
Index: configure.ac
===================================================================
Index: SConstruct
===================================================================
Index: NEWS
===================================================================
--- NEWS	(.../tags/lighttpd-1.4.26)
+++ NEWS	(.../branches/lighttpd-1.4.x)
@@ -3,7 +3,10 @@
 NEWS
 ====
 
-- 1.4.26 -
+- 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)
   * Remove dependency on automake >= 1.11 with m4_ifdef check
   * mod_accesslog: support %e (fixes #2113, thx presbrey)
Index: CMakeLists.txt
===================================================================