felipe Sun, 20 Jun 2010 14:12:06 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300612
Log: - Completed the fix for bug #52010 # Fixing pdo drivers Bug: http://bugs.php.net/52010 (Closed) open_basedir restrictions mismatch on vacuum command Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/pdo_sqlite/sqlite_driver.c U php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c U php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c U php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c U php/php-src/trunk/ext/sqlite/pdo_sqlite2.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/branches/PHP_5_2/NEWS 2010-06-20 14:12:06 UTC (rev 300612) @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jun 2010, PHP 5.2.14 - Fixed bug #52061 (memory_limit above 2G). (Felipe) +- Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command). + (Ilia, Felipe) 17 Jun 2010, PHP 5.2.14RC1 - Upgraded bundled PCRE to version 8.02. (Ilia) Modified: php/php-src/branches/PHP_5_2/ext/pdo_sqlite/sqlite_driver.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/branches/PHP_5_2/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -642,7 +642,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { Modified: php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/branches/PHP_5_2/ext/sqlite/pdo_sqlite2.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -515,7 +515,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -636,7 +636,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { Modified: php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/branches/PHP_5_3/ext/sqlite/pdo_sqlite2.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -515,7 +515,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { Modified: php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c =================================================================== --- php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/trunk/ext/pdo_sqlite/sqlite_driver.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -636,7 +636,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) { Modified: php/php-src/trunk/ext/sqlite/pdo_sqlite2.c =================================================================== --- php/php-src/trunk/ext/sqlite/pdo_sqlite2.c 2010-06-20 02:31:58 UTC (rev 300611) +++ php/php-src/trunk/ext/sqlite/pdo_sqlite2.c 2010-06-20 14:12:06 UTC (rev 300612) @@ -515,7 +515,7 @@ static char *make_filename_safe(const char *filename TSRMLS_DC) { - if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) { + if (*filename && strncmp(filename, ":memory:", sizeof(":memory:")-1)) { char *fullpath = expand_filepath(filename, NULL TSRMLS_CC); if (!fullpath) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
