com php-src: Remove #if PHP_VERSION_ID version checks : ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Sat, 01 Feb 2014 15:01:13 +0000 |
| Subject: | com php-src: Remove #if PHP_VERSION_ID version checks : ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75874@lists.php.net to get a copy of this message | ||
Commit: 05c309f2d85bcc33e95415d7f50d7748a7c27498
Author: Daniel Lowrey <rdlowrey@php.net> Sat, 1 Feb 2014 08:01:13 -0700
Parents: 58293fb533a9838b517a608afb95ee8ff9a8616c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=05c309f2d85bcc33e95415d7f50d7748a7c27498
Log:
Remove #if PHP_VERSION_ID version checks
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 69316b2..fe2a43b 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -407,11 +407,7 @@ 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) &&
-#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);
}
@@ -424,11 +420,7 @@ 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) &&
-#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);
}
@@ -479,11 +471,7 @@ 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);
@@ -590,11 +578,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
if (SUCCESS == php_stream_context_get_option(
stream->context, "ssl",
"capture_peer_cert", &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));
@@ -608,11 +592,7 @@ 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) &&
-#if PHP_VERSION_ID >= 50700
- zend_is_true(*val TSRMLS_CC)) {
-#else
zend_is_true(*val)) {
-#endif
zval *arr;
STACK_OF(X509) *chain;