summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2014-08-28 00:09:14 +0200
committerJohannes Schlüter <johannes@php.net>2014-08-28 00:12:48 +0200
commitdadbbf8945fd24e3dcfd19504d47c01381ade6f9 (patch)
treed31804dac7ac07508ceec98ae7462cc9f7b849ae
parent7d6c3e01c9d7c69de03ad4c84cd13d6d90e3fb5a (diff)
downloadphp-git-dadbbf8945fd24e3dcfd19504d47c01381ade6f9.tar.gz
Fix compilation on systems without ecdh_curve
-rw-r--r--ext/openssl/xp_ssl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index bc877adb1c..7954fb753a 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1177,7 +1177,8 @@ static int set_server_specific_opts(php_stream *stream, SSL_CTX *ctx TSRMLS_DC)
return FAILURE;
}
#else
- if (SUCCESS == php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "ecdh_curve", &val)) {
+ val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "ecdh_curve");
+ if (val != NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"ECDH curve support not compiled into the OpenSSL lib against which PHP is linked");