com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c

Commit: 36fb4ed9685fa4d8b5c5e7255b097e5888623f2d Author: Michael Wallner <mike@php.net> Wed, 9 Oct 2013 09:17:48 +0200 Parents: e3c7b487099f317378cc747aea4dbe044f7faba8 b026993a74f452c5f6a689124b4ad4d7b3ac2491 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36fb4ed9685fa4d8b5c5e7255b097e5888623f2d Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed segfault when built with OpenSSL >= 1.0.1 fixing a minor typo in CODING_STANDARDS document FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions. Bugs: https://bugs.php.net/65219 Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index 4a9fcbc,a2cdfb5..2e948b0 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -4702,10 -4636,14 +4699,14 @@@ SSL *php_SSL_new_from_context(SSL_CTX * if (SSL_CTX_use_PrivateKey_file(ctx, resolved_path_buff, SSL_FILETYPE_PEM) != 1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set private key file `%s'", resolved_path_buff); return NULL; - } + } } - tmpssl = SSL_new(ctx); + #if OPENSSL_VERSION_NUMBER < 0x10001001L + /* Unnecessary as of OpenSSLv1.0.1 (will segfault if used with >= 10001001 ) */ + X509 *cert = NULL; + EVP_PKEY *key = NULL; + SSL *tmpssl = SSL_new(ctx); cert = SSL_get_certificate(tmpssl); if (cert) {