summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Expand)AuthorAgeFilesLines
* Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPEDTjerk Meesters2015-08-151-3/+18
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-041-1/+1
|\
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-1/+1
| |\
| | * __wakeup doesn't have to be finalStanislav Malyshev2015-08-041-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-042-8/+46
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-042-8/+46
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.4.44Stanislav Malyshev2015-08-042-3/+12
| | |\
| | | * Fixed bug #69892Nikita Popov2015-08-012-3/+12
| | * | Fix #69793 - limit what we accept when unserializing exceptionStanislav Malyshev2015-08-011-0/+28
| | * | Fix bug #70121 (unserialize() could lead to unexpected methods execution / NU...Stanislav Malyshev2015-07-262-8/+18
| | |/
* | | Fix test; this should properly emit a fatal error, just as every other by-ref...Bob Weinand2015-07-161-4/+1
* | | Backport fix for bug #70083 to PHP-5.6Bob Weinand2015-07-152-15/+20
* | | Fixed bug #70012 (Exception lost with nested finally block)Xinchen Hui2015-07-083-4/+42
* | | fix C89 compatAnatol Belski2015-07-071-1/+3
* | | Fixed double ZEND_TICKS opcode generation for declare()Julien Pauli2015-07-072-0/+23
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-06-202-3/+12
|\ \ \ | |/ /
| * | Fixed bug #69892Nikita Popov2015-06-202-3/+12
* | | Fix bug #69740Nikita Popov2015-06-112-0/+31
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-101-1/+1
|\ \ \ | |/ /
| * | regenerated the ini scannerAnatol Belski2015-06-101-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-102-1/+17
|\ \ \ | |/ /
| * | fixed bug, where a linebreak immediately after an opening quote of a value ca...Christoph M. Becker2015-06-101-1/+1
| * | made failing test more meaningfulChristoph M. Becker2015-06-101-6/+11
| * | added failing testChristoph M. Becker2015-06-101-0/+11
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-06-013-5/+61
|\ \ \ | |/ /
| * | Fixed bug #69732 (can induce segmentation fault with basic php code).Dmitry Stogov2015-06-013-5/+61
| * | Merge the fix for #69703 to 5.5 per request from JulienKalle Sommer Nielsen2015-05-281-2/+2
* | | Preserve VARIADIC flag for Closure::__invoke()Nikita Popov2015-05-292-1/+20
* | | Shouldn't have been committed, so revertKalle Sommer Nielsen2015-05-281-1902/+1901
* | | Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens do...Kalle Sommer Nielsen2015-05-282-1903/+1904
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-122-13/+18
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-122-13/+18
| |\ \ | | |/
| | * Fix bug #69403 and other int overflowsStanislav Malyshev2015-05-102-14/+19
| | * Fixed res leakXinchen Hui2015-04-141-3/+4
* | | Fix bug #69599Nikita Popov2015-05-123-4/+25
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-05-042-8/+6
|\ \ \ | |/ /
| * | Saving the latter checking in most casesXinchen Hui2015-05-042-8/+6
| * | Fix uninitialized value with extension traitsJohn Boehr2015-05-041-1/+1
* | | Fix uninitialized value with extension traitsJohn Boehr2015-05-041-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-04-281-1/+1
|\ \ \ | |/ /
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-211-1/+1
|\ \ \ | |/ /
| * | Remove tail blank which is committed by accidentXinchen Hui2015-04-211-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-212-2/+24
|\ \ \ | |/ /
| * | Fixed Bug #69467 (Wrong checked for the interface by using Trait)Xinchen Hui2015-04-212-2/+24
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-04-151-3/+4
|\ \ \ | |/ /
| * | Fixed res leakXinchen Hui2015-04-151-3/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Nikita Popov2015-04-143-6/+28
|\ \ \ | |/ /
| * | Fixed bug #69419Nikita Popov2015-04-143-6/+28
* | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2015-04-141-5/+3
|\ \ \ | |/ /
| * | Bug #63336 is not a bugDmitry Stogov2015-04-141-5/+3