johannes Wed, 02 Nov 2011 15:45:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=318696
Log: - Fix bug #60155 (pdo_mysql.default_socket ignored). Bug: https://bugs.php.net/60155 (Open) pdo_mysql.default_socket ignored Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c U php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c U php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c U php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c U php/php-src/trunk/ext/pdo_mysql/mysql_driver.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 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/branches/PHP_5_3/NEWS 2011-11-02 15:45:53 UTC (rev 318696) @@ -70,6 +70,7 @@ . Fixed bug #55776 (PDORow to session bug). (Johannes) - PDO MySQL driver: + . Fixed bug #60155 (pdo_mysql.default_socket ignored). (Johannes) . Fixed bug #55870 (PDO ignores all SSL parameters when used with mysql native driver) (Pierre) . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -553,12 +553,11 @@ pdo_mysql_check_liveness }; /* }}} */ -#ifdef PDO_USE_MYSQLND -# ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR "MySQL" -# else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) -# endif + +#ifdef PHP_WIN32 +# define MYSQL_UNIX_ADDR NULL +#else +# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ 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 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -37,12 +37,22 @@ 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 +/* + 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 "/tmp/mysql.sock" +# define PDO_MYSQL_UNIX_ADDR NULL # endif # endif #endif @@ -112,7 +122,7 @@ php_info_print_table_end(); -#ifdef PDO_USE_MYSQLND +#ifndef PHP_WIN32 DISPLAY_INI_ENTRIES(); #endif } Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -525,12 +525,11 @@ pdo_mysql_check_liveness }; /* }}} */ -#ifdef PDO_USE_MYSQLND -# ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR "MySQL" -# else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) -# endif + +#ifdef PHP_WIN32 +# define MYSQL_UNIX_ADDR NULL +#else +# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -37,12 +37,22 @@ 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 +/* + 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 "/tmp/mysql.sock" +# define PDO_MYSQL_UNIX_ADDR NULL # endif # endif #endif @@ -141,7 +151,7 @@ php_info_print_table_end(); -#ifdef PDO_USE_MYSQLND +#ifndef PHP_WIN32 DISPLAY_INI_ENTRIES(); #endif } Modified: php/php-src/trunk/ext/pdo_mysql/mysql_driver.c =================================================================== --- php/php-src/trunk/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/trunk/ext/pdo_mysql/mysql_driver.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -525,12 +525,11 @@ pdo_mysql_check_liveness }; /* }}} */ -#ifdef PDO_USE_MYSQLND -# ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR "MySQL" -# else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) -# endif + +#ifdef PHP_WIN32 +# define MYSQL_UNIX_ADDR NULL +#else +# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-11-02 15:32:15 UTC (rev 318695) +++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-11-02 15:45:53 UTC (rev 318696) @@ -37,12 +37,22 @@ 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 +/* + 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 "/tmp/mysql.sock" +# define PDO_MYSQL_UNIX_ADDR NULL # endif # endif #endif @@ -141,7 +151,7 @@ php_info_print_table_end(); -#ifdef PDO_USE_MYSQLND +#ifndef PHP_WIN32 DISPLAY_INI_ENTRIES(); #endif }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
