summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update versions/dates for PHP 7.1.0beta2php-7.1.0beta2PHP-7.1.0beta2Davey Shafik2016-08-053-4/+4
|
* Revert "Update versions/dates for PHP 7.1.0beta2"Davey Shafik2016-08-053-4/+4
| | | | This reverts commit 050a5d5662fa5cb4590efbb2b412957ad9e7f311.
* Update versions/dates for PHP 7.1.0beta2Davey Shafik2016-08-023-4/+4
|
* Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-023-1/+29
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-023-1/+28
| |\
| | * Fix #72709: imagesetstyle() causes OOB read for empty $stylesChristoph M. Becker2016-08-023-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle() to be called with `noOfPixels==0`, what could have lead to OOB reads. Actually, this issue will be fixed in libgd, but to avoid issues when older libgd is in use, we simply disallow passing an empty $styles array to imagesetstyle(), what wouldn't serve a useful purpose anyway.
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-020-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.0: update NEWS cleanup table after test - lastInsertId using Postgres Lastval() function
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-08-020-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-5.6: update NEWS cleanup table after test - lastInsertId using Postgres Lastval() function
| | * update NEWSAnatol Belski2016-08-021-0/+2
| | |
| | * cleanup table after testAnatol Belski2016-08-021-2/+5
| | |
| | * - lastInsertId using Postgres Lastval() functionPablo Santiago Sánchez2016-08-023-19/+56
| | |
* | | Fixed warning: "operation on ‘s’ may be undefined"Xinchen Hui2016-08-021-5/+6
| | |
* | | Folder marksXinchen Hui2016-08-021-1/+2
| | |
* | | Optimized array_merge and cleanupXinchen Hui2016-08-021-59/+40
| | |
* | | Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1Xinchen Hui2016-08-020-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | * 'PHP-7.1' of git.php.net:/php-src: prepare next fix php_version.h
| * \ \ Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-020-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: prepare next
| | * | prepare nextAnatol Belski2016-08-023-4/+8
| | | |
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-020-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: fix php_version.h
| | * | fix php_version.hAnatol Belski2016-08-021-3/+3
| | | |
* | | | Optimized array_mergeXinchen Hui2016-08-021-17/+33
|/ / /
* | | Optimized array_column (thanks to Benjamin Coutu)Xinchen Hui2016-08-021-33/+53
| | |
* | | fixed IS_REFERENCE handlingXinchen Hui2016-08-021-4/+4
| | |
* | | Make the expression more reasonble (by nikic)Xinchen Hui2016-08-011-1/+1
| | |
* | | Optimized array_reverseXinchen Hui2016-08-011-15/+23
| | |
* | | update NEWSAnatol Belski2016-07-311-0/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-07-3161-5976/+4238
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: update NEWS Revert "upgraded to PCRE 8.39"
| * | update NEWSAnatol Belski2016-07-311-1/+0
| | |
| * | Revert "upgraded to PCRE 8.39"Anatol Belski2016-07-3161-5976/+4238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2fba6468374a15efc82aaac8cbfc600b29c5404f. PCRE-8.39 throws weird valgrind backtraces on some systems, see http://news.php.net/php.cvs/93494 . Those could be false positives due to some changes in JIT, still i couldn't 100% ensure this. Thus, better we continue to ship 8.38 bundled for now, and apply patches, if needed.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-301-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-302-5/+1
| |\ \ | | |/
| | * Revert "Fixed bug #71219"Nikita Popov2016-07-302-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 14d674442ef86ad4e862228a1ff5ecd322ae7759. I misread the discussion on the bug -- this is not the correct fix. However the other proposed fix does not work either, so just reverting for now.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-301-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-302-1/+5
| |\ \ | | |/
| | * Fixed bug #71219Nikita Popov2016-07-302-1/+5
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-300-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-300-0/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/wddx/wddx.c
| | * Add missing TSRMLS_FETCH()Nikita Popov2016-07-301-0/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-301-6/+4
|\ \ \ | |/ /
| * | Fix incorrect mergeNikita Popov2016-07-302-6/+7
| | | | | | | | | | | | Forgot to amend the merge fixes...
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-303-1/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-302-1/+21
| |\ \ | | |/
| | * Fixed bug #72142Nikita Popov2016-07-303-1/+25
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-303-1/+15
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-303-1/+15
| |\ \ | | |/
| | * fixes bad address given to onig_error_code_to_strju1ius2016-07-303-1/+15
| | | | | | | | | | | | | | | | | | Closes bug #72710 (cherry picked from commit 0fb7eb6723bcc6fd98053911543e801edb5ab763)
* | | Fix invalid free on undef const in update_const()Nikita Popov2016-07-301-16/+14
| | | | | | | | | | | | | | | Also clean up the control flow a bit -- move all unqualified constant handling in one branch.
* | | Fix memory unsafety in array_walk()Nikita Popov2016-07-308-50/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bugs #61967, #62607, #69068, #70713. The primary changes are: a) Use the ht_iterator mechanism to ensure safety not only if the iterated array itself changes, but also if it is replaced (and potentially destroyed) entirely. We use the same semantics for behavior under modification as foreach-by-reference. In particular, we advance to the next element before processing it. If the iterated entity is exchanged we iterate the new one from the start. If it is not an array/object we warn and abort. b) Always create a reference to the current value. Previously the code kept the value as a non-reference and updated it to the reference value produced by the user callback. However this is unsafe, as the array may have been reallocated in the meantime, so the previous value pointer is no longer value. c) Around a recursive walk, incref the reference containing the array. This ensures that the location where the currently iterated value is stored cannot be freed. One problem I was not able to solve is that we cannot decrement the apply count if the array is exchanged during a recursive walk.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-292-18/+46
|\ \ \ | |/ /
| * | Fix ref handling in array_merge/replace_recursive()Nikita Popov2016-07-292-18/+46
| | | | | | | | | | | | As usual, if the reference has rc=1 it really isn't a reference.
* | | update NEWSAnatol Belski2016-07-291-0/+1
| | |
View Lorry Controller Status