From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 17 Feb 2010 19:43:08 +0000 (+0000)
Subject: OR default SSL_OP_LEGACY_SERVER_CONNECT so existing options are preserved
X-Git-Tag: OpenSSL_0_9_8m~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bec7184768e6438c2e362c4e883a976c1565dc1d;p=oweals%2Fopenssl.git

OR default SSL_OP_LEGACY_SERVER_CONNECT so existing options are preserved
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 231f87b307..15650da5e7 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1601,7 +1601,7 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
 	/* Default is to connect to non-RI servers. When RI is more widely
 	 * deployed might change this.
 	 */
-	ret->options = SSL_OP_LEGACY_SERVER_CONNECT;
+	ret->options |= SSL_OP_LEGACY_SERVER_CONNECT;
 
 	return(ret);
 err: