archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fix bug #60155 (pdo_mysql.default_socket ignored).

Browse source
This commit is contained in:
Johannes Schlüter 2011-11-02 15:45:53 +00:00
parent e3269e029e
commit 6781f17575
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/pdo_mysql/pdo_mysql.c
View file

@ -37,12 +37,22 @@ ZEND_GET_MODULE(pdo_mysql)
ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql);
#ifndef PHP_WIN32
# ifndef PDO_MYSQL_UNIX_ADDR
# ifdef PHP_MYSQL_UNIX_SOCK_ADDR
# define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
# else
/*
The default socket location is sometimes defined by configure.
With libmysql `mysql_config --socket` will fill PDO_MYSQL_UNIX_ADDR
and the user can use --with-mysql-sock=SOCKET which will fill
PDO_MYSQL_UNIX_ADDR. If both aren't set we're using mysqlnd and use
/tmp/mysql.sock as default on *nix and NULL for Windows (default
named pipe name is set in mysqlnd).
*/
#ifndef PDO_MYSQL_UNIX_ADDR
# ifdef PHP_MYSQL_UNIX_SOCK_ADDR
# define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
# else
# if !PHP_WIN32
# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock"
# else
# define PDO_MYSQL_UNIX_ADDR NULL
# endif
# endif
#endif
@ -112,7 +122,7 @@ static PHP_MINFO_FUNCTION(pdo_mysql)
php_info_print_table_end();
#ifdef PDO_USE_MYSQLND
#ifndef PHP_WIN32
DISPLAY_INI_ENTRIES();
#endif
}