Merge branch 'PHP-5.6'

diff --cc ext/openssl/xp_ssl.c
index fbfb0774dcf65b73bbc498cba4c39ad74ad998bf,948bb14ebeac0d7ccbe5064db65660ed43788d6f..9fbbb6de56baff75a901e40088a00f20367ec179
--- 1/ext/openssl/xp_ssl.c
--- 2/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;
        }