]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 19 Aug 2014 10:50:27 +0000 (12:50 +0200)]
fix uninitialized args usage
Anatol Belski [Tue, 19 Aug 2014 07:38:13 +0000 (09:38 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Remi Collet
# Via Remi Collet
* 'master' of git.php.net:php-src:
fix merge issue in previous (again)
fix merge issue in previous
NEWS
NEWS
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
Anatol Belski [Tue, 19 Aug 2014 07:37:38 +0000 (09:37 +0200)]
brought back that vs2012 fix
Remi Collet [Tue, 19 Aug 2014 07:16:24 +0000 (09:16 +0200)]
fix merge issue in previous (again)
Remi Collet [Tue, 19 Aug 2014 07:10:34 +0000 (09:10 +0200)]
fix merge issue in previous
Remi Collet [Tue, 19 Aug 2014 06:56:43 +0000 (08:56 +0200)]
fix merge for #67717
Remi Collet [Tue, 19 Aug 2014 06:41:42 +0000 (08:41 +0200)]
NEWS
Remi Collet [Tue, 19 Aug 2014 06:41:14 +0000 (08:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
Remi Collet [Tue, 19 Aug 2014 06:40:58 +0000 (08:40 +0200)]
NEWS
Remi Collet [Tue, 19 Aug 2014 06:40:30 +0000 (08:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
Remi Collet [Tue, 19 Aug 2014 06:40:18 +0000 (08:40 +0200)]
NEWS
Remi Collet [Tue, 19 Aug 2014 06:33:49 +0000 (08:33 +0200)]
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
Incomplete fix for CVE-2014-4049
Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
Anatol Belski [Tue, 19 Aug 2014 06:16:34 +0000 (08:16 +0200)]
C89 compat
Anatol Belski [Tue, 19 Aug 2014 06:05:31 +0000 (08:05 +0200)]
c89 compat
Anatol Belski [Tue, 19 Aug 2014 06:00:52 +0000 (08:00 +0200)]
added missing define
Anatol Belski [Tue, 19 Aug 2014 05:45:28 +0000 (07:45 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
Fixed encoding support
Anatol Belski [Tue, 19 Aug 2014 05:44:03 +0000 (07:44 +0200)]
fix wrong pointer indirection
Dmitry Stogov [Tue, 19 Aug 2014 05:28:13 +0000 (09:28 +0400)]
Fixed encoding support
Lior Kaplan [Mon, 18 Aug 2014 21:20:50 +0000 (00:20 +0300)]
Bump version to 7.0.0
Follow up for
d9f3eac
Anatol Belski [Mon, 18 Aug 2014 20:36:57 +0000 (22:36 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Derick Rethans (3) and Dmitry Stogov (1)
# Via Derick Rethans (3) and Dmitry Stogov (1)
* 'master' of git.php.net:php-src:
Improved error message
BFN.
Fixed bug #67109: First uppercase letter breaks date string parsing.
Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.
Anatol Belski [Mon, 18 Aug 2014 20:36:38 +0000 (22:36 +0200)]
C89 compat
Derick Rethans [Mon, 18 Aug 2014 19:27:51 +0000 (20:27 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Mon, 18 Aug 2014 19:27:44 +0000 (20:27 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Mon, 18 Aug 2014 19:27:33 +0000 (20:27 +0100)]
Merge branch 'datetimebugs' into PHP-5.5
Dmitry Stogov [Mon, 18 Aug 2014 17:47:30 +0000 (21:47 +0400)]
Improved error message
Derick Rethans [Mon, 18 Aug 2014 17:46:56 +0000 (18:46 +0100)]
BFN.
Derick Rethans [Mon, 18 Aug 2014 17:31:26 +0000 (18:31 +0100)]
Fixed bug #67109: First uppercase letter breaks date string parsing.
Derick Rethans [Mon, 18 Aug 2014 17:22:14 +0000 (18:22 +0100)]
Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.
Dmitry Stogov [Mon, 18 Aug 2014 17:08:50 +0000 (21:08 +0400)]
Fixed bug #67856 (Leak when using array_reduce with by-ref function)
Ferenc Kovacs [Mon, 18 Aug 2014 16:48:06 +0000 (18:48 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
improve the grammar for my recent UPGRADING note
Ferenc Kovacs [Mon, 18 Aug 2014 16:47:07 +0000 (18:47 +0200)]
improve the grammar for my recent UPGRADING note
Nikita Popov [Mon, 18 Aug 2014 16:12:50 +0000 (18:12 +0200)]
Fix bug #67858: Leak when $php_errormsg already set
Ferenc Kovacs [Mon, 18 Aug 2014 15:04:17 +0000 (17:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733
Ferenc Kovacs [Mon, 18 Aug 2014 14:59:03 +0000 (16:59 +0200)]
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733
Dmitry Stogov [Mon, 18 Aug 2014 06:09:25 +0000 (10:09 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Change to ext/reflection should be in its own category
Dmitry Stogov [Mon, 18 Aug 2014 06:08:48 +0000 (10:08 +0400)]
Fixed parameter parsing
Tjerk Meesters [Mon, 18 Aug 2014 05:07:34 +0000 (13:07 +0800)]
Change to ext/reflection should be in its own category
Dmitry Stogov [Mon, 18 Aug 2014 05:05:16 +0000 (09:05 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Updated NEWS for d790ec
Correct typo in comments: 'initialized'
typofixes
typofixes
Fixes missing Reflector interface constraints being enforced by the engine
Fixed version id
Update NEWS
Update NEWS
Fix another failing test
Add NEWS
Better version checking
Better version checking
Better version checking
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Tjerk Meesters [Sun, 17 Aug 2014 22:54:50 +0000 (06:54 +0800)]
Updated NEWS for d790ec
Lior Kaplan [Sun, 17 Aug 2014 18:37:22 +0000 (21:37 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Correct typo in comments: 'initialized'
Conflicts:
ext/dom/php_dom.c
ext/spl/php_spl.c
Lior Kaplan [Sun, 17 Aug 2014 18:34:03 +0000 (21:34 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Correct typo in comments: 'initialized'
Lior Kaplan [Sun, 17 Aug 2014 18:33:41 +0000 (21:33 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Correct typo in comments: 'initialized'
Lior Kaplan [Sun, 17 Aug 2014 18:32:53 +0000 (21:32 +0300)]
Correct typo in comments: 'initialized'
Veres Lajos [Sun, 17 Aug 2014 13:00:39 +0000 (16:00 +0300)]
typofixes
Lior Kaplan [Sun, 17 Aug 2014 12:53:33 +0000 (15:53 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
typofixes
Conflicts:
ext/spl/php_spl.c
Lior Kaplan [Sun, 17 Aug 2014 12:51:15 +0000 (15:51 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typofixes
Lior Kaplan [Sun, 17 Aug 2014 12:48:22 +0000 (15:48 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typofixes
Veres Lajos [Tue, 12 Aug 2014 21:00:23 +0000 (22:00 +0100)]
typofixes
Tjerk Meesters [Thu, 14 Aug 2014 01:25:14 +0000 (09:25 +0800)]
Fixes missing Reflector interface constraints being enforced by the engine
Xinchen Hui [Sat, 16 Aug 2014 08:44:02 +0000 (16:44 +0800)]
Fixed version id
Xinchen Hui [Sat, 16 Aug 2014 08:43:57 +0000 (16:43 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Keyur Govande [Fri, 15 Aug 2014 23:49:17 +0000 (23:49 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update NEWS
Keyur Govande [Fri, 15 Aug 2014 23:49:07 +0000 (23:49 +0000)]
Update NEWS
Keyur Govande [Fri, 15 Aug 2014 23:47:31 +0000 (23:47 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Keyur Govande [Fri, 15 Aug 2014 23:47:06 +0000 (23:47 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
Keyur Govande [Fri, 15 Aug 2014 23:38:14 +0000 (23:38 +0000)]
Update NEWS
Keyur Govande [Fri, 15 Aug 2014 23:26:21 +0000 (23:26 +0000)]
Fix another failing test
Keyur Govande [Fri, 15 Aug 2014 23:13:36 +0000 (23:13 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
Keyur Govande [Fri, 15 Aug 2014 23:08:29 +0000 (23:08 +0000)]
Add NEWS
Keyur Govande [Fri, 15 Aug 2014 23:06:55 +0000 (23:06 +0000)]
Merge branch 'pull-request/772' into PHP-5.4
* pull-request/772:
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.
9998998641968 . This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
Dmitry Stogov [Fri, 15 Aug 2014 12:13:00 +0000 (16:13 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fixed version checking
Fixed version check
Xinchen Hui [Fri, 15 Aug 2014 10:41:01 +0000 (18:41 +0800)]
Better version checking
Xinchen Hui [Fri, 15 Aug 2014 10:39:45 +0000 (18:39 +0800)]
Better version checking
Xinchen Hui [Fri, 15 Aug 2014 10:38:31 +0000 (18:38 +0800)]
Better version checking
Xinchen Hui [Fri, 15 Aug 2014 10:28:41 +0000 (18:28 +0800)]
Fixed version checking
Xinchen Hui [Fri, 15 Aug 2014 10:21:23 +0000 (18:21 +0800)]
Fixed version check
Dmitry Stogov [Fri, 15 Aug 2014 09:35:52 +0000 (13:35 +0400)]
Fixed PHP6 unicode related tests
Dmitry Stogov [Fri, 15 Aug 2014 09:22:13 +0000 (13:22 +0400)]
Fixed PHP6 unicode related tests
Dmitry Stogov [Fri, 15 Aug 2014 09:08:53 +0000 (13:08 +0400)]
Fixed PHP6 unicode related tests
Xinchen Hui [Fri, 15 Aug 2014 08:58:22 +0000 (16:58 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Conflicts:
ext/mysqli/mysqli_api.c
Xinchen Hui [Fri, 15 Aug 2014 08:47:54 +0000 (16:47 +0800)]
Add copyright header
Xinchen Hui [Fri, 15 Aug 2014 08:40:07 +0000 (16:40 +0800)]
Remove old version PHP supports
Xinchen Hui [Fri, 15 Aug 2014 08:39:51 +0000 (16:39 +0800)]
Fixed build after version number bumped
Dmitry Stogov [Fri, 15 Aug 2014 07:46:04 +0000 (11:46 +0400)]
Parameters with duplicate names are not allowed anymore in PHP7.
Dmitry Stogov [Fri, 15 Aug 2014 07:39:50 +0000 (11:39 +0400)]
Behavoir of func_get_arg() and func_get_args() was changed in PHP7.
Now they show current values of variables corresponded to passed arguments instead of originally passed values.
Dmitry Stogov [Fri, 15 Aug 2014 07:13:42 +0000 (11:13 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Update Version Number :)
Fixed initializing
Unused variable
Conflicts:
main/php_version.h
Dmitry Stogov [Fri, 15 Aug 2014 07:10:41 +0000 (11:10 +0400)]
Bump version to 7.0.0-dev
Xinchen Hui [Fri, 15 Aug 2014 07:06:26 +0000 (15:06 +0800)]
Update Version Number :)
Xinchen Hui [Fri, 15 Aug 2014 05:52:52 +0000 (13:52 +0800)]
Fixed initializing
Xinchen Hui [Fri, 15 Aug 2014 05:47:38 +0000 (13:47 +0800)]
Unused variable
Dmitry Stogov [Fri, 15 Aug 2014 04:10:08 +0000 (08:10 +0400)]
Merge branch 'master' into phpng
* master:
add NEWS for 5.6 too
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Add NEWS entry for log() improvements
Stanislav Malyshev [Fri, 15 Aug 2014 01:16:49 +0000 (18:16 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS for 5.6 too
Stanislav Malyshev [Fri, 15 Aug 2014 01:16:33 +0000 (18:16 -0700)]
add NEWS for 5.6 too
Stanislav Malyshev [Fri, 15 Aug 2014 00:22:15 +0000 (17:22 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
Stanislav Malyshev [Fri, 15 Aug 2014 00:22:06 +0000 (17:22 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
Stanislav Malyshev [Fri, 15 Aug 2014 00:21:37 +0000 (17:21 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
Stanislav Malyshev [Fri, 15 Aug 2014 00:19:51 +0000 (17:19 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]
Fix bug #67716 - Segfault in cdf.c
Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]
Fix bug #67716 - Segfault in cdf.c
Stanislav Malyshev [Fri, 15 Aug 2014 00:09:09 +0000 (17:09 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Stanislav Malyshev [Fri, 15 Aug 2014 00:08:37 +0000 (17:08 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Stanislav Malyshev [Fri, 15 Aug 2014 00:07:45 +0000 (17:07 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
Stanislav Malyshev [Fri, 15 Aug 2014 00:07:28 +0000 (17:07 -0700)]
fix test
Stanislav Malyshev [Fri, 15 Aug 2014 00:05:12 +0000 (17:05 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Stanislav Malyshev [Fri, 15 Aug 2014 00:05:03 +0000 (17:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
split the glob() test to test different basedir
Anatol Belski [Tue, 20 Aug 2013 11:39:30 +0000 (13:39 +0200)]
split the glob() test to test different basedir
Stanislav Malyshev [Thu, 14 Aug 2014 23:59:14 +0000 (16:59 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Anatol Belski [Mon, 19 Aug 2013 12:21:16 +0000 (14:21 +0200)]
fixed glob() edge case on windows, ref bug #47358
Pierre Joye [Tue, 8 Jan 2013 14:02:04 +0000 (15:02 +0100)]
- fix bug #47358, glob returns error, should be empty array()
Conflicts:
ext/standard/dir.c
Sara Golemon [Thu, 14 Aug 2014 20:34:06 +0000 (13:34 -0700)]
Add NEWS entry for log() improvements