iliaa Sun, 06 Dec 2009 19:34:12 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291775
Log: Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). Bug: http://bugs.php.net/50323 (Open) No ability to connect to database named 't;', no chance to escape semicolon Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/pdo/pdo.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo/pdo.c U php/php-src/trunk/ext/pdo/pdo.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-12-06 19:31:37 UTC (rev 291774) +++ php/php-src/branches/PHP_5_2/NEWS 2009-12-06 19:34:12 UTC (rev 291775) @@ -10,6 +10,7 @@ - Fixed bug #50345 (nanosleep not detected properly on some solaris versions). (Jani) +- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). (Ilia) - Fixed bug #50266 (conflicting types for llabs). (Jani) - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to non-existent file). (Dmitry) Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-12-06 19:31:37 UTC (rev 291774) +++ php/php-src/branches/PHP_5_2/ext/pdo/pdo.c 2009-12-06 19:34:12 UTC (rev 291775) @@ -240,7 +240,7 @@ semi = i++; break; } - if (data_source[i] == ';') { + if (data_source[i] == ';' && ((i + 1 >= data_source_len) || data_source[i+1] != ';')) { semi = i++; break; } Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-12-06 19:31:37 UTC (rev 291774) +++ php/php-src/branches/PHP_5_3/NEWS 2009-12-06 19:34:12 UTC (rev 291775) @@ -33,6 +33,7 @@ - Fixed bug #50345 (nanosleep not detected properly on some solaris versions). (Jani) - Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani) +- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). (Ilia) - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays). (Felipe) - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-12-06 19:31:37 UTC (rev 291774) +++ php/php-src/branches/PHP_5_3/ext/pdo/pdo.c 2009-12-06 19:34:12 UTC (rev 291775) @@ -245,7 +245,7 @@ semi = i++; break; } - if (data_source[i] == ';') { + if (data_source[i] == ';' && ((i + 1 >= data_source_len) || data_source[i+1] != ';')) { semi = i++; break; } Modified: php/php-src/trunk/ext/pdo/pdo.c =================================================================== --- php/php-src/trunk/ext/pdo/pdo.c 2009-12-06 19:31:37 UTC (rev 291774) +++ php/php-src/trunk/ext/pdo/pdo.c 2009-12-06 19:34:12 UTC (rev 291775) @@ -245,7 +245,7 @@ semi = i++; break; } - if (data_source[i] == ';') { + if (data_source[i] == ';' && ((i + 1 >= data_source_len) || data_source[i+1] != ';')) { semi = i++; break; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
