svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h
trunk/ext/pdo_mysql/pdo_mysql.c trunk/ext/pdo_mysql/php_pdo_mysql_int.h

iliaa Tue, 26 Jan 2010 13:15:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294040 Log: Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored) Bug: http://bugs.php.net/50829 (Open) php.ini directive pdo_mysql.default_socket is ignored 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/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h U php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c U php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-01-26 12:29:46 UTC (rev 294039) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-26 13:15:52 UTC (rev 294040) @@ -18,6 +18,8 @@ - Fixed possible crash when a error/warning is raised during php startup. (Pierre) +- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored). + (Ilia) - Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP authentication). (Jani) - Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams). 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 2010-01-26 12:29:46 UTC (rev 294039) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c 2010-01-26 13:15:52 UTC (rev 294040) @@ -35,7 +35,6 @@ ZEND_GET_MODULE(pdo_mysql) #endif -#if PDO_USE_MYSQLND ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql); #ifndef PHP_WIN32 @@ -59,7 +58,6 @@ #endif PHP_INI_END() /* }}} */ -#endif /* true global environment */ @@ -67,9 +65,7 @@ */ static PHP_MINIT_FUNCTION(pdo_mysql) { -#if PDO_USE_MYSQLND REGISTER_INI_ENTRIES(); -#endif REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (long)PDO_MYSQL_ATTR_LOCAL_INFILE); Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-26 12:29:46 UTC (rev 294039) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-26 13:15:52 UTC (rev 294040) @@ -61,7 +61,6 @@ #include "ext/mysqlnd/mysqlnd_debug.h" #endif -#ifdef PDO_USE_MYSQLND ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql) #ifndef PHP_WIN32 char *default_socket; @@ -79,7 +78,6 @@ ZEND_END_MODULE_GLOBALS(pdo_mysql) ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql); -#endif #ifdef ZTS #define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v) Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2010-01-26 12:29:46 UTC (rev 294039) +++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2010-01-26 13:15:52 UTC (rev 294040) @@ -35,7 +35,6 @@ ZEND_GET_MODULE(pdo_mysql) #endif -#if PDO_USE_MYSQLND ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql); #ifndef PHP_WIN32 @@ -59,7 +58,6 @@ #endif PHP_INI_END() /* }}} */ -#endif /* true global environment */ @@ -67,9 +65,7 @@ */ static PHP_MINIT_FUNCTION(pdo_mysql) { -#if PDO_USE_MYSQLND REGISTER_INI_ENTRIES(); -#endif REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_USE_BUFFERED_QUERY", (long)PDO_MYSQL_ATTR_USE_BUFFERED_QUERY); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_LOCAL_INFILE", (long)PDO_MYSQL_ATTR_LOCAL_INFILE); Modified: php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h =================================================================== --- php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-26 12:29:46 UTC (rev 294039) +++ php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-26 13:15:52 UTC (rev 294040) @@ -61,7 +61,6 @@ #include "ext/mysqlnd/mysqlnd_debug.h" #endif -#ifdef PDO_USE_MYSQLND ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql) #ifndef PHP_WIN32 char *default_socket; @@ -79,7 +78,6 @@ ZEND_END_MODULE_GLOBALS(pdo_mysql) ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql); -#endif #ifdef ZTS #define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v)