summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.10 finalphp-5.5.10PHP-5.5.10Julien Pauli2014-03-052-3/+3
|
* NEWS for cherry-picked CVE patchesJulien Pauli2014-03-051-2/+7
|
* Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327Remi Collet2014-03-052-9/+16
| | | | | | | | | | | | | | | This amends commit 8f4a537, which aimed to correct NULL dereference because of missing check of gdImageCreateTrueColor() / gdImageCreate() return value. That commit checks for negative crop rectangle width and height, but gdImageCreate*() can also return NULL when width * height overflows. Hence NULL deref is still possible, as gdImageSaveAlpha() and gdImagePaletteCopy() is called before dst == NULL check. This moves NULL check to happen right after gdImageCreate*(). It also removes width and height check before gdImageCreate*(), as the same check is done by image create functions (with an extra warning). From thoger redhat com
* Fixed Bug #66820 out-of-bounds memory access in fileinfoRemi Collet2014-03-051-16/+18
| | | | | | | | | Upstream fix: https://github.com/glensc/file/commit/447558595a3650db2886cd2f416ad0beba965801 Notice, test changed, with upstream agreement: -define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o))) +define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o)))
* Improves fix for memory leak, keep in sync with upstream.Remi Collet2014-03-051-4/+12
| | | | | | | | Previous fix: http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2 Upstream fix: https://github.com/glensc/file/commit/c0c0032b9e9eb57b91fefef905a3b018bab492d9
* fixed leak introduced after CVE/upgradeAnatol Belski2014-03-051-0/+2
|
* 5.5.10RC1php-5.5.10RC1Julien Pauli2014-02-183-8/+8
|
* Set fileinfo version to 1.0.5 (as in php 5.4, no diff)Remi Collet2014-02-181-1/+1
|
* NEWSRemi Collet2014-02-181-0/+3
|
* Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-02-185-6/+47
|\ | | | | | | | | | | * PHP-5.4: NEWS Fixed Bug #66731 file: infinite recursion
| * NEWSRemi Collet2014-02-181-0/+3
| |
| * Fixed Bug #66731 file: infinite recursionRemi Collet2014-02-185-6/+47
| | | | | | | | | | | | | | Upstream commit (available in file-5.17) https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-02-170-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.27 now update NEWS Conflicts: configure.in main/php_version.h
| * 5.4.27 nowStanislav Malyshev2014-02-173-5/+5
| |
| * update NEWSStanislav Malyshev2014-02-171-1/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-02-171-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Fixed broken build when EC unavailable
| * Fixed broken build when EC unavailableDaniel Lowrey2014-02-171-1/+1
| |
* | Updated NEWS for #65753Julien Pauli2014-02-171-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-170-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: Updated NEWS for #65753
| * Updated NEWS for #65753Julien Pauli2014-02-171-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2014-02-172-2/+2
|\ \ | |/ | | | | | | * PHP-5.4: Export JsonSerializable Interface (bug #65753)
| * Export JsonSerializable Interface (bug #65753)Julien Pauli2014-02-172-2/+2
| |
* | Update NEWSYasuo Ohgaki2014-02-161-2/+2
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2014-02-161-10/+20
|\ \ | |/ | | | | | | * PHP-5.4: Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
| * Fixed possbile injections against ↵Yasuo Ohgaki2014-02-162-12/+22
| | | | | | | | pg_insert()/pg_delete()/pg_update()/pg_select()
* | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2014-02-161-27/+8
|\ \ | |/ | | | | | | * PHP-5.4: Refactor build_tablename()
| * Refactor build_tablename()Yasuo Ohgaki2014-02-161-27/+8
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2014-02-161-4/+3
|\ \ | |/ | | | | | | * PHP-5.4: Revise encoding blacklist
| * Revise encoding blacklistYasuo Ohgaki2014-02-161-4/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2014-02-151-0/+2
|\ \ | |/ | | | | | | | | * PHP-5.4: - Fix ZTS build when HAVE_PQESCAPELITERAL is not set Update NEWS
| * - Fix ZTS build when HAVE_PQESCAPELITERAL is not setFelipe Pena2014-02-151-0/+2
| |
| * Update NEWSYasuo Ohgaki2014-02-151-0/+4
| |
* | Update NEWSYasuo Ohgaki2014-02-151-0/+5
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Yasuo Ohgaki2014-02-152-285/+268
|\ \ | |/
| * Refactor and cleanup. WS is cleaned up. Use -b if it is needed.Yasuo Ohgaki2014-02-152-285/+268
| | | | | | | | Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.
| * Update NEWSDaniel Lowrey2014-02-141-0/+4
| |
* | Update NEWSDaniel Lowrey2014-02-141-0/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-02-142-0/+30
|\ \ | |/ | | | | | | * PHP-5.4: Fix for bug66501 - "key type not supported in this PHP build"
| * Fix for bug66501 - "key type not supported in this PHP build"mk-j2014-02-142-0/+30
| |
* | a few typofixesVeres Lajos2014-02-141-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-02-146-8/+8
|\ \ | |/
| * a few typofixesVeres Lajos2014-02-146-7/+7
| |
| * Replace old SVN references to GitMats Lindh2014-02-091-2/+2
| |
* | Fixed ZTS and added fix to NEWS.Derick Rethans2014-02-112-1/+5
| |
* | Make html_table_gen consistent with html_table.hDmitry Panin2014-01-301-0/+3
| | | | | | | | | | | | In commit 6dabd7de04ae3ed the html_table.h was changed manually, without changing the underlying generator (html_table_gen.php). This commit fixes it.
* | Implemented feature #45528: Allow the DateTimeZone constructor to accept ↵Derick Rethans2014-02-098-109/+57
| | | | | | | | timezones per offset too.
* | Rename timelib_get_zone to timelib_parse_zone and export.Derick Rethans2014-02-093-18/+19
| |
* | fix regex to detect valgrind versionNuno Lopes2014-02-081-1/+1
| | | | | | | | New PCRE version got stricter
* | 5.5.9 now releasedJulien Pauli2014-02-061-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-02-060-0/+0
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: update libs_version.txt Conflicts: win32/build/libs_version.txt
View Lorry Controller Status