From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 14 Dec 2010 19:29:57 +0000 (+0000)
Subject: SSL related fixes:
X-Git-Tag: release-0.7.68~4
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=ad070b55b8ebb8d0ab53e33b5fd33859b20f2323;p=nginx.git

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
---

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]);