]>
granicus.if.org Git - php/log
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
Dmitry Stogov [Thu, 14 Aug 2014 19:54:32 +0000 (23:54 +0400)]
Fixed mode
Dmitry Stogov [Thu, 14 Aug 2014 19:53:27 +0000 (23:53 +0400)]
Fixed compilation warnings
Dmitry Stogov [Thu, 14 Aug 2014 19:31:01 +0000 (23:31 +0400)]
Fixed windows build
Dmitry Stogov [Thu, 14 Aug 2014 19:30:49 +0000 (23:30 +0400)]
Merge branch 'master' into phpng
* master: (51 commits)
Update Git rules
Back to -dev (with EOL notice in NEWS)
new NEWS block for the next release
It's 2014 already, fix copyright year where user visible
PHP 5.3.29
Some changes were lost in the merge commit of #66091
Updated NEWS for #66091
Fixed #66091
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
NEWS entry for
e6d93a1 /
d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
PHP 5.3.29RC1
Fix missing type checks in various functions
...
Conflicts:
ext/date/php_date.c
ext/standard/math.c
Dmitry Stogov [Thu, 14 Aug 2014 18:44:25 +0000 (22:44 +0400)]
Fixed support for references
Keyur Govande [Thu, 14 Aug 2014 18:20:26 +0000 (18:20 +0000)]
Fix failing tests
Keyur Govande [Thu, 14 Aug 2014 18:19:56 +0000 (18:19 +0000)]
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 [Thu, 14 Aug 2014 17:54:57 +0000 (21:54 +0400)]
Fixed support for references
Sara Golemon [Thu, 14 Aug 2014 16:44:14 +0000 (09:44 -0700)]
Merge branch 'pull-request/658'
Johannes Schlüter [Thu, 14 Aug 2014 15:27:12 +0000 (17:27 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Thu, 14 Aug 2014 15:25:22 +0000 (17:25 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Thu, 14 Aug 2014 15:22:25 +0000 (17:22 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 14 Aug 2014 15:08:02 +0000 (17:08 +0200)]
Update Git rules
Johannes Schlüter [Thu, 14 Aug 2014 15:05:20 +0000 (17:05 +0200)]
Back to -dev (with EOL notice in NEWS)
Dmitry Stogov [Thu, 14 Aug 2014 13:00:01 +0000 (17:00 +0400)]
Fixed reference support (references to references are not allowed)
Dmitry Stogov [Thu, 14 Aug 2014 11:07:39 +0000 (15:07 +0400)]
Fixed reference handling
Dmitry Stogov [Thu, 14 Aug 2014 09:44:37 +0000 (13:44 +0400)]
Fixed conversion of empty packed array into hash
Dmitry Stogov [Thu, 14 Aug 2014 08:01:28 +0000 (12:01 +0400)]
Fixed assignment of reference to itself
Dmitry Stogov [Thu, 14 Aug 2014 06:46:17 +0000 (10:46 +0400)]
Restored "???" mark in the place that might be changed later
Xinchen Hui [Thu, 14 Aug 2014 04:26:45 +0000 (12:26 +0800)]
It's okey for use a stack value here (deleted immediately after use)
Xinchen Hui [Thu, 14 Aug 2014 04:15:24 +0000 (12:15 +0800)]
cleanup
Xinchen Hui [Thu, 14 Aug 2014 03:52:46 +0000 (11:52 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Ferenc Kovacs [Thu, 14 Aug 2014 00:18:27 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
new NEWS block for the next release
Ferenc Kovacs [Thu, 14 Aug 2014 00:17:55 +0000 (02:17 +0200)]
new NEWS block for the next release
Dmitry Stogov [Wed, 13 Aug 2014 19:30:07 +0000 (23:30 +0400)]
Avoid reallocation
Johannes Schlüter [Wed, 13 Aug 2014 19:22:50 +0000 (21:22 +0200)]
It's 2014 already, fix copyright year where user visible
Left out all file headers
Dmitry Stogov [Wed, 13 Aug 2014 18:26:07 +0000 (22:26 +0400)]
cleanuo (use zend_string instead of char*)
Dmitry Stogov [Wed, 13 Aug 2014 18:21:51 +0000 (22:21 +0400)]
cleanup
Dmitry Stogov [Wed, 13 Aug 2014 18:18:05 +0000 (22:18 +0400)]
cleanup
Johannes Schlüter [Wed, 13 Aug 2014 16:36:10 +0000 (18:36 +0200)]
PHP 5.3.29
Dmitry Stogov [Wed, 13 Aug 2014 15:43:34 +0000 (19:43 +0400)]
cleanup
Dmitry Stogov [Wed, 13 Aug 2014 13:05:18 +0000 (17:05 +0400)]
cleanup (we don't have to duplicate elements of module_registry)
Dmitry Stogov [Wed, 13 Aug 2014 13:00:13 +0000 (17:00 +0400)]
cleanup (we don't have to duplicate elements of stream_filters_hash)
Tjerk Meesters [Wed, 13 Aug 2014 12:57:10 +0000 (20:57 +0800)]
Some changes were lost in the merge commit of #66091
Dmitry Stogov [Wed, 13 Aug 2014 12:55:21 +0000 (16:55 +0400)]
cleanup
Tjerk Meesters [Wed, 13 Aug 2014 12:16:22 +0000 (20:16 +0800)]
Updated NEWS for #66091