[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c trunk/ext/pdo_mysql/pdo_mysql.c

2009-11-23 Thread Ilia Alshanetsky 
iliaaMon, 23 Nov 2009 15:45:04 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291215

Log:
Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used if it is 
empty).

Bug: http://bugs.php.net/50240 (Open) pdo_mysql.default_socket in php.ini 
shouldn't used if it's empty
  
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-11-23 15:09:57 UTC (rev 291214)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-23 15:45:04 UTC (rev 291215)
@@ -24,6 +24,8 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used
+  if it is empty). (foutrelis at gmail dot com, Ilia)
 - Fixed bug #50219 (soap call Segmentation fault on a redirected url).
   (Pierrick)
 - Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).

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-11-23 
15:09:57 UTC (rev 291214)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c  2009-11-23 
15:45:04 UTC (rev 291215)
@@ -52,7 +52,7 @@
 */
 PHP_INI_BEGIN()
 #ifndef PHP_WIN32
-   STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, 
PHP_INI_SYSTEM, OnUpdateString, default_socket, zend_pdo_mysql_globals, 
pdo_mysql_globals)
+   STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, 
PHP_INI_SYSTEM, OnUpdateStringUnempty, default_socket, zend_pdo_mysql_globals, 
pdo_mysql_globals)
 #endif
 #if PDO_DBG_ENABLED
STD_PHP_INI_ENTRY("pdo_mysql.debug",NULL, PHP_INI_SYSTEM, 
OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)

Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
===
--- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:09:57 UTC (rev 
291214)
+++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2009-11-23 15:45:04 UTC (rev 
291215)
@@ -52,7 +52,7 @@
 */
 PHP_INI_BEGIN()
 #ifndef PHP_WIN32
-   STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, 
PHP_INI_SYSTEM, OnUpdateString, default_socket, zend_pdo_mysql_globals, 
pdo_mysql_globals)
+   STD_PHP_INI_ENTRY("pdo_mysql.default_socket", PDO_MYSQL_UNIX_ADDR, 
PHP_INI_SYSTEM, OnUpdateStringUnempty, default_socket, zend_pdo_mysql_globals, 
pdo_mysql_globals)
 #endif
 #if PDO_DBG_ENABLED
STD_PHP_INI_ENTRY("pdo_mysql.debug",NULL, PHP_INI_SYSTEM, 
OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c trunk/ext/pdo_mysql/pdo_mysql.c

2009-10-29 Thread Ilia Alshanetsky 
iliaaThu, 29 Oct 2009 13:33:51 +

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