andrey Sat Mar 8 15:16:08 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c
mysqli_nonapi.c php_mysqli_structs.h
/php-src/ext/mysqli/tests bug39457.phpt
Log:
MFB:
- Fixed problem with $mysqli->connect() not connecting with defaults
- Fixed leak (#39475)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.122&r2=1.123&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.122 php-src/ext/mysqli/mysqli.c:1.123
--- php-src/ext/mysqli/mysqli.c:1.122 Tue Feb 12 22:06:06 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar 8 15:16:08 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.122 2008/02/12 22:06:06 andrey Exp $
+ $Id: mysqli.c,v 1.123 2008/03/08 15:16:08 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -57,8 +57,6 @@
#endif
-extern void php_mysqli_connect(INTERNAL_FUNCTION_PARAMETERS);
-
typedef int (*mysqli_read_t)(mysqli_object *obj, zval **retval TSRMLS_DC);
typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval TSRMLS_DC);
@@ -426,7 +424,7 @@
f.type = ZEND_INTERNAL_FUNCTION;
if (obj->zo.ce == mysqli_link_class_entry) {
- f.handler = ZEND_FN(mysqli_connect);
+ f.handler = ZEND_FN(mysqli_link_construct);
} else if (obj->zo.ce == mysqli_stmt_class_entry) {
f.handler = ZEND_FN(mysqli_stmt_construct);
} else if (obj->zo.ce == mysqli_result_class_entry) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.158&r2=1.159&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.158
php-src/ext/mysqli/mysqli_api.c:1.159
--- php-src/ext/mysqli/mysqli_api.c:1.158 Wed Feb 6 11:35:44 2008
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 8 15:16:08 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.158 2008/02/06 11:35:44 andrey Exp $
+ $Id: mysqli_api.c,v 1.159 2008/03/08 15:16:08 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1669,7 +1669,7 @@
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
{
- mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.60&r2=1.61&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.60 php-src/ext/mysqli/mysqli_fe.c:1.61
--- php-src/ext/mysqli/mysqli_fe.c:1.60 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mysqli/mysqli_fe.c Sat Mar 8 15:16:08 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.60 2007/12/31 07:12:11 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.61 2008/03/08 15:16:08 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -211,7 +211,7 @@
PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
#endif
PHP_FALIAS(multi_query,mysqli_multi_query,NULL)
- PHP_FALIAS(mysqli,mysqli_connect,NULL)
+ PHP_FALIAS(mysqli,mysqli_link_construct,NULL)
PHP_FALIAS(more_results,mysqli_more_results, NULL)
PHP_FALIAS(next_result, mysqli_next_result, NULL)
PHP_FALIAS(options,mysqli_options,NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.79&r2=1.80&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.79
php-src/ext/mysqli/mysqli_nonapi.c:1.80
--- php-src/ext/mysqli/mysqli_nonapi.c:1.79 Tue Mar 4 23:39:15 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Mar 8 15:16:08 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.79 2008/03/04 23:39:15 felipe Exp $
+ $Id: mysqli_nonapi.c,v 1.80 2008/03/08 15:16:08 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@
#define SAFE_STR(a) ((a)?a:"")
-void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool
is_real_connect)
+void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool
is_real_connect, zend_bool in_ctor)
{
MY_MYSQL *mysql = NULL;
MYSQLI_RESOURCE *mysqli_resource = NULL;
@@ -48,7 +48,7 @@
zend_rsrc_list_entry *le;
mysqli_plist_entry *plist = NULL;
- if (getThis() && !ZEND_NUM_ARGS()) {
+ if (getThis() && !ZEND_NUM_ARGS() && in_ctor) {
RETURN_NULL();
}
hostname = username = dbname = passwd = socket = NULL;
@@ -62,14 +62,14 @@
if (object && instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {
mysqli_resource = ((mysqli_object *)
zend_object_store_get_object(object TSRMLS_CC))->ptr;
- if (mysqli_resource && mysqli_resource->ptr &&
- mysqli_resource->status >
MYSQLI_STATUS_INITIALIZED)
- {
- mysql = (MY_MYSQL*)mysqli_resource->ptr;
- php_clear_mysql(mysql);
- if (mysql->mysql) {
- mysqli_close(mysql->mysql,
MYSQLI_CLOSE_EXPLICIT);
- mysql->mysql = NULL;
+ if (mysqli_resource && mysqli_resource->ptr) {
+ mysql = (MY_MYSQL*) mysqli_resource->ptr;
+ if (mysqli_resource->status >
MYSQLI_STATUS_INITIALIZED) {
+ php_clear_mysql(mysql);
+ if (mysql->mysql) {
+ mysqli_close(mysql->mysql,
MYSQLI_CLOSE_EXPLICIT);
+ mysql->mysql = NULL;
+ }
}
}
}
@@ -77,7 +77,6 @@
mysql = (MY_MYSQL *) ecalloc(1, sizeof(MY_MYSQL));
}
flags |= CLIENT_MULTI_RESULTS; /* needed for
mysql_multi_query() */
-
} else {
/* We have flags too */
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "O|s&s&s&s&ls&l", &object, mysqli_link_class_entry,
@@ -85,6 +84,7 @@
&dbname, &dbname_len, UG(utf8_conv), &port, &socket,
&socket_len, UG(utf8_conv), &flags) == FAILURE) {
return;
}
+
mysqli_resource = ((mysqli_object *)
zend_object_store_get_object(object TSRMLS_CC))->ptr;
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &object,
"mysqli_link", MYSQLI_STATUS_INITIALIZED);
@@ -188,7 +188,7 @@
MyG(num_active_persistent) + MyG(num_inactive_persistent));
goto err;
}
- if (!is_real_connect) {
+ if (!is_real_connect && !mysql->mysql) {
#if !defined(HAVE_MYSQLND)
if (!(mysql->mysql = mysql_init(NULL))) {
#else
@@ -295,7 +295,16 @@
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect)
{
- mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE);
+}
+/* }}} */
+
+
+/* {{{ proto object mysqli_link_construct()
+ */
+PHP_FUNCTION(mysqli_link_construct)
+{
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.11
php-src/ext/mysqli/php_mysqli_structs.h:1.12
--- php-src/ext/mysqli/php_mysqli_structs.h:1.11 Wed Feb 6 11:35:44 2008
+++ php-src/ext/mysqli/php_mysqli_structs.h Sat Mar 8 15:16:08 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.11 2008/02/06 11:35:44 andrey Exp $
+ $Id: php_mysqli_structs.h,v 1.12 2008/03/08 15:16:08 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -359,7 +359,7 @@
PHP_MYSQLI_API void mysqli_register_result(zval *return_value, void *result
TSRMLS_DC);
PHP_MYSQLI_API void php_mysqli_set_error(long mysql_errno, char *mysql_err
TSRMLS_DC);
-void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool
is_real_connect);
+void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool
is_real_connect, zend_bool in_ctor);
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
@@ -456,6 +456,7 @@
PHP_FUNCTION(mysqli_insert_id);
PHP_FUNCTION(mysqli_init);
PHP_FUNCTION(mysqli_kill);
+PHP_FUNCTION(mysqli_link_construct);
PHP_FUNCTION(mysqli_set_local_infile_default);
PHP_FUNCTION(mysqli_set_local_infile_handler);
PHP_FUNCTION(mysqli_more_results);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug39457.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/bug39457.phpt
diff -u /dev/null php-src/ext/mysqli/tests/bug39457.phpt:1.2
--- /dev/null Sat Mar 8 15:16:08 2008
+++ php-src/ext/mysqli/tests/bug39457.phpt Sat Mar 8 15:16:08 2008
@@ -0,0 +1,21 @@
+--TEST--
+Bug #39457 (Multiple invoked OO connections never close)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+ include "connect.inc";
+
+ $mysql = mysqli_init();
+ $mysql->connect($host, $user, $passwd, $db, $port, $socket);
+
+ $mysql->connect($host, $user, $passwd, $db, $port, $socket);
+
+ $mysql->close();
+ echo "OK\n";
+?>
+--EXPECT--
+OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
