com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c

Commit: 9c1dd320d619609cbbaee9bc36377c995368e67f Author: Anatol Belski <ab@php.net> Fri, 28 Feb 2014 21:09:55 +0100 Parents: f34e4283ce6967ae8d413a2a24f96f9dd5a754d1 e6ccba4b146a7cbea87b1a06278e6f0fa511312f Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c1dd320d619609cbbaee9bc36377c995368e67f Log: Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 * origin/str_size_and_int64_56_backport: (33 commits) remove temp test files fix typo replacement don't compare constants on run time fix macros more descriptor fixes substr_compare(): Allow zero length comparison Fixed test case title [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given Fixed expected output of a few cURL test cases Allow NULL as value for CURLOPT_CUSTOMREQUEST option. primitive test fixes man page: long option name is --strip, not --stripped --global have be removed in 5.2 remove pcntl leftover from the test code list the fpm change hat rfc in UPGRADING mention the apparmor support in fpm typo spotted by Lajos Veres update libs_version.txt update libs_version.txt NEWS ... Conflicts: ext/openssl/openssl.c Bugs: https://bugs.php.net/66535 Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index c7f2bac,5f68e64..8bd47ed --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -5284,16 -5285,17 +5285,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; }