iliaa Mon, 23 Nov 2009 15:45:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291215
Log: Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used if it is empty). Bug: http://bugs.php.net/50240 (Open) pdo_mysql.default_socket in php.ini shouldn't used if it's empty Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c U php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-11-23 15:09:57 UTC (rev 291214) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-23 15:45:04 UTC (rev 291215) @@ -24,6 +24,8 @@ - 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). Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:09:57 UTC (rev 291214) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:45:04 UTC (rev 291215) @@ -52,7 +52,7 @@ */ 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) Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:09:57 UTC (rev 291214) +++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:45:04 UTC (rev 291215) @@ -52,7 +52,7 @@ */ 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)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
