summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.11 finalphp-5.5.11PHP-5.5.11Julien Pauli2014-04-013-4/+8
|
* Fixed bug #66946 extensive backtracking in awk rule regular expressionRemi Collet2014-04-011-0/+39
| | | | | | | | | CVE-2013-7345 Applied upstream patch: https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c Add the magicdata.patch to track patches applied to upstream data file.
* Fixed bug #66946 extensive backtracking in awk rule regular expressionRemi Collet2014-04-011-7136/+7136
| | | | | | | | | CVE-2013-7345 Applied upstream patch: https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c Add the magicdata.patch to track patches applied to upstream data file.
* 5.5.11RC1php-5.5.11RC1Julien Pauli2014-03-193-4/+4
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-03-180-0/+0
|\ | | | | | | | | | | | | | | | | * PHP-5.4: prep for 5.4.27 rc1 Conflicts: configure.in main/php_version.h
| * prep for 5.4.27 rc1Stanislav Malyshev2014-03-183-9/+11
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-03-181-207/+207
|\ \ | |/
| * - Updated to version 2014.1 (2014a)Derick Rethans2014-03-181-207/+207
| |
* | Add a testAndrey Hristov2014-03-181-0/+140
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Mateusz Kocielski2014-03-181-2/+2
|\ \ | |/ | | | | | | * PHP-5.4: Fixed off-by-one in php_url_parse_ex
| * Merge branch 'PHP-5.3' into PHP-5.4Mateusz Kocielski2014-03-181-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed off-by-one in php_url_parse_ex Conflicts: ext/standard/url.c
| | * Fixed off-by-one in php_url_parse_exMateusz Kocielski2014-03-181-1/+1
| | | | | | | | | | | | | | | Change order of condition, previously pointer could be derefrenced before bound check was done.
* | | Fix bug #66873: check if obj->src is setStanislav Malyshev2014-03-173-7/+32
| | |
* | | NEWSRemi Collet2014-03-141-0/+3
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-142-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: NEWS Fixed Bug #66833 Default digest algo is still MD5
| * | NEWSRemi Collet2014-03-141-1/+4
| | |
| * | Fixed Bug #66833 Default digest algo is still MD5Remi Collet2014-03-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to SHA1, which match internal openssl hardcoded algo. In most case, won't even be noticed - priority on user input (default_md) - fallback on system config - fallback on this default value Recent system reject MD5 digest, noticed in bug36732.phpt failure. While SHA1 is better than MD5, SHA256 is recommenced, and defined as default algo in provided configuration on recent system (Fedora 21, RHEL-7, ...). But the idea is to keep in sync with openssl internal value for PHP internal value.
* | | Fix 5.5.10 NEWSDavid Zülke2014-03-131-4/+4
| | | | | | | | | The FPM change didn't make it into 5.5.10 but will instead be in 5.5.11; http://php.net/Changelog-5.php, the release and the NEWS file in the release accurately reflect this, but the 5.5 branch NEWS doesn't (as the release was made and tagged from the last RC, which didn't contain that change yet).
* | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-03-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Typo fix: sicret -> secret
| * | Typo fix: sicret -> secretMichael Meyer2014-03-131-1/+1
| | |
* | | updated libs_version.txtAnatol Belski2014-03-131-2/+2
| | |
* | | made libgd recognize the 9 version seriesAnatol Belski2014-03-121-0/+4
| | |
* | | NEWSRemi Collet2014-03-121-0/+2
| | |
* | | Fix bug #66887 imagescale - poor quality of scaled imageRemi Collet2014-03-121-6/+6
| | | | | | | | | | | | | | | | | | | | | Issue with signed char overflow. Upstream fix: https://bitbucket.org/libgd/gd-libgd/commits/4b86e06937bc5ff116be969137f8da9d1a7869d5
* | | Fixed Bug #66893i imagescale ignore method argumentRemi Collet2014-03-122-28/+5
| | | | | | | | | | | | | | | | | | | | | We also have our goto fail; bug. Upstream fix for libgd https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
* | | Fix hash_pbkdf2() with missing $length argumentNikita Popov2014-03-123-7/+14
| | | | | | | | | | | | | | | | | | Also change the type of some string length variables to ensure that the zpp call works correctly on platforms where sizeof(int) != sizeof(long).
* | | typo in NEWSRemi Collet2014-03-121-3/+3
| | |
* | | NEWSRemi Collet2014-03-121-0/+1
| | |
* | | Fixed Bug #66890 imagescale segfaultRemi Collet2014-03-121-3/+7
| | | | | | | | | | | | zend_parse_parameters "l" expect long, not int
* | | Fix compile error with theoretically supported versions of libcurl < 7.12.3.Adam Harvey2014-03-112-0/+4
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-03-111-12/+11
|\ \ \ | |/ /
| * | Removed bogus loopsTjerk Meesters2014-03-111-12/+11
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-111-7/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: restored the old code in 5.4/5 related to bug #66872
| * | restored the old code in 5.4/5 related to bug #66872Anatol Belski2014-03-111-7/+10
| | | | | | | | | | | | | | | The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine with the old code.
| * | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2014-03-103-15/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Pierre Joye # Via Pierre Joye * 'PHP-5.4' of https://git.php.net/repository/php-src: fix #66872, invalid argument crashes gmp_testbit fix #66872, invalid argument crashes gmp_testbit add vc12 (2013)
| | * \ Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-101-22/+154
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | # By Anatol Belski # Via Anatol Belski * 'PHP-5.4' of git.php.net:php-src: updated libmagic.patch
* | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2014-03-108-18669/+36696
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Pierre Joye (7) and Anatol Belski (1) # Via Pierre Joye (7) and Anatol Belski (1) * 'PHP-5.5' of https://git.php.net/repository/php-src: updated libsqlite to 3.8.3.1 in 5.5 branch, too update NEWS fix #66872, invalid argument crashes gmp_testbit fix #66872, invalid argument crashes gmp_testbit update news - fix #66869, Invalid 2nd argument crashes imageaffinematrixget add vc12 (2013) add vc12 (2013)
| * | | | updated libsqlite to 3.8.3.1 in 5.5 branch, tooAnatol Belski2014-03-105-18660/+36683
| | | | |
| * | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Pierre Joye2014-03-103-25/+157
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Anatol Belski (1) and others # Via Anatol Belski * 'PHP-5.5' of git.php.net:php-src: updated libmagic.patch Fix indentation Do not remove *.1, it's not generated by make but configure
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-101-22/+154
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * PHP-5.4: updated libmagic.patch
| * | | | updated libmagic.patchAnatol Belski2014-03-101-22/+154
| | | | |
* | | | | Fix indentationAndrey Hristov2014-03-101-2/+3
| | | | |
* | | | | Do not remove *.1, it's not generated by make but configureXinchen Hui2014-03-101-1/+0
| | | | |
| | * | | update NEWSPierre Joye2014-03-101-0/+2
| | | | |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2014-03-102-10/+8
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix #66872, invalid argument crashes gmp_testbit fix #66872, invalid argument crashes gmp_testbit add vc12 (2013) Conflicts: win32/build/confutils.js
| | | * | fix #66872, invalid argument crashes gmp_testbitPierre Joye2014-03-101-6/+9
| | | | |
| | | * | fix #66872, invalid argument crashes gmp_testbitPierre Joye2014-03-101-9/+7
| | | | |
| | | * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-105-7/+11
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dmitry Panin (1) and Remi Collet (1) # Via Nikita Popov * 'PHP-5.4' of git.php.net:php-src: Fix HTML entity table generation Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
| | | * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Pierre Joye2014-03-051025-2910/+5694
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Anatol Belski (22) and others # Via Derick Rethans (5) and others * 'PHP-5.4' of git.php.net:php-src: (176 commits) NEWS Fixed Bug #66820 out-of-bounds memory access in fileinfo Improves fix for memory leak, keep in sync with upstream. Updated news for #60602 proc_open(): separate environment values that aren't strings Updated NEWS for #66535 Fixed test case title [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given man page: long option name is --strip, not --stripped --global have be removed in 5.2 NEWS test for bug #66762 Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 add news entry add clear_env option to FPM config Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+ Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+ fixed macro Make sure value is initialized ...
| | | * | | add vc12 (2013)Pierre Joye2013-11-041-0/+4
| | | | | |
View Lorry Controller Status