]>
Commit | Line | Data |
---|---|---|
6422e148 AM |
1 | # Revision 2717 |
2 | Index: src/network.c | |
3 | =================================================================== | |
4 | --- src/network.c (.../tags/lighttpd-1.4.26) | |
5 | +++ src/network.c (.../branches/lighttpd-1.4.x) | |
6 | @@ -525,7 +525,7 @@ | |
7 | ||
8 | if (!s->ssl_use_sslv2) { | |
9 | /* disable SSLv2 */ | |
10 | - if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { | |
11 | + if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { | |
12 | log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", | |
13 | ERR_error_string(ERR_get_error(), NULL)); | |
9d2ca5f8 | 14 | return -1; |
ceb30c4b ER |
15 | Index: configure.ac |
16 | =================================================================== | |
ceb30c4b ER |
17 | Index: SConstruct |
18 | =================================================================== | |
19 | Index: NEWS | |
20 | =================================================================== | |
6422e148 | 21 | --- NEWS (.../tags/lighttpd-1.4.26) |
cc37bbfb | 22 | +++ NEWS (.../branches/lighttpd-1.4.x) |
6422e148 | 23 | @@ -3,7 +3,10 @@ |
ceb30c4b ER |
24 | NEWS |
25 | ==== | |
26 | ||
6422e148 AM |
27 | -- 1.4.26 - |
28 | +- 1.4.27 - | |
29 | + * Fix handling return value of SSL_CTX_set_options (fixes #2157, thx mlcreech) | |
9a17f7bd | 30 | + |
6422e148 AM |
31 | +- 1.4.26 - 2010-02-07 |
32 | * Fix request parser to handle packets with splitted \r\n\r\n (fixes #2105) | |
33 | * Remove dependency on automake >= 1.11 with m4_ifdef check | |
34 | * mod_accesslog: support %e (fixes #2113, thx presbrey) | |
ceb30c4b ER |
35 | Index: CMakeLists.txt |
36 | =================================================================== |