com php-src: C89 compat: ext/openssl/xp_ssl.c
| From: | Anatol Belski | Date: | Fri, 21 Feb 2014 10:23:42 +0000 |
| Subject: | com php-src: C89 compat: ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76166@lists.php.net to get a copy of this message | ||
Commit: f51555ca581fb120726ba439fd0a4edcad2ae86a
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 11:23:42 +0100
Parents: 31f55150592e9316aafe93159a1a02cf215c1d67
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f51555ca581fb120726ba439fd0a4edcad2ae86a
Log:
C89 compat
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 7104cb0..660caa7 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -376,6 +376,9 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
long ssl_ctx_options;
long method_flags;
zval **val;
+#ifdef SSL_MODE_RELEASE_BUFFERS
+ long mode;
+#endif
if (sslsock->ssl_handle) {
if (sslsock->s.is_blocked) {
@@ -476,7 +479,7 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
}
#ifdef SSL_MODE_RELEASE_BUFFERS
- long mode = SSL_get_mode(sslsock->ssl_handle);
+ mode = SSL_get_mode(sslsock->ssl_handle);
SSL_set_mode(sslsock->ssl_handle, mode | SSL_MODE_RELEASE_BUFFERS);
#endif
@@ -603,6 +606,10 @@ static int php_enable_server_crypto_opts(php_stream *stream,
TSRMLS_DC)
{
zval **val;
+#ifdef HAVE_ECDH
+ int curve_nid;
+ EC_KEY *ecdh;
+#endif
if (php_stream_context_get_option(stream->context, "ssl", "dh_param",
&val) == SUCCESS) {
convert_to_string_ex(val);
@@ -613,9 +620,6 @@ static int php_enable_server_crypto_opts(php_stream *stream,
#ifdef HAVE_ECDH
- int curve_nid;
- EC_KEY *ecdh;
-
if (php_stream_context_get_option(stream->context, "ssl", "ecdh_curve",
&val) == SUCCESS) {
char *curve_str;
convert_to_string_ex(val);