Skip to content

Commit 96783bd

Browse files
committed
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: fix integer overflow in {stream,file}_{get,put}_contents() add some missing NEWS entries NEWS block for 5.6.0RC3 Fix ext/pgsql builds with libpq < 7.3. updated libs_version.txt updated libs_version.txt updated libmagic.patch in 5.6+ updated libmagic.patch Conflicts: ext/standard/file.c ext/standard/streamsfuncs.c
2 parents 1a50c27 + 122ee0a commit 96783bd

File tree

6 files changed

+331
-33
lines changed

6 files changed

+331
-33
lines changed

NEWS

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
3-
?? ??? 2014, PHP 5.6.0 Release Candidate 2
3+
?? ??? 2014, PHP 5.6.0 Release Candidate 3
4+
5+
03 Jul 2014, PHP 5.6.0 Release Candidate 2
46

57
- Core:
68
. Fixed bug #67368 (Memory leak with immediately dereferenced array in class
@@ -9,12 +11,23 @@ PHP NEWS
911
(Andreas Ferber)
1012
. Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
1113
(Ferenc)
14+
. Fixed bug #67498 (phpinfo() Type Confusion Information Leak Vulnerability).
15+
(Stefan Esser)
1216

1317
- FPM:
1418
. Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)
1519
. Fix bug #67541 (Fix Apache 2.4.10+ SetHandler proxy:fcgi://
1620
incompatibilities). (David Zuelke)
1721

22+
- Intl:
23+
. Fixed bug #67349 (Locale::parseLocale Double Free). (Stas)
24+
. Fixed bug #67397 (Buffer overflow in locale_get_display_name and
25+
uloc_getDisplayName (libicu 4.8.1)). (Stas)
26+
27+
- pgsql:
28+
. Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
29+
which affected builds against libpq < 7.3. (Adam)
30+
1831
- phpdbg:
1932
. Fix Bug #67499 (readline feature not enabled when build with libedit). (Remi)
2033
. Fix issue krakjoe/phpdbg#94 (List behavior is inconsistent). (Bob)
@@ -26,6 +39,10 @@ PHP NEWS
2639
. Fix issue krakjoe/phpdbg#100 (No way to list the current stack/frames)
2740
(Help entry was missing). (Bob)
2841

42+
- SPL:
43+
. Fixed bug #67492 (unserialize() SPL ArrayObject / SPLObjectStorage Type
44+
Confusion) (CVE-2014-3515). (Stefan Esser)
45+
2946
19 Jun 2014, PHP 5.6.0 Release Candidate 1
3047

3148
- Core:

0 commit comments

Comments
 (0)