Remi Collet
127651e9ae
fix test for 5.4/5.5
2014-06-05 17:33:40 +02:00
Remi Collet
218df7e058
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add test for previous fix
2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead
add test for previous fix
2014-06-05 14:00:00 +02:00
Remi Collet
ce22c03a72
NEWS
2014-06-05 13:46:55 +02:00
Remi Collet
2b3f4cc29e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Remi Collet
c61c24ad79
NEWS
2014-06-05 13:46:13 +02:00
Remi Collet
9ea9064779
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
Remi Collet
3f47368738
NEWS
2014-06-05 13:45:25 +02:00
Remi Collet
1fe9f1e4f5
Fix regression introduce in fix for bug #67118
...
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call
Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
Stanislav Malyshev
3d969932bf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
update NEWS
fix gcov data with some locales (again)
2014-06-04 01:11:07 -07:00
Stanislav Malyshev
4b4a5bc1d3
update news
2014-06-04 01:10:45 -07:00
Stanislav Malyshev
846e076492
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-06-04 01:10:12 -07:00
Stanislav Malyshev
e06c4f7fe5
update NEWS
2014-06-04 01:09:37 -07:00
Bob Weinand
848df6fcbe
Merge sapi/phpdbg into PHP-5.6
2014-06-04 02:18:39 +02:00
Bob Weinand
7b9367971d
Fix tests
2014-06-04 02:15:50 +02:00
Bob Weinand
79519f7e30
Fix possible segfault depending on memory location...
2014-06-04 02:15:34 +02:00
Nuno Lopes
bf50218983
fix gcov data with some locales (again)
2014-06-03 17:22:16 -04:00
Nuno Lopes
2766926e29
fix gcov data with some locales (again)
2014-06-03 17:21:45 -04:00
Bob Weinand
13421c55ff
Update NEWS
2014-06-03 21:18:24 +00:00
Bob Weinand
466cd2aa7d
Merge sapi/phpdbg into PHP-5.6
2014-06-03 21:15:02 +00:00
Bob Weinand
467b19a948
Fixed startup segfault in non-debug builds
...
Fixes issue #87
2014-06-03 21:03:42 +00:00
Anatol Belski
b416537917
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:51 +02:00
Anatol Belski
e2710310a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028
Fixed regression introduced by patch for bug #67072
...
This applies to 5.4 and 5.5 only as a legacy fix.
2014-06-03 20:43:58 +02:00
Anatol Belski
f3f22ff5c6
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
2014-06-03 11:37:20 +02:00
Remi Collet
9e16493e72
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
(re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:43 +02:00
Remi Collet
97b86c3c4a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
(re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:21 +02:00
Remi Collet
0817a2c767
(re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:07 +02:00
Remi Collet
0e25448e6b
NEWS
2014-06-03 11:09:52 +02:00
Remi Collet
e61f7727d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:29 +02:00
Remi Collet
f5333418d7
NEWS
2014-06-03 11:09:18 +02:00
Remi Collet
2d59b87527
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:04 +02:00
Remi Collet
21986f98db
NEWS
2014-06-03 11:08:46 +02:00
Remi Collet
4fcb9a9d1b
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
...
Upstream fix 6d209c1c48
.patch
Only revelant part applied
2014-06-03 11:05:00 +02:00
Ferenc Kovacs
6538dab85f
add NEWS block for 5.6.0RC1
2014-06-03 10:27:42 +02:00
Xinchen Hui
f41ab36e5c
Update NEWs
2014-06-01 19:42:39 +08:00
Xinchen Hui
c4e7c7d50e
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-01 19:42:20 +08:00
Xinchen Hui
0218e4eb19
Update NEWs
2014-06-01 19:42:01 +08:00
Xinchen Hui
9bb5867fad
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-06-01 19:41:01 +08:00
Adam Harvey
b8042acdde
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:56:32 +00:00
Adam Harvey
43e3a83d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4
Check for zero-length keys in spl_array_skip_protected and don't skip them.
...
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
2014-05-29 17:49:32 +00:00
Julien Pauli
4ef561c7ba
added CVEs in NEWS
2014-05-28 10:59:57 +02:00
Anatol Belski
fb991bd7fd
updated libmagic.patch for 5.6+
2014-05-27 22:39:54 +02:00
Anatol Belski
e844055761
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch for 5.4+
2014-05-27 22:38:30 +02:00
Anatol Belski
546797f329
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
2014-05-27 22:38:02 +02:00
Anatol Belski
d2765e4b8c
updated libmagic.patch for 5.4+
2014-05-27 22:36:12 +02:00
Stanislav Malyshev
13a3826687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Fix bug #67249 : printf out-of-bounds read
5.5.13 release date
2014-05-27 12:11:59 -07:00