com php-src: Merge branch 'PHP-5.6': ext/mysqli/php_mysqli_ structs.h ext/mysqli/tests/connect.inc

From: Date: Mon, 09 Mar 2015 09:23:34 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/mysqli/php_mysqli_ structs.h ext/mysqli/tests/connect.inc
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85395@lists.php.net to get a copy of this message
Commit: 64bbc98dffda056f3e8fcca12ad48aa8f0294389 Author: Xinchen Hui <laruence@php.net> Mon, 9 Mar 2015 17:23:34 +0800 Parents: eed341980256a6ed7904d9fa64cec56bcbcd642d 4ca14f681e2eebbbb232b7a3f662ed05038d779f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=64bbc98dffda056f3e8fcca12ad48aa8f0294389 Log: Merge branch 'PHP-5.6' Conflicts: ext/mysqli/php_mysqli_structs.h Changed paths: MM ext/mysqli/php_mysqli_structs.h MM ext/mysqli/tests/connect.inc Diff: diff --cc ext/mysqli/php_mysqli_structs.h index ec9ef49,d061bfb..0557651 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@@ -311,10 -310,9 +311,9 @@@ extern PHPAPI zend_class_entry *spl_ce_ #define MYSQLI_CLEAR_RESOURCE(__id) \ { \ - mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\ + mysqli_object *intern = Z_MYSQLI_P(__id); \ efree(intern->ptr); \ intern->ptr = NULL; \ - ZVAL_NULL(__id); \ } diff --cc ext/mysqli/tests/connect.inc index 4acc20c,4acc20c..67ce60a --- a/ext/mysqli/tests/connect.inc +++ b/ext/mysqli/tests/connect.inc @@@ -8,8 -8,8 +8,8 @@@ $driver = new mysqli_driver; -- $host = getenv("MYSQL_TEST_HOST") ? getenv("MYSQL_TEST_HOST") : "localhost"; -- $port = getenv("MYSQL_TEST_PORT") ? getenv("MYSQL_TEST_PORT") : 3306; ++ $host = getenv("MYSQL_TEST_HOST") ? getenv("MYSQL_TEST_HOST") : "127.0.0.1"; ++ $port = getenv("MYSQL_TEST_PORT") ? getenv("MYSQL_TEST_PORT") : 3308; $user = getenv("MYSQL_TEST_USER") ? getenv("MYSQL_TEST_USER") : "root"; $passwd = getenv("MYSQL_TEST_PASSWD") ? getenv("MYSQL_TEST_PASSWD") : ""; $db = getenv("MYSQL_TEST_DB") ? getenv("MYSQL_TEST_DB") : "test";

« previous php.cvs (#85395) next »