iliaa Thu, 29 Oct 2009 13:33:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=290053
Log: Fixed bug #50023 (pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR) # Original patch by six at aegis-corp dot org Bug: http://bugs.php.net/50023 (Open) pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR 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-10-29 11:04:46 UTC (rev 290052) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-29 13:33:51 UTC (rev 290053) @@ -14,6 +14,7 @@ - Fixed memory leak in extension loading when an error occurs on Windows. (Pierre) +- Fixed bug #50023 (pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR). (Ilia) - Fixed bug #49142 (crash when exception thrown from __tostring()). (David Soria Parra) - Fixed bug #49990 (SNMP3 warning message about security level printed twice). 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-10-29 11:04:46 UTC (rev 290052) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2009-10-29 13:33:51 UTC (rev 290053) @@ -40,11 +40,14 @@ #ifndef PHP_WIN32 # ifndef PDO_MYSQL_UNIX_ADDR -# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock" +# ifdef PHP_MYSQL_UNIX_SOCK_ADDR +# define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR +# else +# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock" +# endif # endif #endif - /* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-10-29 11:04:46 UTC (rev 290052) +++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-10-29 13:33:51 UTC (rev 290053) @@ -40,11 +40,14 @@ #ifndef PHP_WIN32 # ifndef PDO_MYSQL_UNIX_ADDR -# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock" +# ifdef PHP_MYSQL_UNIX_SOCK_ADDR +# define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR +# else +# define PDO_MYSQL_UNIX_ADDR "/tmp/mysql.sock" +# endif # endif #endif - /* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN()
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
