com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c

Commit: ed00de58bfc04c5889c3df783c6789b0f4fb4a51 Author: Daniel Lowrey <rdlowrey@php.net> Wed, 26 Feb 2014 13:24:07 -0700 Parents: bfd967c11f040e4cf8eaa11c103ea29c8aad7905 d0a6f8c68ec1044e936735f28bdc1bbd35f81362 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed00de58bfc04c5889c3df783c6789b0f4fb4a51 Log: Merge branch 'PHP-5.6' * PHP-5.6: Deprecate CN_match in favor of peer_name in SSL contexts Changed paths: MM ext/openssl/openssl..c Diff: diff --cc ext/openssl/openssl.c index 9178837,88ae9a1...a07273e --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -5153,16 -5154,17 +5154,17 @@@ int php_openssl_apply_verification_poli php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract; must_verify_peer = GET_VER_OPT("verify_peer") - ? zend_is_true(*val) + ? zend_is_true(*val TSRMLS_CC) : sslsock->is_client; - must_verify_host = GET_VER_OPT("verify_host") + has_cnmatch_ctx_opt = GET_VER_OPT("CN_match"); + must_verify_peer_name = (has_cnmatch_ctx_opt || GET_VER_OPT("verify_peer_name")) - ? zend_is_true(*val) + ? zend_is_true(*val TSRMLS_CC) : sslsock->is_client; - must_verify_fingerprint = (GET_VER_OPT("peer_fingerprint") && zend_is_true(*val)); + must_verify_fingerprint = (GET_VER_OPT("peer_fingerprint") && zend_is_true(*val TSRMLS_CC)); - if ((must_verify_peer || must_verify_host || must_verify_fingerprint) && peer == NULL) { + if ((must_verify_peer || must_verify_peer_name || must_verify_fingerprint) && peer == NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not get peer certificate"); return FAILURE; }