From: Daniel Lowrey <rdlowrey@php.net>
Date: Wed, 16 Jul 2014 04:15:05 +0000 (-0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0cc25bbfbe923881f1902fabefecad1e257eb31;p=php

Merge branch 'PHP-5.6'
---

a0cc25bbfbe923881f1902fabefecad1e257eb31
diff --cc ext/openssl/xp_ssl.c
index fbfb0774dc,948bb14ebe..9fbbb6de56
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -1166,9 -1164,10 +1166,10 @@@ static int set_server_specific_opts(php
  		ssl_ctx_options |= SSL_OP_SINGLE_DH_USE;
  	}
  
+ #ifdef HAVE_ECDH
  	if (SUCCESS == php_stream_context_get_option(
  				stream->context, "ssl", "single_ecdh_use", &val) &&
 -			zend_is_true(*val)
 +			zend_is_true(*val TSRMLS_CC)
  	) {
  		ssl_ctx_options |= SSL_OP_SINGLE_ECDH_USE;
  	}