diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-11-23 15:45:04 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-11-23 15:45:04 +0000 |
| commit | 755318926ed42fc94ee73026640b8fe959910ee3 (patch) | |
| tree | cc2cd30ce215686150527dcc8f29957e2bb7ef5a | |
| parent | f76c5282aec921356b070982db60d6d2ad2355fb (diff) | |
| download | php-git-755318926ed42fc94ee73026640b8fe959910ee3.tar.gz | |
Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used if it is empty).
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | ext/pdo_mysql/pdo_mysql.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -24,6 +24,8 @@ PHP NEWS - Fixed memory leak in extension loading when an error occurs on Windows. (Pierre) +- Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used + if it is empty). (foutrelis at gmail dot com, Ilia) - Fixed bug #50219 (soap call Segmentation fault on a redirected url). (Pierrick) - Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT). diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index ccd42f5743..3c222c6b1d 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -52,7 +52,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql); */ PHP_INI_BEGIN() #ifndef PHP_WIN32 - STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateString, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals) + STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, PHP_INI_SYSTEM, OnUpdateStringUnempty, default_socket, zend_pdo_mysql_globals, pdo_mysql_globals) #endif #if PDO_DBG_ENABLED STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals) |