Merge branch 'PHP-5.6'

Conflicts:
	ext/mysqli/php_mysqli_structs.h

diff --cc ext/mysqli/php_mysqli_structs.h
index ec9ef49e917edaa20fd52da2fa7bbae6f71c1203,d061bfb21a231859559865033857f307b2dd7dbb..055765197dd8035f3c714cb29205d0dbf472bc9b
--- 1/ext/mysqli/php_mysqli_structs.h
--- 2/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 4acc20cb9195c19136d4420cb05ad3a3a80838f5,4acc20cb9195c19136d4420cb05ad3a3a80838f5..67ce60a48bd6b0697f8a5c888013bcf70d9734d8
--- 1/ext/mysqli/tests/connect.inc
--- 2/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";