Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored)

diff --git a/NEWS b/NEWS
index e7a73667b95afd926673da8d531d5fc90819fe39..e4e806c375f8531b0edb2a7b3fb2e67aebe60242 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ PHP                                                                        NEWS
 - 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).

diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 501071dca16cc3039652b48433e622f1ff01773c..010519d053cafd0236ee38b4c49fcf00e9c0cc52 100755 (executable)
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -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 @@ PHP_INI_BEGIN()
 #endif
 PHP_INI_END()
 /* }}} */
-#endif
 
 /* true global environment */          
                
@@ -67,9 +65,7 @@ PHP_INI_END()
  */
 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);    

diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 4cf3df245259933053d07951ef69e06abf252f95..4c01cdc01c1af3a6d37bab3bb07f723af68b72f1 100755 (executable)
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -61,7 +61,6 @@ static inline void PDO_DBG_ENTER(char *func_name) {}
 #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_BEGIN_MODULE_GLOBALS(pdo_mysql)
 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)