clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFB:

Browse Source 
- Fixed problem with $mysqli->connect() not connecting with defaults
- Fixed leak (#39475)
This commit is contained in:
Andrey Hristov 2008-03-08 15:16:08 +00:00
parent effe87122f
commit f20d47c541
6 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mysqli/mysqli.c
View File

@ -57,8 +57,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);
@ -426,7 +424,7 @@ static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC)
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) {

2
ext/mysqli/mysqli_api.c
View File

@ -1669,7 +1669,7 @@ PHP_FUNCTION(mysqli_prepare)
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);
}
/* }}} */

2
ext/mysqli/mysqli_fe.c
View File

@ -211,7 +211,7 @@ const zend_function_entry mysqli_link_methods[] = {
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)

35
ext/mysqli/mysqli_nonapi.c
View File

@ -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 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
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 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
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 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
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 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
&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 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
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 @@ err:
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);
}
/* }}} */

3
ext/mysqli/php_mysqli_structs.h
View File

@ -359,7 +359,7 @@ PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt TSRMLS_D
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_info);
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);

21
ext/mysqli/tests/bug39457.phpt Normal file
View File

@ -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