com php-src: Merge remote-tracking branch 'origin/master' into native-tls: ext/mysqlnd/config.w32

Commit: 2942a4aa451452c354b2eb2e14f583978388a61a Author: Anatol Belski <ab@php.net> Fri, 17 Oct 2014 10:13:08 +0200 Parents: aac7b1db7c9df59ffb0860de7692c653719cf4d0 1f6bd981433cdfc90238a95aa7339d72e7f2bc01 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2942a4aa451452c354b2eb2e14f583978388a61a Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: check for zlib headers as well as lib for mysqlnd a realpath cache key can be int or float, catching this TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 Micro optimizations for isset/empty Micro optimization for zend_hash_next_index_insert_new() Fix array_keys() on $GLOBALS Fix procedural finfo calls in methods Conflicts: ext/mysqlnd/config.w32 Bugs: https://bugs.php.net/68247 Changed paths: MM ext/mysqlnd/config.w32 Diff: diff --cc ext/mysqlnd/config.w32 index 477ce42,b13a815..ff10231 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@@ -25,9 -25,12 +25,12 @@@ if (PHP_MYSQLND != "no") "mysqlnd_statistics.c " + "mysqlnd_wireprotocol.c " + "php_mysqlnd.c "; - EXTENSION("mysqlnd", mysqlnd_source, false); + EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - if (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) + if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) || + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || + (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && + CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects) + ) { AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support"); AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");