com php-src: Fix compilation on systems without ecdh_curve: ext/openssl/xp_ssl.c
| From: | Johannes Schlüter | Date: | Wed, 27 Aug 2014 22:12:48 +0000 |
| Subject: | com php-src: Fix compilation on systems without ecdh_curve: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81235@lists.php.net to get a copy of this message | ||
Commit: dadbbf8945fd24e3dcfd19504d47c01381ade6f9
Author: Johannes Schlüter <johannes@php.net> Thu, 28 Aug 2014 00:09:14 +0200
Parents: 7d6c3e01c9d7c69de03ad4c84cd13d6d90e3fb5a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dadbbf8945fd24e3dcfd19504d47c01381ade6f9
Log:
Fix compilation on systems without ecdh_curve
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index bc877ad..7954fb7 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");