summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'PHP-5.3' into PHP-5.5Remi Collet2012-11-282-5/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed Bug #63581 Possible buffer overflow Fixed Bug #63581 Possible null dereference
| * | | | | Fixed Bug #63581 Possible buffer overflowRemi Collet2012-11-282-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In fpm-log, possible buffer overflow. Check for length is done at the beginning of the loop, so is not done when overflow occurs on the last loop (len = 1024 or 1025). (ack from fat). This issue where found from by static code analysis tool and, so, I can't provide any reproducer.
| * | | | | Fixed Bug #63581 Possible null dereferenceRemi Collet2012-11-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference when trying to delete the single item of a list (ack from fat). This issues where found from by static code analysis tool and, so, I can't provide any reproducer.
| * | | | | Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Remi Collet2012-11-2810-109/+84
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of git.php.net:php-src: Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows This test isn't supposed to pass on windows Fixed Bug #63614 (Fatal error on Reflection)
* | \ \ \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Remi Collet2012-11-2810-133/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: updated NEWS Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows This test isn't supposed to pass on windows Fixed Bug #63614 (Fatal error on Reflection)
| * | | | | | | updated NEWSAnatoliy Belsky2012-11-271-0/+2
| | | | | | | |
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-276-131/+44
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows Conflicts: NEWS
| | * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-277-131/+48
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows Conflicts: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/tests/finfo_open_error-win32.phpt
| | | * | | | | Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under WindowsAnatoliy Belsky2012-11-277-107/+29
| | | | | | | |
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-271-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: This test isn't supposed to pass on windows
| | * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-271-1/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: This test isn't supposed to pass on windows
| | | * | | | | This test isn't supposed to pass on windowsAnatoliy Belsky2012-11-271-1/+6
| | | | | | | |
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-11-272-1/+42
| |\ \ \ \ \ \ \ |/ / / / / / / / | | _ / / / / / | | / / / / /
| * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-273-1/+45
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Fixed Bug #63614 (Fatal error on Reflection)Xinchen Hui2012-11-273-1/+49
| | |/ / /
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-261-17/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Related bug #63588 fix length computation + optimize for speed
| * | | | Related bug #63588 fix length computation + optimize for speedRemi Collet2012-11-261-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following comment from Yoram "The patch looks fine, except of testing for true value of utf16 in each iteration." Also fix the length computation during check phase.
* | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Remi Collet2012-11-261-8/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: count($test_files) already be checked above : if ($test_cnt)
| * \ \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Xinchen Hui2012-11-256-67/+34
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-255-67/+31
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63588 Duplicate implementation of php_next_utf8_char
| * | | | | Fixed bug #63588 Duplicate implementation of php_next_utf8_charRemi Collet2012-11-256-67/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Json use an utf8 parser from a third party library, switch to our implementation of php_next_utf8_char. This also helps on solving #63520. All the unit tests succeed. Our implementation also seems a little faster. json.dsp need to be regenerated.
* | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-251-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed Bug #63361 Header not installed
| * | | | | Fixed Bug #63361 Header not installedRemi Collet2012-11-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ext/mysqli/php_mysqli_structs.h is installed and includes mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also be installed.
| * | | | | NEWS entriesRemi Collet2012-11-251-0/+7
| | | | | |
| | * | | | count($test_files) already be checked above : if ($test_cnt)Xinchen Hui2012-11-251-8/+6
| |/ / / / |/| | | | | | | | | | | | | | thus we can use $sum_results instead of the preg_match
* | | | | XFAIL test should not be considered as failedXinchen Hui2012-11-251-1/+1
| | | | |
* | | | | let make test report the run-test resultXinchen Hui2012-11-251-0/+2
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2012-11-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix NEWS 5.4.10-dev Conflicts: configure.in main/php_version.h
| * | | | fix NEWSStanislav Malyshev2012-11-241-5/+19
| | | | |
| * | | | 5.4.10-devStanislav Malyshev2012-11-243-4/+6
| | | | |
* | | | | Fix bug #63596: finally in generators segfaultsNikita Popov2012-11-242-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | EX(fast_ret) wasn't initialized in this case so the code ended up dereferencing an invalid pointer after the jump.
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-241-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed Bug #63149 Feature missing with system SQLite
| * | | | Fixed Bug #63149 Feature missing with system SQLiteRemi Collet2012-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In pdo_sqlite, getColumnMeta should return the table name. With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags) enable the feature in SQLite (function sqlite3_column_table_name). With system SQLite library, this fix detects if sqlite3_column_table_name is available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior. Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-241-0/+52
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * PHP-5.4: add unit test for bug 63126 NEWS
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-241-0/+52
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.3: add unit test for bug 63126 NEWS
| | * | | add unit test for bug 63126Remi Collet2012-11-241-0/+52
| | | | |
| | * | | NEWSRemi Collet2012-11-241-0/+2
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2012-11-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-241-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.3: Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
| | * | | Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores arrayRemi Collet2012-11-241-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-230-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Backported the fix for bug #63248 from 5.4+
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-230-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.3: Backported the fix for bug #63248 from 5.4+
| | * | | Backported the fix for bug #63248 from 5.4+Anatoliy Belsky2012-11-234-114/+144
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-221-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed test for bug #63297
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-221-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.3: Fixed test for bug #63297
| | * | | Fixed test for bug #63297Anatoliy Belsky2012-11-221-0/+3
| | | | |
* | | | | Improved "finally" im[plementationDmitry Stogov2012-11-228-433/+375
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2012-11-210-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-11-210-0/+0
| |\ \ \ \ | | |/ / /
| | * | | PHP 5.3.19Johannes Schlüter2012-11-211-7/+2
| | | | |