Stanislav Malyshev
e35945490f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove superfluous echos.
2014-06-08 13:53:01 -07:00
Stanislav Malyshev
da6abc8db4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove superfluous echos.
2014-06-08 13:50:41 -07:00
Jeff Welch
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
Ferenc Kovacs
1e2a4a67dd
use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
2014-06-08 00:01:01 +02:00
Ferenc Kovacs
016b1f089e
Fix bug #67392 : token_name() does not return name for T_POW and T_POW_EQUAL token
2014-06-07 15:27:54 +02:00
Remi Collet
b16950b5d3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet
67f1a58ac9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
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
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
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
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
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
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
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
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
Xinchen Hui
c4e7c7d50e
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-01 19:42:20 +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
Anatol Belski
fb991bd7fd
updated libmagic.patch for 5.6+
2014-05-27 22:39:54 +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
Stanislav Malyshev
a2f8c9c1ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Fix bug #67249 : printf out-of-bounds read
2014-05-27 12:10:41 -07:00
Stanislav Malyshev
091b7642c2
Fix bug #67249 : printf out-of-bounds read
2014-05-27 11:28:22 -07:00
Andrew Kehrig
91e7b3b84f
Fix #50444 : PDO-ODBC changes for 64-bit
...
This bug is also referenced in
[#61777 ](https://bugs.php.net/bug.php?id=61777 ) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
2014-05-26 22:17:29 -07:00
Stanislav Malyshev
bc87ba8ee6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
fix my last commit with some locales
2014-05-26 18:06:58 -07:00
Anatol Belski
d184f07b3c
backport this piece from 5.6, related to the #66307 fix
2014-05-26 18:05:13 -07:00
Anatol Belski
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
Stanislav Malyshev
5ce11c2698
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
2014-05-26 18:03:01 -07:00
Stanislav Malyshev
4005f06df6
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
...
Upstream patch: b8acc83781
2014-05-26 18:01:17 -07:00
Stanislav Malyshev
57225f09ed
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
...
Upstream fix: f97486ef5d
2014-05-26 17:45:14 -07:00
Xinchen Hui
b0b0be176f
Merge branch 'PHP-5.5' into PHP-5.6
2014-05-26 15:40:50 +08:00
Xinchen Hui
70699d7f68
Update NEWs and add a test
2014-05-26 15:40:26 +08:00
Dmitry Stogov
24a86dbb6f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:12:10 +04:00
Dmitry Stogov
19be8b676c
Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:10:59 +04:00
Adam Harvey
80a2716b56
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Further test fixes for the fdb2709
breakage.
Fix broken test caused by fdb2709
.
2014-05-23 15:23:15 +00:00
Adam Harvey
2260fca3dd
Further test fixes for the fdb2709
breakage.
2014-05-23 15:22:26 +00:00
Adam Harvey
6d9cc92238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix broken test caused by fdb2709
.
Conflicts:
ext/intl/tests/dateformat_format.phpt
2014-05-23 15:14:00 +00:00
Adam Harvey
319611ffbd
Fix broken test caused by fdb2709
.
2014-05-23 15:07:19 +00:00
Adam Harvey
549331a925
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add microseconds to the serialised form of DateTime objects.
2014-05-21 15:05:08 -05:00
Adam Harvey
d39377924c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add microseconds to the serialised form of DateTime objects.
2014-05-21 15:03:24 -05:00
Adam Harvey
fdb2709dd2
Add microseconds to the serialised form of DateTime objects.
...
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
2014-05-21 14:55:52 -05:00