| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2015-07-08 | 0 | -0/+0 | |
| |\ | | | | | | | | | | | | | | | * PHP-5.5: 5.5.27 release Conflicts: main/php_version.h | |||||
| | * | 5.5.27 release | Julien Pauli | 2015-07-08 | 2 | -2/+13 | |
| | | | ||||||
| * | | Revert "Fixed invalid read" | Xinchen Hui | 2015-07-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | I must be confused while switching from master to 5.6 This reverts commit 94957a7091d2d87d3b75c8395a3a11a4fbecaea1. | |||||
| * | | Fixed invalid read | Xinchen Hui | 2015-07-08 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fixed bug #70012 (Exception lost with nested finally block) | Xinchen Hui | 2015-07-08 | 4 | -4/+45 | |
| | | | ||||||
| * | | fixed typo in test for bug #66985 | Christoph M. Becker | 2015-07-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-07-07 | 5 | -65/+108 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Better fix for bug #69958 Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/phar/phar_object.c | |||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c | |||||
| | | * | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-07 | 2 | -9/+15 | |
| | | | | ||||||
| | | * | update news | Stanislav Malyshev | 2015-07-07 | 1 | -1/+10 | |
| | | | | ||||||
| | | * | Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) | Stanislav Malyshev | 2015-07-07 | 1 | -25/+40 | |
| | | | | ||||||
| | | * | Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath | Stanislav Malyshev | 2015-07-07 | 1 | -2/+8 | |
| | | | | ||||||
| | | * | Fix bug #69958 - Segfault in Phar::convertToData on invalid file | Stanislav Malyshev | 2015-07-07 | 3 | -34/+50 | |
| | | | | ||||||
| | * | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 1 | -1/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: add missing second argument for ucfirst to the proto | |||||
| | * \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 2 | -0/+3 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 | |||||
| | | * | | | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-07 | 2 | -9/+15 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-06 | 1 | -9/+13 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 | |||||
| | | * | | | | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-06 | 1 | -9/+13 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-06 | 0 | -0/+0 | |
| | |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | * PHP-5.4: update news | |||||
| | | * | | | update news | Stanislav Malyshev | 2015-07-06 | 1 | -1/+10 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-06 | 5 | -58/+94 | |
| | |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c | |||||
| | | * | | | Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) | Stanislav Malyshev | 2015-07-06 | 1 | -25/+40 | |
| | | | | | | ||||||
| | | * | | | Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath | Stanislav Malyshev | 2015-07-04 | 1 | -2/+8 | |
| | | | | | | ||||||
| | | * | | | Fix bug #69958 - Segfault in Phar::convertToData on invalid file | Stanislav Malyshev | 2015-07-04 | 3 | -34/+50 | |
| | | | | | | ||||||
| * | | | | | fix C89 compat | Anatol Belski | 2015-07-07 | 1 | -1/+3 | |
| | | | | | | ||||||
| * | | | | | Fix test related to c22da81 | Julien Pauli | 2015-07-07 | 1 | -3/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | * PHP-5.5: add missing second argument for ucfirst to the proto | |||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| | |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | * PHP-5.4: add missing second argument for ucfirst to the proto | |||||
| | | * | | add missing second argument for ucfirst to the proto | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 | |
| | | |/ | ||||||
| * | | | Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk()) | Xinchen Hui | 2015-07-07 | 3 | -2/+42 | |
| | | | | ||||||
| * | | | Fixed bug #69970 (Use-after-free vulnerability in ↵ | Xinchen Hui | 2015-07-07 | 3 | -3/+54 | |
| | | | | | | | | | | | | | spl_recursive_it_move_forward_ex()) | |||||
| * | | | Fixed double ZEND_TICKS opcode generation for declare() | Julien Pauli | 2015-07-07 | 2 | -0/+23 | |
| | | | | ||||||
| * | | | Attempt at falling back on ldap_find_control for Mac OS | Côme Bernigaud | 2015-07-06 | 2 | -1/+9 | |
| | | | | ||||||
| * | | | Updated README, added test to create LDAP base if missing and ease tests | Côme Bernigaud | 2015-07-06 | 4 | -5/+23 | |
| | | | | ||||||
| * | | | Cleaned white spaces in PHP_INI definition of phar | Dominic | 2015-07-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | | Removes unnecessary white spaces. | |||||
| * | | | Merge branch 'pull-request/1324' into PHP-5.6 | Stanislav Malyshev | 2015-07-05 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | * pull-request/1324: fix typo, see #68476 | |||||
| | * | | | fix typo, see #68476 | Gunter Grodotzki | 2015-06-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | fix backport mistake | Anatol Belski | 2015-07-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | in 5.6 it has to be explicitly copied to avoid double free | |||||
| * | | | | fixed fix #69975 wrt. ODBCVER < 0x0300 | Christoph M. Becker | 2015-07-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6 | Anatol Belski | 2015-07-03 | 1 | -3/+8 | |
| | | | | | ||||||
| * | | | | Added more tests to improve function coverage | Edgar R. Sandi | 2015-07-03 | 1 | -2/+46 | |
| | | | | | ||||||
| * | | | | updated NEWS | Christoph M. Becker | 2015-07-03 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns | Christoph M. Becker | 2015-07-03 | 2 | -0/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL Server Native Client 11.0 and maybe other ODBC drivers report NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a buffer to be emalloc'd, likely causing a segfault in the following. As we don't know the real size of the column data, we treat such colums as SQL_WLONGVARCHAR. The related bug #67437 suggests that some drivers report a size of ~4GB. It is not certain that this is really the case (there might be some integer overflow involved, and anyway, there has been no feedback), so we do not cater for this now. However, it would not be hard to treat all sizes above a certain threshold in a similar way, i.e. as SQL_WLONGVARCHAR. | |||||
| * | | | | keep LDAP_DEPRECATED in config.w32 | Anatol Belski | 2015-06-30 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Improved code coverage of explode function | Edgar R. Sandi | 2015-06-29 | 1 | -0/+18 | |
| | | | | | ||||||
| * | | | | Added basic and error tests for hex2bin function | Edgar R. Sandi | 2015-06-29 | 2 | -0/+33 | |
| | | | | | ||||||
| * | | | | adding several other testing scenarios of code without coverage in ↵ | Edgar R. Sandi | 2015-06-29 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | stripcslashes function | |||||
| * | | | | adding another testing scenario without coverage in setlocale function | Edgar R. Sandi | 2015-06-29 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | On Windows PHP may be restarted with different set of DSO extensions without ↵ | Dmitry Stogov | 2015-06-29 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | SHM reset. This may make optimisation for entities from DSO extensions inconsistent. | |||||
| * | | | | Merge PR about LDAP cleaning by removing deprecated calls | Côme Bernigaud | 2015-06-29 | 3 | -49/+30 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pull-request/1357' into PHP-5.6 * pull-request/1357: Putting back deprecated symbols for ldap_sort Removed deprecated function calls from ldap module Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |