pajoye Wed, 03 Feb 2010 21:00:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294469
Log: Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored) Bug: http://bugs.php.net/50829 (Closed) php.ini directive pdo_mysql.default_socket is ignored Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c U php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,293974 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,293974,294040 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c 2010-02-03 20:59:27 UTC (rev 294468) +++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/pdo_mysql.c 2010-02-03 21:00:20 UTC (rev 294469) @@ -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_2/ext/pdo_mysql/php_pdo_mysql_int.h =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-03 20:59:27 UTC (rev 294468) +++ php/php-src/branches/PHP_5_3_2/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-03 21:00:20 UTC (rev 294469) @@ -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) Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,294040 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293862,293906,294040 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
