andrey Wed Feb 6 11:35:44 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c
php_mysqli_structs.h
/php-src/ext/mysqli/tests mysqli_real_connect.phpt
mysqli_real_connect_pconn.phpt
Log:
Pconnect working with mysqli_real_connect()
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.116&r2=1.117&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.116 php-src/ext/mysqli/mysqli.c:1.117
--- php-src/ext/mysqli/mysqli.c:1.116 Mon Jan 28 18:27:49 2008
+++ php-src/ext/mysqli/mysqli.c Wed Feb 6 11:35:44 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.116 2008/01/28 18:27:49 andrey Exp $
+ $Id: mysqli.c,v 1.117 2008/02/06 11:35:44 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -684,7 +684,7 @@
/* for mysqli_query */
REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", MYSQLI_STORE_RESULT,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_USE_RESULT", MYSQLI_USE_RESULT, CONST_CS
| CONST_PERSISTENT);
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
REGISTER_LONG_CONSTANT("MYSQLI_BG_STORE_RESULT",
MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT);
#endif
@@ -981,7 +981,7 @@
case MYSQLI_USE_RESULT:
result = mysql_use_result(mysql->mysql);
break;
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
case MYSQLI_BG_STORE_RESULT:
result = mysqli_bg_store_result(mysql->mysql);
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.157&r2=1.158&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.157
php-src/ext/mysqli/mysqli_api.c:1.158
--- php-src/ext/mysqli/mysqli_api.c:1.157 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mysqli/mysqli_api.c Wed Feb 6 11:35:44 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.157 2007/12/31 07:12:11 sebastian Exp $
+ $Id: mysqli_api.c,v 1.158 2008/02/06 11:35:44 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1326,7 +1326,11 @@
#if !defined(HAVE_MYSQLND)
if (!(mysql->mysql = mysql_init(NULL)))
#else
- if (!(mysql->mysql = mysql_init(FALSE)))
+ /*
+ We create always persistent, as if the user want to connecto
+ to p:somehost, we can't convert the handle then
+ */
+ if (!(mysql->mysql = mysql_init(TRUE)))
#endif
{
efree(mysql);
@@ -1665,86 +1669,7 @@
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_real_connect)
{
- MY_MYSQL *mysql;
- char *hostname = NULL, *username=NULL, *passwd=NULL,
*dbname=NULL, *socket=NULL;
- unsigned int hostname_len = 0, username_len = 0, passwd_len = 0,
dbname_len = 0, socket_len = 0;
- unsigned long port=0, flags=0;
- zval *mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O|s&s&s&s&ls&l", &mysql_link, mysqli_link_class_entry,
- &hostname, &hostname_len, UG(utf8_conv), &username,
&username_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
- &dbname, &dbname_len, UG(utf8_conv), &port, &socket,
&socket_len, UG(utf8_conv), &flags) == FAILURE) {
- return;
- }
-
- if (!socket_len) {
- socket = NULL;
- }
- if (!socket) {
- socket = MyG(default_socket);
- }
- if (!passwd) {
- passwd = MyG(default_pw);
- passwd_len = strlen(passwd);
- }
- if (!username){
- username = MyG(default_user);
- }
- if (!hostname) {
- hostname = MyG(default_host);
- }
-
- MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_INITIALIZED);
-
- /* set some required options */
- flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
- /* remove some insecure options */
- flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via
connect parameter */
- if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
- flags ^= CLIENT_LOCAL_FILES;
- }
-
- if (UG(unicode)) {
- mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, "utf8");
- }
-
-#if !defined(HAVE_MYSQLND)
- if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname
,port, socket ,flags) == NULL)
-#else
- if (mysqlnd_connect(mysql->mysql, hostname, username, passwd,
passwd_len, dbname, dbname_len,
- port, socket, flags,
MyG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL)
-#endif
- {
- php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
- php_mysqli_throw_sql_exception((char
*)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC,
-
"%s", mysql_error(mysql->mysql));
-
- /* change status */
- MYSQLI_SET_STATUS(&mysql_link, MYSQLI_STATUS_INITIALIZED);
- RETURN_FALSE;
- }
-
- /* when PHP runs in unicode, set default character set to utf8 */
- if (UG(unicode)) {
- mysql->conv = UG(utf8_conv);
- }
-
- /* clear error */
- php_mysqli_set_error(mysql_errno(mysql->mysql), (char
*)mysql_error(mysql->mysql) TSRMLS_CC);
-
-#if !defined(HAVE_MYSQLND)
- mysql->mysql->reconnect = MyG(reconnect);
-
- /* set our own local_infile handler */
- php_set_local_infile_handler_default(mysql);
-#endif
-
- mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char
*)&MyG(allow_local_infile));
-
- /* change status */
- MYSQLI_SET_STATUS(&mysql_link, MYSQLI_STATUS_VALID);
-
- RETURN_TRUE;
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.76
php-src/ext/mysqli/mysqli_nonapi.c:1.77
--- php-src/ext/mysqli/mysqli_nonapi.c:1.76 Mon Jan 28 18:27:49 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Wed Feb 6 11:35:44 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.76 2008/01/28 18:27:49 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.77 2008/02/06 11:35:44 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,11 +33,270 @@
#define SAFE_STR(a) ((a)?a:"")
+void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool
is_real_connect)
+{
+ MY_MYSQL *mysql = NULL;
+ MYSQLI_RESOURCE *mysqli_resource = NULL;
+ zval *object = getThis();
+ char *hostname = NULL, *username=NULL,
*passwd=NULL, *dbname=NULL, *socket=NULL;
+ unsigned int hostname_len = 0, username_len = 0, passwd_len
= 0, dbname_len = 0, socket_len = 0;
+ zend_bool persistent = FALSE;
+ long port = 0, flags = 0;
+ uint hash_len;
+ char *hash_key = NULL;
+ zend_bool new_connection = FALSE;
+ zend_rsrc_list_entry *le;
+ mysqli_plist_entry *plist = NULL;
+
+ if (getThis() && !ZEND_NUM_ARGS()) {
+ RETURN_NULL();
+ }
+ hostname = username = dbname = passwd = socket = NULL;
+
+ if (!is_real_connect) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&s&ls&", &hostname, &hostname_len, UG(utf8_conv),
+ &username,
&username_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
+ &dbname,
&dbname_len, UG(utf8_conv), &port, &socket, &socket_len, UG(utf8_conv)) ==
FAILURE) {
+ return;
+ }
+
+ 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 (!mysql) {
+ 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,
+ &hostname, &hostname_len, UG(utf8_conv), &username,
&username_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
+ &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);
+
+ flags |= CLIENT_MULTI_RESULTS; /* needed for
mysql_multi_query() */
+ /* remove some insecure options */
+ flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow
multi_queries via connect parameter */
+ if (PG(open_basedir) && PG(open_basedir)[0] != '\0') {
+ flags ^= CLIENT_LOCAL_FILES;
+ }
+ }
+
+
+ if (!socket_len || !socket) {
+ socket = MyG(default_socket);
+ }
+
+ if (!passwd) {
+ passwd = MyG(default_pw);
+ passwd_len = strlen(SAFE_STR(passwd));
+ }
+ if (!username){
+ username = MyG(default_user);
+ }
+ if (!hostname || !hostname_len) {
+ hostname = MyG(default_host);
+ }
+
+ if (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)) {
+ hostname += 2;
+ if (!MyG(allow_persistent)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Persistent
connections are disabled. Downgrading to normal");
+ } else {
+ mysql->persistent = persistent = TRUE;
+
+ hash_len = spprintf(&hash_key, 0,
"mysqli_%s_%s%ld%s%s%s", SAFE_STR(hostname), SAFE_STR(socket),
+ port,
SAFE_STR(username), SAFE_STR(dbname),
+
SAFE_STR(passwd));
+
+ mysql->hash_key = hash_key;
+
+ /* check if we can reuse exisiting connection ... */
+ if (zend_hash_find(&EG(persistent_list), hash_key,
hash_len + 1, (void **)&le) == SUCCESS) {
+ if (Z_TYPE_P(le) == php_le_pmysqli()) {
+ plist = (mysqli_plist_entry *) le->ptr;
+
+ do {
+ if
(zend_ptr_stack_num_elements(&plist->free_links)) {
+ if (is_real_connect) {
+ /*
+ Gotcha! If
there are some options set on the handle with mysqli_options()
+ they will be
lost. We will fetch other handle with other options. This could
+ be a source
of bug reports of people complaining but...nothing else could be
+ done, if they
want PCONN!
+ */
+
mysqli_close(mysql->mysql, MYSQLI_CLOSE_IMPLICIT);
+ }
+ mysql->mysql =
zend_ptr_stack_pop(&plist->free_links);
+
+
MyG(num_inactive_persistent)--;
+ /* reset variables */
+ /* todo: option for
ping or change_user */
+#if G0
+ if
(!mysql_change_user(mysql->mysql, username, passwd, dbname)) {
+#else
+ if
(!mysql_ping(mysql->mysql)) {
+#endif
+#ifdef HAVE_MYSQLND
+
mysqlnd_restart_psession(mysql->mysql);
+#endif
+
MyG(num_active_persistent)++;
+ goto end;
+ } else {
+#if defined(HAVE_MYSQLND)
+
mysqlnd_end_psession(mysql->mysql);
+#endif
+
mysqli_close(mysql->mysql, MYSQLI_CLOSE_IMPLICIT);
+ mysql->mysql =
NULL;
+ }
+ }
+ } while (0);
+ }
+ } else {
+ zend_rsrc_list_entry le;
+ le.type = php_le_pmysqli();
+ le.ptr = plist = calloc(1,
sizeof(mysqli_plist_entry));
+
+ zend_ptr_stack_init_ex(&plist->free_links, 1);
+ zend_hash_update(&EG(persistent_list),
hash_key, hash_len + 1, (void *)&le, sizeof(le), NULL);
+ }
+ }
+ }
+
+ if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
links (%ld)", MyG(num_links));
+ goto err;
+ }
+ if (persistent && MyG(max_persistent) != -1 &&
+ (MyG(num_active_persistent) + MyG(num_inactive_persistent))>=
MyG(max_persistent))
+ {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open
persistent links (%ld)",
+
MyG(num_active_persistent) + MyG(num_inactive_persistent));
+ goto err;
+ }
+ if (!is_real_connect) {
+#if !defined(HAVE_MYSQLND)
+ if (!(mysql->mysql = mysql_init(NULL))) {
+#else
+ if (!(mysql->mysql = mysqlnd_init(persistent))) {
+#endif
+ goto err;
+ }
+ new_connection = TRUE;
+ }
+
+ if (UG(unicode)) {
+ mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+ }
+
+
+#ifdef HAVE_EMBEDDED_MYSQLI
+ if (hostname_len) {
+ unsigned int external=1;
+ mysql_options(mysql->mysql, MYSQL_OPT_USE_REMOTE_CONNECTION,
(char *)&external);
+ } else {
+ mysql_options(mysql->mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
0);
+ }
+#endif
+
+#if !defined(HAVE_MYSQLND)
+ if (mysql_real_connect(mysql->mysql, hostname, username, passwd,
dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
+#else
+ if (mysqlnd_connect(mysql->mysql, hostname, username, passwd,
passwd_len, dbname, dbname_len,
+ port, socket, flags,
MyG(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL)
+#endif
+ {
+ /* Save error messages */
+ php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
+ php_mysqli_throw_sql_exception((char
*)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC,
+
"%s", mysql_error(mysql->mysql));
+ if (!is_real_connect) {
+ /* free mysql structure */
+ mysqli_close(mysql->mysql, MYSQLI_CLOSE_DISCONNECTED);
+ }
+ goto err;
+ }
+
+ /* when PHP runs in unicode, set default character set to utf8 */
+ if (UG(unicode)) {
+ mysql->conv = UG(utf8_conv);
+ }
+
+ /* clear error */
+ php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
+
+#if !defined(HAVE_MYSQLND)
+ mysql->mysql->reconnect = MyG(reconnect);
+
+ /* set our own local_infile handler */
+ php_set_local_infile_handler_default(mysql);
+#endif
+
+ mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char
*)&MyG(allow_local_infile));
+
+end:
+ if (!mysqli_resource) {
+ mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
+ mysqli_resource->ptr = (void *)mysql;
+ }
+ mysqli_resource->status = MYSQLI_STATUS_VALID;
+
+ /* store persistent connection */
+ if (persistent && (new_connection || is_real_connect)) {
+ MyG(num_active_persistent)++;
+ }
+
+ MyG(num_links)++;
+
+#if !defined(HAVE_MYSQLND)
+ mysql->multi_query = 0;
+#else
+ mysql->multi_query = 1;
+#endif
+
+ if (!object || !instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {
+ MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
+ } else {
+ ((mysqli_object *) zend_object_store_get_object(object
TSRMLS_CC))->ptr = mysqli_resource;
+ }
+ if (!is_real_connect) {
+ return;
+ } else {
+ RETURN_TRUE;
+ }
+
+err:
+ if (mysql->hash_key) {
+ efree(mysql->hash_key);
+ mysql->hash_key = NULL;
+ }
+ if (!is_real_connect) {
+ efree(mysql);
+ }
+ RETVAL_FALSE;
+}
+
/* {{{ proto object mysqli_connect([string hostname [,string username [,string
passwd [,string dbname [,int port [,string socket]]]]]])
Open a connection to a mysql server */
PHP_FUNCTION(mysqli_connect)
{
+ mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
+#if 0
MY_MYSQL *mysql = NULL;
MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
@@ -259,6 +518,7 @@
efree(hash_key);
}
RETVAL_FALSE;
+#endif
}
/* }}} */
@@ -474,7 +734,7 @@
RETURN_FALSE;
}
if (resultmode != MYSQLI_USE_RESULT && resultmode != MYSQLI_STORE_RESULT
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
&& resultmode != MYSQLI_BG_STORE_RESULT
#endif
) {
@@ -506,7 +766,7 @@
case MYSQLI_USE_RESULT:
result = mysql_use_result(mysql->mysql);
break;
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADING)
+#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
case MYSQLI_BG_STORE_RESULT:
result = mysqli_bg_store_result(mysql->mysql);
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.10
php-src/ext/mysqli/php_mysqli_structs.h:1.11
--- php-src/ext/mysqli/php_mysqli_structs.h:1.10 Wed Jan 30 09:56:22 2008
+++ php-src/ext/mysqli/php_mysqli_structs.h Wed Feb 6 11:35:44 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.10 2008/01/30 09:56:22 dmitry Exp $
+ $Id: php_mysqli_structs.h,v 1.11 2008/02/06 11:35:44 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -315,9 +315,11 @@
#define MYSQLI_STORE_RESULT 0
#define MYSQLI_USE_RESULT 1
-#ifdef HAVE_MYSQLND
+#ifdef HAVE_MYSQLND
+#ifdef MYSQLND_THREADED
#define MYSQLI_BG_STORE_RESULT 101
#endif
+#endif
/* for mysqli_fetch_assoc */
#define MYSQLI_ASSOC 1
@@ -357,6 +359,9 @@
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);
+
+
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
long default_link;
long num_links;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_connect.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_connect.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.4
php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.4 Wed Oct 10
10:51:34 2007
+++ php-src/ext/mysqli/tests/mysqli_real_connect.phpt Wed Feb 6 11:35:44 2008
@@ -157,17 +157,21 @@
ini_set('mysqli.default_host', 'p:');
$link = mysqli_init();
- if (@mysqli_real_sconnect($link)) {
+ if (@mysqli_real_connect($link)) {
printf("[025] Usage of mysqli.default_host=p: did not
fail\n") ;
mysqli_close($link);
}
}
- if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
- printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
+ var_dump($link);
+
+ if (NULL === ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
+ printf("[026] Expecting not NULL, got %s/%s\n", gettype($tmp),
$tmp);
print "done!";
?>
--EXPECTF--
Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s'
(using password: YES) in %s on line %d
-done!
\ No newline at end of file
+object(mysqli)#%d (%d) {
+}
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
diff -u php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.2
php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.2 Wed Oct 10
10:54:02 2007
+++ php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt Wed Feb 6
11:35:44 2008
@@ -117,7 +117,6 @@
mysqli_close($link);
if ($IS_MYSQLND) {
- ini_set('mysqli.default_host', 'p:' . $host);
$link = mysqli_init();
if ([EMAIL PROTECTED]($link)) {
printf("[022] Usage of mysqli.default_host=p:%s
(persistent) failed\n", $host) ;
@@ -136,17 +135,17 @@
ini_set('mysqli.default_host', 'p:');
$link = mysqli_init();
- if (@mysqli_real_sconnect($link)) {
+ if (@mysqli_real_connect($link)) {
printf("[025] Usage of mysqli.default_host=p: did not
fail\n") ;
mysqli_close($link);
}
}
- if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
- printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
+ if (NULL === ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
+ printf("[026] Expecting not NULL, got %s/%s\n", gettype($tmp),
$tmp);
print "done!";
?>
--EXPECTF--
Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s'
(using password: YES) in %s on line %d
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
