summaryrefslogtreecommitdiff
path: root/ext/spl
Commit message (Collapse)AuthorAgeFilesLines
* Improve support for microseconds with Date/TimemicrosecondsDerick Rethans2016-10-051-1/+3
| | | | | | | | | | | | | | | It fixes several bugs: - Fixed bug #45554 (Inconsistent behavior of the u format char). - Fixed bug #48225 (DateTime parser doesn't set microseconds for "now"). - Fixed bug #52514 (microseconds are missing in DateTime class). - Fixed bug #52519 (microseconds in DateInterval are missing). - Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful). - Fixed bug #73109 (timelib_meridian doesn't parse dots correctly). - Fixed bug #73247 (DateTime constructor does not initialise microseconds property). It also updates timelib to 2016.04, and updates a data mapping file, which causes changes to the volatile abbreviations tests.
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-223-4/+39
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-09-223-4/+39
| |\
| | * fix bug related to #865Márcio Almada2016-09-223-4/+39
| | | | | | | | | | | | | | | | | | | | | In case USE_KEY flag is active, RegexIterator->accept() should keep it's old behavior which is to accept keys mapping arrays. This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
| | * Fix testStanislav Malyshev2016-09-121-0/+5
| | |
| | * Fix bug #73029 - Missing type check when unserializing SplArrayStanislav Malyshev2016-09-122-4/+22
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-123-2/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| * | Merge branch 'PHP-7.0.11' into PHP-7.0Stanislav Malyshev2016-09-123-2/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.11: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| | * | Fix testStanislav Malyshev2016-09-121-0/+5
| | | |
| | * | Fix bug #73029 - Missing type check when unserializing SplArrayStanislav Malyshev2016-09-122-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6d16288150be33392a3249e417a0929881feb9a2) Conflicts: ext/spl/spl_array.c
* | | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-111-6/+0
|\ \ \ \ | |/ / /
| * | | Remove zpp fallback code (always use Fast ZPP)Andrea Faulds2016-09-111-6/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c Author: Andrea Faulds <ajf@ajf.me> Date: Sun Sep 11 19:14:37 2016 +0100 Keep dummy FAST_ZPP macro for compatibility commit 8a7cfd00deaa4a3c5026c97580c49c886c72a5b4 Author: Andrea Faulds <ajf@ajf.me> Date: Mon Sep 5 22:36:03 2016 +0100 Remove FAST_ZPP macro and plain zpp fallback code
* | | Fixed bug #72888 (Segfault on clone on splFileObject)Xinchen Hui2016-08-192-1/+19
| | |
* | | Show "or null" in TypeErrors for nullable arg_infosAndrea Faulds2016-08-111-1/+1
| | |
* | | Remove extra pointer in SplFixedArrayLevi Morrison2016-08-112-91/+62
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Pierrick Charron2016-07-262-1/+22
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierrick Charron2016-07-262-1/+22
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/spl/spl_iterators.c
| | * Fixed bug #72684 (AppendIterator segfault with closed generator)Pierrick Charron2016-07-262-1/+22
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-222-7/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-222-7/+12
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/spl/spl_directory.c
| | * Fix #72646: SplFileObject::getCsvControl does not return the escape characterChristoph M. Becker2016-07-222-7/+12
| | | | | | | | | | | | | | | This has obviously been missed when adding the $escape parameter to SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
| | * Fix 72122 - don't use EH_THROW for calls to getIteratorLoz Calver2016-07-122-0/+23
| | |
* | | Merge RNG fixes RFC. PR #1986Leigh2016-07-171-6/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rng-fixes: Fix legacy mode RAND_RANGE and 32/64-bit consistency Fix crypt salt not being converted to b64 Make mode selection part of mt_srand() Use zend_bitset Improve array_rand distribution Fix some insecure usages of php_rand Alias rand to mt_rand Fix RAND_RANGE for mt_rand Fix mt_rand impl. Provide legacy impl. access. Split rand and mt_rand into separate files
| * | | Alias rand to mt_randLeigh2016-07-051-5/+0
| | | |
| * | | Split rand and mt_rand into separate filesLeigh2016-07-051-1/+1
| | | |
* | | | Merge branch 'PHP-7.0'Christoph M. Becker2016-07-052-1/+338
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-052-1/+338
| |\ \ \ | | | |/ | | |/| | | | | | | | | # Resolved conflicts: # ext/spl/spl_directory.c
| | * | Fix bug #55701: GlobIterator throws LogicExceptionValentin VALCIU2016-07-052-1/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GlobIterator throws LogicException with message 'The parent constructor was not called' on its first operation when the glob expression doesn't match any file. It also throws on the first operation after the iteration completes, when the glob expression matches some files. # Resolved conflicts: # ext/spl/spl_directory.c
| | * | Merge branch 'PHP-5.5' into PHP-5.6.23Stanislav Malyshev2016-06-212-102/+117
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Skip test which is 64bits only 5.5.37 now Conflicts: configure.in ext/mcrypt/mcrypt.c ext/spl/spl_directory.c main/php_version.h
| | | * | fix buildStanislav Malyshev2016-06-201-1/+1
| | | | |
| | | * | Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and ↵Stanislav Malyshev2016-06-201-0/+11
| | | | | | | | | | | | | | | | | | | | unserialize
| | | * | Fix bug #72262 - do not overflow intStanislav Malyshev2016-06-151-107/+111
| | | | |
| | | * | Merge branch 'PHP-5.4.45' into PHP-5.5.29Stanislav Malyshev2015-09-015-0/+157
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.45: add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c
* | | | \ \ Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-054-18/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | E_RECOVERABLE_ERROR -> thrown ErrorAaron Piotrowski2016-06-142-2/+6
| | | | | |
| * | | | | Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-132-3/+3
| | | | | |
| * | | | | Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-1066-451/+1483
| |\ \ \ \ \
| * | | | | | Update memory freeing and other issues, revert some changesAaron Piotrowski2015-07-053-9/+2
| | | | | | |
| * | | | | | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-055-17/+18
| | | | | | |
* | | | | | | Fixed compilation warningsDmitry Stogov2016-06-281-2/+2
| | | | | | |
* | | | | | | Fixed compilation warningsDmitry Stogov2016-06-227-18/+27
| | | | | | |
* | | | | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-216-18/+18
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | | | | | Merge branch 'PHP-7.0'Dmitry Stogov2016-04-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: size_t is unsigned and can't be negative
| * | | | | | size_t is unsigned and can't be negativeDmitry Stogov2016-04-291-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'PHP-7.0'Joe Watkins2016-04-281-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * PHP-7.0: variable used out of scope
| * | | | | variable used out of scopeJoe Watkins2016-04-281-1/+1
| | | | | |
* | | | | | - get rid of EG(scope). zend_get_executed_scope() should be used instead.Dmitry Stogov2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
* | | | | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-272-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | but is never used.
* | | | | | Merge branch 'PHP-7.0'Xinchen Hui2016-04-192-5/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
| * | | | | Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as ↵Xinchen Hui2016-04-192-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | expected)
View Lorry Controller Status