archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use master-agnostic zend_is_true checks

Browse source
This commit is contained in:
Daniel Lowrey 2014-01-31 14:18:31 -07:00
parent 1207461d14
commit 58293fb533
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/openssl/xp_ssl.c
View file

@ -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;