diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:29:57 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:29:57 +0000 |
| commit | ad070b55b8ebb8d0ab53e33b5fd33859b20f2323 (patch) | |
| tree | 047049a84e3882b8aa57a610d57156b133805502 | |
| parent | 217f8cea3a8434e009f843b7043c8e102d8527ac (diff) | |
| download | nginx-ad070b55b8ebb8d0ab53e33b5fd33859b20f2323.tar.gz | |
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
| -rw-r--r-- | misc/GNUmakefile | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 4e5ff26ff..9ad20cfde 100644 --- 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 diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 7a18980c4..08b7d4678 100644 --- 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]); |