andrey Sat Mar 8 14:55:52 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests bug39457.phpt
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_fe.c
mysqli_nonapi.c php_mysqli_structs.h
Log:
Fix a problem with $mysqi->connect() not working with default values.
Fix a leak, bug#39457
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.17&r2=1.72.2.16.2.17.2.18&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.17
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.18
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.17 Mon Feb 18 13:28:48 2008
+++ php-src/ext/mysqli/mysqli.c Sat Mar 8 14:55:52 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.17 2008/02/18 13:28:48 iliaa Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.18 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -54,9 +54,6 @@
MYSQLND_QCACHE *mysqli_mysqlnd_qcache;
#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);
@@ -433,7 +430,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.118.2.22.2.16.2.12&r2=1.118.2.22.2.16.2.13&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.12
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.13
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.12 Wed Feb 6
11:34:43 2008
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 8 14:55:52 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.12 2008/02/06 11:34:43 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.13 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1595,7 +1595,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.49.2.5.2.1.2.4&r2=1.49.2.5.2.1.2.5&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.4
php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.5
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.4 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqli/mysqli_fe.c Sat Mar 8 14:55:52 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.4 2007/12/31 07:17:10 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.5 2008/03/08 14:55:52 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -209,7 +209,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.54.2.7.2.5.2.6&r2=1.54.2.7.2.5.2.7&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.6
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.7
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.6 Wed Feb 6 11:34:43 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Mar 8 14:55:52 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.6 2008/02/06 11:34:43 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.7 2008/03/08 14:55:52 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;
@@ -61,14 +61,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;
+ }
}
}
}
@@ -76,7 +76,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|sssslsl", &object, mysqli_link_class_entry,
@@ -84,6 +83,7 @@
&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
@@ -285,7 +285,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.4.2.9&r2=1.4.2.10&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.9
php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10
--- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.9 Wed Feb 6 11:34:43 2008
+++ php-src/ext/mysqli/php_mysqli_structs.h Sat Mar 8 14:55:52 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.4.2.9 2008/02/06 11:34:43 andrey Exp $
+ $Id: php_mysqli_structs.h,v 1.4.2.10 2008/03/08 14:55:52 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -344,7 +344,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)
@@ -441,6 +441,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?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/bug39457.phpt
+++ php-src/ext/mysqli/tests/bug39457.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
