84f9fe0fdc
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-24 10:29:26 -07:00
b03993dde9
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
2014-06-24 10:29:26 -07:00
f48b8f3339
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
2014-06-24 10:29:25 -07:00
844a046945
Fix bug #67349 : Locale::parseLocale Double Free
2014-06-24 10:29:09 -07:00
9d49492fd6
Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant)
2014-06-24 13:53:05 +08:00
6b8cef7847
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #67072 with more BC provisions
Better fix for bug #67072 with more BC provisions
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
2014-06-23 22:15:01 -07:00
232ab8d795
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Better fix for bug #67072 with more BC provisions
2014-06-23 22:13:32 -07:00
b3ef019b62
NEWS
2014-06-23 10:39:06 +02:00
0da5d94a6c
Better fix for phpdbg + libedit
...
- fix include
- disable coloured prompt only with libedit
2014-06-23 10:21:19 +02:00
0febafcfbe
Fix https://github.com/krakjoe/phpdbg/issues/91
...
Enable edit feature when build with libedit.
Notice: coloured prompt only enable with READLINE
2014-06-23 10:21:19 +02:00
53158f2c32
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
2014-06-23 10:10:17 +02:00
3058b87783
mention 67468 fix in NEWS
2014-06-23 10:08:32 +02:00
c5e6c2a5f5
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
...
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
2014-06-23 09:51:44 +02:00
342240fd7f
Better fix for bug #67072 with more BC provisions
2014-06-21 21:30:34 -07:00
c42d5cf5de
Better fix for bug #67072 with more BC provisions
2014-06-21 21:29:11 -07:00
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
e9c9169e05
skip this test which fails without network
2014-06-20 06:45:16 +02:00
2f43bc73b6
add missing entry to NEWS
2014-06-19 02:29:27 +02:00
00677cd771
add missing entry to NEWS
2014-06-19 02:18:26 +02:00
dd9f81dd47
add NEWS block for 5.6.0RC2
2014-06-19 01:34:25 +02:00
a886a0cf93
Add support for gb18030/MySQL 5.7
2014-06-18 21:53:34 +03:00
6dd0e8e0fc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-06-18 18:32:51 +03:00
f201bf2305
Fix another problem with MySQL 5.7
2014-06-18 18:30:37 +03:00
bf7fed7e41
new test, missing in ea466a3
2014-06-18 15:59:45 +02:00
23f77050eb
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-18 16:42:42 +03:00
21c9a9388f
Suppress test failure with MySQL 5.7
2014-06-18 16:20:14 +03:00
b0b47a2064
Update copyright year to 2014
2014-06-18 00:18:47 +03:00
9f727692b6
Update copyright year to 2014
...
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:16:23 +03:00
1222f51ebd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:14:18 +03:00
728c554f93
Update copyright year to 2014
2014-06-18 00:12:33 +03:00
a3bd2d268c
Update copyright year to 2014
...
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:11:55 +03:00
d2bdedbcfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
2014-06-18 00:11:35 +03:00
4106d48d1c
Update copyright year to 2014
2014-06-17 23:57:20 +03:00
945938d33c
Update copyright year to 2014
2014-06-17 23:56:46 +03:00
ba34f0c2e8
NEWS
2014-06-17 09:41:10 +02:00
ea466a316f
Fix Request #67453 Allow to unserialize empty data.
...
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
2014-06-17 09:38:54 +02:00
b538816b0b
Update copyright year to 2014
2014-06-16 23:34:50 +03:00
11b18347d8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:32:10 +03:00
c38b73a701
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:30:44 +03:00
6f3bcb0d6e
Update copyright year for re2c generated files
2014-06-16 23:28:36 +03:00
2d576c2a99
Update copyright year to 2014
2014-06-16 23:27:45 +03:00
e667d23178
Update copyright year for re2c files as well
2014-06-16 23:26:50 +03:00
3c2b42ac41
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_compile.c
2014-06-16 11:18:45 +02:00
e93f8e74d4
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 11:16:33 +02:00
0a3979e08b
Fix patch for bug #67436
2014-06-16 11:10:50 +02:00
6788f14f5e
fix failed test
2014-06-16 10:52:26 +02:00
fc36277eb6
Fix test on modern distro where old unsecure algo are disabled in openssl config.
...
Testing recent algo should be enough to check this function.
2014-06-16 09:42:55 +02:00
7cef3a57ad
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-16 00:42:50 +02:00
Stanislav Malyshev