Use master-agnostic zend_is_true checks

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 0a9626128fcc8d4b00835ede2bc7b2deb54174bd..69316b2ea470fde1dffe2e1d62080db4ad9352c2 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -407,7 +407,12 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
 
                if (stream->context && SUCCESS == php_stream_context_get_option(
                                        stream->context, "ssl", "no_ticket", &val) && 
-                               zval_is_true(*val)) {
+#if PHP_VERSION_ID >= 50700
+                               zend_is_true(*val TSRMLS_CC)
+#else
+                               zend_is_true(*val)
+#endif
+               ) {
                        SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_TICKET);
                }
        }
@@ -419,7 +424,12 @@ static inline int php_openssl_setup_crypto(php_stream *stream,
 
                if (stream->context && SUCCESS == php_stream_context_get_option(
                                        stream->context, "ssl", "disable_compression", &val) &&
-                               zval_is_true(*val)) {
+#if PHP_VERSION_ID >= 50700
+                               zend_is_true(*val TSRMLS_CC)
+#else
+                               zend_is_true(*val)
+#endif
+               ) {
                        SSL_CTX_set_options(sslsock->ctx, SSL_OP_NO_COMPRESSION);
                }
        }
@@ -469,7 +479,11 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
 
                if (sslsock->is_client
                        && (php_stream_context_get_option(stream->context, "ssl", "SNI_enabled", &val) == FAILURE
+#if PHP_VERSION_ID >= 50700
+                               || zend_is_true(*val TSRMLS_CC))
+#else
                                || zend_is_true(*val))
+#endif
                ) {
                        if (php_stream_context_get_option(stream->context, "ssl", "SNI_server_name", &val) == SUCCESS) {
                                convert_to_string_ex(val);
@@ -576,7 +590,11 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
                                        if (SUCCESS == php_stream_context_get_option(
                                                                stream->context, "ssl",
                                                                "capture_peer_cert", &val) &&
-                                                       zval_is_true(*val)) {
+#if PHP_VERSION_ID >= 50700
+                                                       zend_is_true(*val TSRMLS_CC)) {
+#else
+                                                       zend_is_true(*val)) {
+#endif
                                                MAKE_STD_ZVAL(zcert);
                                                ZVAL_RESOURCE(zcert, zend_list_insert(peer_cert, 
                                                                        php_openssl_get_x509_list_id() TSRMLS_CC));
@@ -590,7 +608,11 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
                                        if (SUCCESS == php_stream_context_get_option(
                                                                stream->context, "ssl",
                                                                "capture_peer_cert_chain", &val) &&
-                                                       zval_is_true(*val)) {
+#if PHP_VERSION_ID >= 50700
+                                                       zend_is_true(*val TSRMLS_CC)) {
+#else
+                                                       zend_is_true(*val)) {
+#endif
                                                zval *arr;
                                                STACK_OF(X509) *chain;