cvs: php-src /ext/mysqli mysqli_api.c
| From: | Antony Dovgal | Date: | Thu, 22 Sep 2005 20:14:19 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34084@lists.php.net to get a copy of this message | ||
tony2001 Thu Sep 22 16:14:19 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has no effect) for real
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.119&r2=1.120&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.119 php-src/ext/mysqli/mysqli_api.c:1.120
--- php-src/ext/mysqli/mysqli_api.c:1.119 Mon Aug 22 08:22:09 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 22 16:14:15 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.119 2005/08/22 12:22:09 dmitry Exp $
+ $Id: mysqli_api.c,v 1.120 2005/09/22 20:14:15 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1360,6 +1360,10 @@
flags ^= CLIENT_LOCAL_FILES;
}
+ if (!socket) {
+ socket = MyG(default_socket);
+ }
+
if (mysql_real_connect(mysql->mysql,hostname,username,passwd,dbname,port,socket,flags) == NULL)
{
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)
TSRMLS_CC);