mariuz Tue, 27 Dec 2011 16:49:00 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=321439
Log: http://gcov.php.net/viewer.php?version=PHP_5_3&func=tests&file=ext%2Fpdo_firebird%2Ftests%2Fbug_43130.phpt fix failure for bug 43130 Bug: https://bugs.php.net/43130 (Wont fix) bind parameter cannot contain dashes Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c U php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c U php/php-src/trunk/ext/pdo_firebird/firebird_driver.c Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:38:23 UTC (rev 321438) +++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:49:00 UTC (rev 321439) @@ -440,8 +440,10 @@ continue; } } else { - if ((in_param &= (sql[l] == '_') || (sql[l] >= 'A' && sql[l] <= 'Z') - || (sql[l] >= 'a' && sql[l] <= 'z') || (sql[l] >= '0' && sql[l] <= '9'))) { + if ((in_param &= ((sql[l] >= 'A' && sql[l] <= 'Z') || (sql[l] >= 'a' && sql[l] <= 'z') + || (sql[l] >= '0' && sql[l] <= '9') || sql[l] == '_' || sql[l] == '-'))) { + + *ppname++ = sql[l]; continue; } else { Modified: php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:38:23 UTC (rev 321438) +++ php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:49:00 UTC (rev 321439) @@ -440,8 +440,10 @@ continue; } } else { - if ((in_param &= (sql[l] == '_') || (sql[l] >= 'A' && sql[l] <= 'Z') - || (sql[l] >= 'a' && sql[l] <= 'z') || (sql[l] >= '0' && sql[l] <= '9'))) { + if ((in_param &= ((sql[l] >= 'A' && sql[l] <= 'Z') || (sql[l] >= 'a' && sql[l] <= 'z') + || (sql[l] >= '0' && sql[l] <= '9') || sql[l] == '_' || sql[l] == '-'))) { + + *ppname++ = sql[l]; continue; } else { Modified: php/php-src/trunk/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:38:23 UTC (rev 321438) +++ php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2011-12-27 16:49:00 UTC (rev 321439) @@ -440,8 +440,10 @@ continue; } } else { - if ((in_param &= (sql[l] == '_') || (sql[l] >= 'A' && sql[l] <= 'Z') - || (sql[l] >= 'a' && sql[l] <= 'z') || (sql[l] >= '0' && sql[l] <= '9'))) { + if ((in_param &= ((sql[l] >= 'A' && sql[l] <= 'Z') || (sql[l] >= 'a' && sql[l] <= 'z') + || (sql[l] >= '0' && sql[l] <= '9') || sql[l] == '_' || sql[l] == '-'))) { + + *ppname++ = sql[l]; continue; } else {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
