]>
granicus.if.org Git - php/log
Xinchen Hui [Mon, 26 May 2014 07:40:57 +0000 (15:40 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Mon, 26 May 2014 07:40:50 +0000 (15:40 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 26 May 2014 07:40:26 +0000 (15:40 +0800)]
Update NEWs and add a test
Dmitry Stogov [Mon, 26 May 2014 06:12:36 +0000 (10:12 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed issue #183 (TMP_VAR is not only used once)
Dmitry Stogov [Mon, 26 May 2014 06:12:10 +0000 (10:12 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed issue #183 (TMP_VAR is not only used once)
Dmitry Stogov [Mon, 26 May 2014 06:10:59 +0000 (10:10 +0400)]
Fixed issue #183 (TMP_VAR is not only used once)
Matteo Beccati [Sat, 24 May 2014 22:08:56 +0000 (00:08 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix broken Junit output with --disable-cgi
Matteo Beccati [Sat, 24 May 2014 22:08:41 +0000 (00:08 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix broken Junit output with --disable-cgi
Matteo Beccati [Sat, 24 May 2014 22:08:32 +0000 (00:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix broken Junit output with --disable-cgi
Matteo Beccati [Sat, 24 May 2014 22:07:52 +0000 (00:07 +0200)]
Fix broken Junit output with --disable-cgi
Xinchen Hui [Sat, 24 May 2014 13:11:26 +0000 (21:11 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Sat, 24 May 2014 13:11:13 +0000 (21:11 +0800)]
Added folder mark
Xinchen Hui [Sat, 24 May 2014 07:43:37 +0000 (15:43 +0800)]
Merge branch 'new-tests' of https://github.com/SammyK/php-src
Matteo Beccati [Sat, 24 May 2014 06:06:53 +0000 (08:06 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Further test fixes for the
fdb2709 breakage.
Fix broken test caused by
fdb2709 .
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Adam Harvey [Fri, 23 May 2014 15:23:55 +0000 (15:23 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Further test fixes for the
fdb2709 breakage.
Fix broken test caused by
fdb2709 .
Adam Harvey [Fri, 23 May 2014 15:23:15 +0000 (15:23 +0000)]
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 .
Adam Harvey [Fri, 23 May 2014 15:22:26 +0000 (15:22 +0000)]
Further test fixes for the
fdb2709 breakage.
Adam Harvey [Fri, 23 May 2014 15:14:00 +0000 (15:14 +0000)]
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
Adam Harvey [Fri, 23 May 2014 15:07:19 +0000 (15:07 +0000)]
Fix broken test caused by
fdb2709 .
Sammy Kaye Powers [Fri, 23 May 2014 05:34:44 +0000 (05:34 +0000)]
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
Adam Harvey [Thu, 22 May 2014 22:43:39 +0000 (22:43 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix run-tests.php with Valgrind >= 3.10.0.
Adam Harvey [Thu, 22 May 2014 22:37:57 +0000 (22:37 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix run-tests.php with Valgrind >= 3.10.0.
Adam Harvey [Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix run-tests.php with Valgrind >= 3.10.0.
Conflicts:
run-tests.php
Adam Harvey [Thu, 22 May 2014 22:36:55 +0000 (22:36 +0000)]
Fix run-tests.php with Valgrind >= 3.10.0.
The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.
Adam Harvey [Wed, 21 May 2014 20:06:30 +0000 (15:06 -0500)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add microseconds to the serialised form of DateTime objects.
Adam Harvey [Wed, 21 May 2014 20:05:08 +0000 (15:05 -0500)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add microseconds to the serialised form of DateTime objects.
Adam Harvey [Wed, 21 May 2014 20:03:24 +0000 (15:03 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add microseconds to the serialised form of DateTime objects.
Adam Harvey [Wed, 21 May 2014 19:55:09 +0000 (14:55 -0500)]
Add microseconds to the serialised form of DateTime objects.
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
Matteo Beccati [Wed, 21 May 2014 16:59:31 +0000 (18:59 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Improved test for bug #62479
Matteo Beccati [Wed, 21 May 2014 16:59:14 +0000 (18:59 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Improved test for bug #62479
Matteo Beccati [Wed, 21 May 2014 16:59:02 +0000 (18:59 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Improved test for bug #62479
Matteo Beccati [Wed, 21 May 2014 16:58:14 +0000 (18:58 +0200)]
Improved test for bug #62479
Stanislav Malyshev [Mon, 19 May 2014 06:47:14 +0000 (23:47 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix typo in ODBC code
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
5.5.14 now
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Mon, 19 May 2014 06:46:30 +0000 (23:46 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix typo in ODBC code
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
5.5.14 now
Fix bug #67060: use default mode of 660
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Mon, 19 May 2014 06:44:33 +0000 (23:44 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix typo in ODBC code
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Mon, 19 May 2014 06:43:59 +0000 (23:43 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix typo in ODBC code
Fix bug #67060: use default mode of 660
Conflicts:
ext/odbc/php_odbc.c
Stanislav Malyshev [Mon, 19 May 2014 06:42:30 +0000 (23:42 -0700)]
fix typo in ODBC code
Dmitry Stogov [Sun, 18 May 2014 16:56:34 +0000 (20:56 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Support for __debugInfo (Joe Watkins)
Dmitry Stogov [Sun, 18 May 2014 16:55:40 +0000 (20:55 +0400)]
Support for __debugInfo (Joe Watkins)
Dmitry Stogov [Sun, 18 May 2014 16:51:37 +0000 (20:51 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Optimize ZEND_POW (Rouven Weßling)
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
Conflicts:
ext/opcache/ZendAccelerator.h
Dmitry Stogov [Sun, 18 May 2014 16:48:16 +0000 (20:48 +0400)]
Optimize ZEND_POW (Rouven Weßling)
Nuno Lopes [Sun, 18 May 2014 15:24:22 +0000 (11:24 -0400)]
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
Nuno Lopes [Sun, 18 May 2014 15:23:21 +0000 (11:23 -0400)]
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
Nuno Lopes [Sun, 18 May 2014 15:21:05 +0000 (11:21 -0400)]
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
Tjerk Meesters [Sun, 18 May 2014 13:55:44 +0000 (21:55 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/spl/spl_array.c
Tjerk Meesters [Wed, 7 May 2014 07:35:22 +0000 (15:35 +0800)]
Prevent recursion in ZF2 Parameters class
Julien Pauli [Wed, 14 May 2014 08:24:32 +0000 (10:24 +0200)]
5.5.14 now
Ferenc Kovacs [Wed, 14 May 2014 07:14:57 +0000 (09:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
adding NEWS block for beta4
Ferenc Kovacs [Wed, 14 May 2014 07:14:04 +0000 (09:14 +0200)]
adding NEWS block for beta4
Stanislav Malyshev [Wed, 14 May 2014 05:22:13 +0000 (22:22 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.4.30 next
Stanislav Malyshev [Wed, 14 May 2014 05:22:03 +0000 (22:22 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.30 next
Stanislav Malyshev [Wed, 14 May 2014 05:21:50 +0000 (22:21 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.30 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 14 May 2014 05:20:15 +0000 (22:20 -0700)]
5.4.30 next
Stanislav Malyshev [Wed, 14 May 2014 00:15:09 +0000 (17:15 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
enable email notifications
Stanislav Malyshev [Wed, 14 May 2014 00:14:56 +0000 (17:14 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
enable email notifications
Stanislav Malyshev [Wed, 14 May 2014 00:14:06 +0000 (17:14 -0700)]
enable email notifications
[skip ci]
Stanislav Malyshev [Wed, 14 May 2014 00:09:30 +0000 (17:09 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
update NEWS
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:09:16 +0000 (17:09 -0700)]
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:08:22 +0000 (17:08 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:08:06 +0000 (17:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:07:51 +0000 (17:07 -0700)]
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:07:35 +0000 (17:07 -0700)]
update NEWS
Stanislav Malyshev [Wed, 14 May 2014 00:04:44 +0000 (17:04 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
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)
Stanislav Malyshev [Wed, 14 May 2014 00:03:50 +0000 (17:03 -0700)]
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)
Stanislav Malyshev [Wed, 14 May 2014 00:02:09 +0000 (17:02 -0700)]
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
Stanislav Malyshev [Tue, 13 May 2014 23:52:17 +0000 (16:52 -0700)]
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
Stanislav Malyshev [Tue, 13 May 2014 23:44:24 +0000 (16:44 -0700)]
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
Stanislav Malyshev [Tue, 13 May 2014 23:42:23 +0000 (16:42 -0700)]
Merge branch 'bug67250' into PHP-5.4
* bug67250:
Fix bug #67250 (iptcparse out-of-bounds read)
Derick Rethans [Tue, 13 May 2014 15:37:07 +0000 (16:37 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Tue, 13 May 2014 15:37:05 +0000 (16:37 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 13 May 2014 15:36:59 +0000 (16:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Tue, 13 May 2014 15:36:58 +0000 (16:36 +0100)]
- Updated to version 2014.3 (2014c)
Stanislav Malyshev [Mon, 12 May 2014 17:58:18 +0000 (10:58 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test - output can be chunked
fix test
Conflicts:
ext/curl/tests/curl_basic_006.phpt
Stanislav Malyshev [Mon, 12 May 2014 17:56:03 +0000 (10:56 -0700)]
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
Stanislav Malyshev [Mon, 12 May 2014 17:54:34 +0000 (10:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test - output can be chunked
Stanislav Malyshev [Mon, 12 May 2014 17:53:45 +0000 (10:53 -0700)]
fix test - output can be chunked
Stanislav Malyshev [Mon, 12 May 2014 07:53:41 +0000 (00:53 -0700)]
fix test
Stanislav Malyshev [Mon, 12 May 2014 07:53:41 +0000 (00:53 -0700)]
fix test
Yasuo Ohgaki [Mon, 12 May 2014 06:38:40 +0000 (15:38 +0900)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed test for commit
997be125eb0228c5b1b6dd278f617791e71192c6
Yasuo Ohgaki [Mon, 12 May 2014 06:31:48 +0000 (15:31 +0900)]
Yasuo Ohgaki [Mon, 12 May 2014 05:58:46 +0000 (14:58 +0900)]
Add bug fix to NEWS
Yasuo Ohgaki [Mon, 12 May 2014 05:56:11 +0000 (14:56 +0900)]
Update UPGRADING according to bug fix
Stanislav Malyshev [Tue, 15 Apr 2014 17:43:24 +0000 (10:43 -0700)]
Fix bug #67060: use default mode of 660
Stanislav Malyshev [Mon, 12 May 2014 06:20:33 +0000 (23:20 -0700)]
fix test
Stanislav Malyshev [Mon, 12 May 2014 05:21:57 +0000 (22:21 -0700)]
improve CURL tests to allow testing without separate server
Stanislav Malyshev [Mon, 12 May 2014 05:44:30 +0000 (22:44 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve CURL tests to allow testing without separate server
Stanislav Malyshev [Mon, 12 May 2014 05:21:57 +0000 (22:21 -0700)]
improve CURL tests to allow testing without separate server
Yasuo Ohgaki [Mon, 12 May 2014 04:34:43 +0000 (13:34 +0900)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #67199 mb_regex_encoding mishmash
Yasuo Ohgaki [Mon, 12 May 2014 04:33:53 +0000 (13:33 +0900)]
Fixed bug #67199 mb_regex_encoding mishmash
Stanislav Malyshev [Mon, 12 May 2014 04:09:11 +0000 (21:09 -0700)]
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 03:29:27 +0000 (20:29 -0700)]
Fix bug #67252: convert_uudecode out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 02:34:21 +0000 (19:34 -0700)]
Fix bug #67251 - date_parse_from_format out-of-bounds read
Stanislav Malyshev [Mon, 12 May 2014 02:09:19 +0000 (19:09 -0700)]
Fix bug #67250 (iptcparse out-of-bounds read)
Stanislav Malyshev [Mon, 12 May 2014 01:57:39 +0000 (18:57 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
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...
Stanislav Malyshev [Mon, 12 May 2014 01:55:02 +0000 (18:55 -0700)]
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...
Stanislav Malyshev [Mon, 12 May 2014 01:15:29 +0000 (18:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
Stanislav Malyshev [Mon, 12 May 2014 01:14:57 +0000 (18:14 -0700)]
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Stanislav Malyshev [Mon, 12 May 2014 00:54:27 +0000 (17:54 -0700)]
Fix bug #67247 spl_fixedarray_resize integer overflow
Stanislav Malyshev [Mon, 12 May 2014 00:43:28 +0000 (17:43 -0700)]
fix news
Stanislav Malyshev [Fri, 9 May 2014 20:28:39 +0000 (13:28 -0700)]
add tests stuff to README