From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Mar 2015 09:23:34 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~742
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64bbc98dffda056f3e8fcca12ad48aa8f0294389;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/mysqli/php_mysqli_structs.h
---

64bbc98dffda056f3e8fcca12ad48aa8f0294389
diff --cc ext/mysqli/php_mysqli_structs.h
index ec9ef49e91,d061bfb21a..055765197d
--- 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 4acc20cb91,4acc20cb91..67ce60a48b
--- 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";