Dmitry Stogov
3fff53fc57
Optimize ZEND_POW (Rouven Weßling)
2014-05-18 20:48:16 +04:00
Nuno Lopes
1759905a23
gcov: tentative fix for broken coverage data after fix for opcache coverage
...
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
2014-05-18 11:23:21 -04:00
Tjerk Meesters
d4295eb26a
Prevent recursion in ZF2 Parameters class
2014-05-16 16:49:47 +08:00
Ferenc Kovacs
7b9c1b6576
adding NEWS block for beta4
2014-05-14 09:14:04 +02:00
Stanislav Malyshev
5a169310f0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.30 next
2014-05-13 22:22:03 -07:00
Stanislav Malyshev
b17efe82ff
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.30 next
Conflicts:
configure.in
main/php_version.h
2014-05-13 22:21:50 -07:00
Stanislav Malyshev
b1c944dfd2
5.4.30 next
2014-05-13 22:20:15 -07:00
Stanislav Malyshev
3a90a8b888
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
enable email notifications
2014-05-13 17:14:56 -07:00
Stanislav Malyshev
6b6a58c904
enable email notifications
...
[skip ci]
2014-05-13 17:14:06 -07:00
Stanislav Malyshev
de20e2224b
update NEWS
2014-05-13 17:09:16 -07:00
Stanislav Malyshev
7a14a460cf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
update NEWS
2014-05-13 17:08:22 -07:00
Stanislav Malyshev
de95dc7297
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-05-13 17:08:06 -07:00
Stanislav Malyshev
09ea489aef
update NEWS
2014-05-13 17:07:51 -07:00
Stanislav Malyshev
ffd74a0a29
update NEWS
2014-05-13 17:07:35 -07:00
Stanislav Malyshev
292b2fd3b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:03:50 -07:00
Stanislav Malyshev
a03a1ab88c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
2014-05-13 17:02:09 -07:00
Stanislav Malyshev
dc92e81922
Merge branch 'bug67251' into PHP-5.4
...
* bug67251:
Fix bug #67251 - date_parse_from_format out-of-bounds read
Conflicts:
ext/date/lib/parse_date.c
2014-05-13 16:52:45 -07:00
Stanislav Malyshev
0094fd0969
Merge branch 'bug67252' into PHP-5.4
...
* bug67252:
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
2014-05-13 16:47:27 -07:00
Stanislav Malyshev
9103c9eb4f
Merge branch 'bug67250' into PHP-5.4
...
* bug67250:
Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 16:43:10 -07:00
Derick Rethans
db42f83c2e
Merge branch 'PHP-5.5' into PHP-5.6
2014-05-13 16:37:05 +01:00
Derick Rethans
e3a48b3a43
Merge branch 'PHP-5.4' into PHP-5.5
2014-05-13 16:36:59 +01:00
Derick Rethans
3e276d6728
- Updated to version 2014.3 (2014c)
2014-05-13 16:36:58 +01:00
Stanislav Malyshev
2152e2f127
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test - output can be chunked
Conflicts:
ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:56:03 -07:00
Stanislav Malyshev
e3ca87265d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test - output can be chunked
2014-05-12 10:54:34 -07:00
Stanislav Malyshev
6ef8e0f088
fix test - output can be chunked
2014-05-12 10:54:16 -07:00
Stanislav Malyshev
9c27063a65
fix test
2014-05-12 01:27:18 -07:00
Yasuo Ohgaki
00cacc6048
Fixed test for commit 997be125eb
2014-05-12 15:35:16 +09:00
Yasuo Ohgaki
eb1278cb5d
Add bug fix to NEWS
2014-05-12 15:35:16 +09:00
Yasuo Ohgaki
2f9766fd02
Update UPGRADING according to bug fix
2014-05-12 15:35:16 +09:00
Stanislav Malyshev
89798f57d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
Stanislav Malyshev
c507c9f01b
improve CURL tests to allow testing without separate server
2014-05-11 22:43:08 -07:00
Yasuo Ohgaki
997be125eb
Fixed bug #67199 mb_regex_encoding mishmash
2014-05-12 13:33:53 +09:00
Stanislav Malyshev
466b8aa444
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
2014-05-11 21:09:11 -07:00
Stanislav Malyshev
1e2818b143
Fix bug #67252 : convert_uudecode out-of-bounds read
2014-05-11 20:29:27 -07:00
Stanislav Malyshev
0a80849250
Fix bug #67251 - date_parse_from_format out-of-bounds read
2014-05-11 19:34:21 -07:00
Stanislav Malyshev
3e9cb6a4a5
Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-11 19:09:19 -07:00
Stanislav Malyshev
f2fdeba19d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
2014-05-11 18:16:19 -07:00
Stanislav Malyshev
291b45afb5
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-11 18:14:57 -07:00
Stanislav Malyshev
2b475eebbe
Fix bug #67247 spl_fixedarray_resize integer overflow
2014-05-11 17:54:27 -07:00
Stanislav Malyshev
14dd6c2d54
fix news
2014-05-11 17:43:28 -07:00
Stanislav Malyshev
cdd1c1122e
add tests stuff to README
2014-05-11 16:04:28 -07:00
Bob Weinand
5bc4eb714a
Merge branch 'PHP-5.4' into PHP-5.5
2014-05-11 15:15:27 +02:00
Bob Weinand
62b2eb666d
Updated NEWS
2014-05-11 15:13:40 +02:00
Bob Weinand
5bf6a093ad
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 )
...
Linux apparently does not like memcpy in overlapping regions...
2014-05-11 15:11:03 +02:00
Felipe Pena
9d8a00337d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:38 -03:00
Felipe Pena
b99862e7ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:45:17 -03:00
Felipe Pena
ece7421864
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Move checking
2014-05-10 11:55:48 -03:00
Felipe Pena
16b293de50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Move checking
2014-05-10 11:55:45 -03:00
