summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use reference counting instead of zval duplicationDmitry Stogov2014-06-0547-878/+915
* Reference counters in PHPNG may have different valuesDmitry Stogov2014-06-041-9/+9
* Avoid useless mergeDmitry Stogov2014-06-045-13/+26
* Simplified and optimized ZEND_HANDLE_NUMERIC()Dmitry Stogov2014-06-037-127/+299
* Optimized conditions orderDmitry Stogov2014-06-033-68/+169
* Optimized conditions orderDmitry Stogov2014-06-034-100/+105
* Avoid copying of immutable arraysDmitry Stogov2014-06-033-68/+141
* cleanupDmitry Stogov2014-06-031-9/+3
* cleanupDmitry Stogov2014-06-039-229/+253
* Fixed mergeXinchen Hui2014-06-011-0/+1
* Merge branch 'master' into phpngXinchen Hui2014-06-018-21/+148
|\
| * Merge branch 'PHP-5.6'Xinchen Hui2014-06-013-0/+32
| |\
| | * Update NEWsXinchen Hui2014-06-011-0/+3
| | * Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-06-013-0/+32
| | |\
| | | * Update NEWsXinchen Hui2014-06-011-0/+1
| | | * Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2014-06-013-0/+32
| | | |\
| | | | * Fixed bug #67359 (Segfault in recursiveDirectoryIterator)Xinchen Hui2014-06-014-0/+33
| * | | | Merge branch 'PHP-5.6'Adam Harvey2014-05-292-1/+42
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-05-292-1/+42
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-05-293-1/+45
| | | |\ \ | | | | |/
| | | | * Check for zero-length keys in spl_array_skip_protected and don't skip them.Adam Harvey2014-05-293-1/+45
| | | * | added CVEs in NEWSJulien Pauli2014-05-281-2/+2
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-05-271-6/+62
| |\ \ \ \ | | |/ / /
| | * | | updated libmagic.patch for 5.6+Anatol Belski2014-05-271-6/+62
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-05-270-0/+0
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-05-271-4/+60
| | | |\ \ | | | | |/
| | | | * updated libmagic.patch for 5.4+Anatol Belski2014-05-271-66/+138
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-05-272-2/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-273-2/+15
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-273-2/+13
| | | |\ \ | | | | |/
| | | | * update NEWSStanislav Malyshev2014-05-271-0/+2
| | | | * Fix bug #67249: printf out-of-bounds readStanislav Malyshev2014-05-272-2/+12
| | | * | 5.5.13 release dateJulien Pauli2014-05-271-1/+1
| * | | | Merge branch 'PHP-5.6'Matteo Beccati2014-05-271-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-05-271-0/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-05-271-0/+3
| | | |\ \ | | | | |/
| | | | * Escape non-printable characters in the junit XML outputMatteo Beccati2014-05-271-0/+3
| * | | | Merge branch 'PHP-5.6'Matteo Beccati2014-05-271-7/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-05-271-7/+8
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2014-05-271-7/+8
| | | |\ \ | | | | |/
| | | | * Fixed broken XML junit output due to escaping of CDATA sectionsMatteo Beccati2014-05-271-7/+8
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-05-260-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-260-0/+0
| | |\ \ \ | | | |/ /
| | | * | Fix #50444: PDO-ODBC changes for 64-bitAndrew Kehrig2014-05-263-3/+6
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-05-261-13/+11
| |\ \ \ \ | | |/ / /
| | * | | update NEWSStanislav Malyshev2014-05-261-0/+5
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-261-13/+11
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-261-0/+3
| | | |\ \ | | | | |/
| | | | * backport this piece from 5.6, related to the #66307 fixAnatol Belski2014-05-261-1/+2
| | | | * Fixed bug #66307 Fileinfo crashes with powerpoint filesAnatol Belski2014-05-263-2/+7