]> granicus.if.org Git - php/commitdiff
C89 compat
authorAnatol Belski <ab@php.net>
Fri, 21 Feb 2014 10:23:42 +0000 (11:23 +0100)
committerAnatol Belski <ab@php.net>
Fri, 21 Feb 2014 10:23:42 +0000 (11:23 +0100)
ext/openssl/xp_ssl.c

index 7104cb07b6f7a1d6b534dbc1a385d324337a042c..660caa7f65da47091ca024d244aa3e01d549f25c 100644 (file)
@@ -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);