Mercurial > hg > nginx
changeset 3838:c93b1c05436c stable-0.7
SSL related fixes:
*) merge r3675:
fix recognition of SSLv2 Client Hello Packet large than 255 bytes
*) upgrade OpenSSL to 0.8.9q in nginx/Windows
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 14 Dec 2010 19:29:57 +0000 |
| parents | 935c5eb13c7d |
| children | f706037d7f10 |
| files | misc/GNUmakefile src/http/ngx_http_request.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -5,7 +5,7 @@ NGINX = nginx-$(VER) TEMP = tmp OBJS = objs.msvc8 -OPENSSL = openssl-0.9.8n +OPENSSL = openssl-0.9.8q ZLIB = zlib-1.2.3 PCRE = pcre-7.9
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -551,7 +551,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev) } if (n == 1) { - if (buf[0] == 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1 */) { + if (buf[0] & 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1 */) { ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, "https ssl handshake: 0x%02Xd", buf[0]);