diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-01 08:13:53 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-01 08:13:53 -0700 |
| commit | 0893a13e3219bbd98880eb7f1a31082bc80f5ad4 (patch) | |
| tree | 83f54631f80a21bf2894142e00c663d8ae21cd04 | |
| parent | f197dafd1c237e917ad8f528fbd1370858a08496 (diff) | |
| download | php-git-0893a13e3219bbd98880eb7f1a31082bc80f5ad4.tar.gz | |
Remove #if PHP_VERSION_ID version checks
| -rw-r--r-- | ext/openssl/xp_ssl.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 69316b2ea4..92bcf0039c 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; |