]>
granicus.if.org Git - php/log
Dmitry Stogov [Mon, 12 Jan 2015 11:43:32 +0000 (14:43 +0300)]
Fixed reference support
Xinchen Hui [Mon, 12 Jan 2015 09:24:37 +0000 (17:24 +0800)]
Faster strrpos implementation
Xinchen Hui [Mon, 12 Jan 2015 07:34:46 +0000 (15:34 +0800)]
Faster zend_memnstr for long text
Xinchen Hui [Sun, 11 Jan 2015 03:19:49 +0000 (22:19 -0500)]
Fixed #68790 (Missing return)
Stanislav Malyshev [Sat, 3 Jan 2015 09:22:58 +0000 (01:22 -0800)]
trailing whitespace removal
Bob Weinand [Sat, 10 Jan 2015 21:29:00 +0000 (22:29 +0100)]
Fix missing ZVAL_DEREF()
Xinchen Hui [Sat, 10 Jan 2015 15:58:22 +0000 (10:58 -0500)]
Fixed #68779 (Incorrect sizeof)
Rasmus Lerdorf [Sat, 10 Jan 2015 02:08:36 +0000 (18:08 -0800)]
Fix bug #68784
Rasmus Lerdorf [Sat, 10 Jan 2015 01:24:48 +0000 (17:24 -0800)]
These tests all assume that IPV6 is available.
Rasmus Lerdorf [Sat, 10 Jan 2015 00:36:21 +0000 (16:36 -0800)]
Adding a note here for my future self so I won't
need to look into this again
Rasmus Lerdorf [Sat, 10 Jan 2015 00:27:09 +0000 (16:27 -0800)]
We can't output absolute S and T values for the
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
Nikita Popov [Fri, 9 Jan 2015 17:27:06 +0000 (18:27 +0100)]
Make empty list() check stricter
Now also includes list()s with just commas in it.
Nikita Popov [Fri, 9 Jan 2015 16:58:41 +0000 (17:58 +0100)]
Fix bug #68775
Julien Pauli [Fri, 9 Jan 2015 15:26:10 +0000 (16:26 +0100)]
Updated NEWS
Julien Pauli [Fri, 9 Jan 2015 15:25:14 +0000 (16:25 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Fix bug #68260
Julien Pauli [Fri, 9 Jan 2015 15:25:02 +0000 (16:25 +0100)]
Updated NEWS
Julien Pauli [Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #68260
Julien Pauli [Fri, 9 Jan 2015 15:24:14 +0000 (16:24 +0100)]
Fix bug #68260
Guilherme Blanco [Fri, 5 Dec 2014 17:09:49 +0000 (17:09 +0000)]
Removed parsing support traits to have extends and implements.
Guilherme Blanco [Mon, 1 Dec 2014 18:44:07 +0000 (18:44 +0000)]
Decoupled class declaration statement into more granular pieces.
Francois Laupretre [Wed, 7 Jan 2015 11:59:44 +0000 (12:59 +0100)]
Fix README.PARAMETER_PARSING_API
krakjoe [Fri, 9 Jan 2015 07:48:29 +0000 (07:48 +0000)]
Merge branch 'master' of git://git.php.net/php-src
krakjoe [Fri, 9 Jan 2015 07:45:21 +0000 (07:45 +0000)]
optimization for bug report #68679
Xinchen Hui [Fri, 9 Jan 2015 03:54:41 +0000 (11:54 +0800)]
Update NEWs
Xinchen Hui [Fri, 9 Jan 2015 03:54:01 +0000 (11:54 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Fri, 9 Jan 2015 03:53:47 +0000 (11:53 +0800)]
Fixed bug (try block removed while combined with xdebug)
Dmitry Stogov [Thu, 8 Jan 2015 22:41:13 +0000 (01:41 +0300)]
Fixed bug #68636 (setlocale no longer returns current value per category).
Adam Harvey [Thu, 8 Jan 2015 19:17:53 +0000 (19:17 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Calling crypt() with a salt of *0 should always return *1.
Conflicts:
configure.in
main/php_version.h
Adam Harvey [Thu, 8 Jan 2015 19:16:32 +0000 (19:16 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now
Conflicts:
configure.in
main/php_version.h
Adam Harvey [Thu, 8 Jan 2015 19:13:23 +0000 (19:13 +0000)]
Calling crypt() with a salt of *0 should always return *1.
Anatol Belski [Thu, 8 Jan 2015 17:11:46 +0000 (18:11 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test
Anatol Belski [Thu, 8 Jan 2015 17:11:15 +0000 (18:11 +0100)]
fix test
Xinchen Hui [Thu, 8 Jan 2015 08:32:20 +0000 (16:32 +0800)]
Fixed #68677
Xinchen Hui [Thu, 8 Jan 2015 08:29:33 +0000 (16:29 +0800)]
Fixed #68692
Xinchen Hui [Thu, 8 Jan 2015 08:28:32 +0000 (16:28 +0800)]
Fixed #68694
Xinchen Hui [Thu, 8 Jan 2015 08:26:20 +0000 (16:26 +0800)]
Fixed #68704
Xinchen Hui [Thu, 8 Jan 2015 08:20:20 +0000 (16:20 +0800)]
Fixed #68711
Xinchen Hui [Thu, 8 Jan 2015 08:09:41 +0000 (16:09 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 8 Jan 2015 08:09:02 +0000 (16:09 +0800)]
Fixed bug #68739 #68740 #68741
Keyur Govande [Wed, 7 Jan 2015 23:23:26 +0000 (23:23 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add NEWS
Add NEWS
Patch commit
d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
5.5.22 now
Conflicts:
ext/mysqli/mysqli_api.c
Keyur Govande [Wed, 7 Jan 2015 22:52:27 +0000 (22:52 +0000)]
Add NEWS
Keyur Govande [Wed, 7 Jan 2015 22:50:55 +0000 (22:50 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS
Patch commit
d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
5.5.22 now
Conflicts:
configure.in
main/php_version.h
Keyur Govande [Wed, 7 Jan 2015 22:42:28 +0000 (22:42 +0000)]
Add NEWS
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit
d9f85373e32 by moving the float_to_double function to
a header file.
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
Nikita Popov [Wed, 7 Jan 2015 22:21:12 +0000 (23:21 +0100)]
Fix the same leak with %=
Nikita Popov [Wed, 7 Jan 2015 22:13:09 +0000 (23:13 +0100)]
Fix leak for compound shift self-assign error cases
Julien Pauli [Wed, 7 Jan 2015 09:42:53 +0000 (10:42 +0100)]
5.5.22 now
Ferenc Kovacs [Tue, 6 Jan 2015 22:00:11 +0000 (23:00 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
PHP-5.6.6 is next
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Tue, 6 Jan 2015 21:58:22 +0000 (22:58 +0100)]
PHP-5.6.6 is next
Remi Collet [Tue, 6 Jan 2015 10:07:10 +0000 (11:07 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
cleanup old unused typedef
Remi Collet [Tue, 6 Jan 2015 10:06:53 +0000 (11:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
cleanup old unused typedef
Remi Collet [Tue, 6 Jan 2015 10:06:25 +0000 (11:06 +0100)]
cleanup old unused typedef
Adam Harvey [Tue, 6 Jan 2015 01:29:40 +0000 (01:29 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/php_cli_server.c
Adam Harvey [Tue, 6 Jan 2015 01:27:37 +0000 (01:27 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Handle NULL strings in sapi_cli_server_register_variable().
Allow CLI server test scripts to specify the name of the router file.
Conflicts:
sapi/cli/tests/php_cli_server.inc
Adam Harvey [Tue, 6 Jan 2015 01:23:27 +0000 (01:23 +0000)]
Handle NULL strings in sapi_cli_server_register_variable().
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
Adam Harvey [Tue, 6 Jan 2015 01:22:59 +0000 (01:22 +0000)]
Allow CLI server test scripts to specify the name of the router file.
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
Levi Morrison [Tue, 6 Jan 2015 00:27:25 +0000 (17:27 -0700)]
Fix bug #55416
Remove extra, unnecessary warning when the callback fails for
array_map, array_reduce and array_filter
Anatol Belski [Mon, 5 Jan 2015 18:20:33 +0000 (19:20 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix ACLs tests, make it create dir where it has to, not file
Anatol Belski [Mon, 5 Jan 2015 18:20:07 +0000 (19:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix ACLs tests, make it create dir where it has to, not file
Anatol Belski [Mon, 5 Jan 2015 18:19:24 +0000 (19:19 +0100)]
fix ACLs tests, make it create dir where it has to, not file
Anatol Belski [Mon, 5 Jan 2015 18:14:12 +0000 (19:14 +0100)]
fix ACLs setup for tests
Remi Collet [Mon, 5 Jan 2015 16:36:26 +0000 (17:36 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fix bug #68751 listen.allowed_clients is broken
Remi Collet [Mon, 5 Jan 2015 16:35:36 +0000 (17:35 +0100)]
NEWS
Remi Collet [Mon, 5 Jan 2015 16:35:14 +0000 (17:35 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
Remi Collet [Mon, 5 Jan 2015 16:34:45 +0000 (17:34 +0100)]
NEWS
Remi Collet [Mon, 5 Jan 2015 16:33:57 +0000 (17:33 +0100)]
Fix bug #68751 listen.allowed_clients is broken
Nikita Popov [Mon, 5 Jan 2015 16:02:11 +0000 (17:02 +0100)]
Fix uses of zval_add_ref and add comment on usage
zval_add_ref should be used as a copy ctor, after the value was
already copied.
In particular when used with hash insertions, it should be applied
to the return value of the insert function.
Xinchen Hui [Mon, 5 Jan 2015 14:21:56 +0000 (22:21 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 5 Jan 2015 14:20:13 +0000 (22:20 +0800)]
Add test script and use efree_size
Xinchen Hui [Mon, 5 Jan 2015 14:13:22 +0000 (22:13 +0800)]
Revert "Revert "Fix memory leak when dereferencing reference with refcount 1""
This reverts commit
7aab9659ee9c8bc15490d16b4064d64a3846147c .
Matteo Beccati [Mon, 5 Jan 2015 11:12:02 +0000 (12:12 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 11:11:16 +0000 (12:11 +0100)]
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 10:03:50 +0000 (11:03 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #68371
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
Matteo Beccati [Mon, 5 Jan 2015 10:02:52 +0000 (11:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #68371
Matteo Beccati [Mon, 5 Jan 2015 10:01:54 +0000 (11:01 +0100)]
Updated NEWS for #68371
Matteo Beccati [Mon, 5 Jan 2015 10:00:11 +0000 (11:00 +0100)]
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
Matteo Beccati [Mon, 5 Jan 2015 09:48:40 +0000 (10:48 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Matteo Beccati [Mon, 5 Jan 2015 08:54:06 +0000 (09:54 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Matteo Beccati [Mon, 5 Jan 2015 08:25:48 +0000 (09:25 +0100)]
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Xinchen Hui [Mon, 5 Jan 2015 05:26:33 +0000 (00:26 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 5 Jan 2015 05:26:10 +0000 (00:26 -0500)]
Revert "Fix memory leak when dereferencing reference with refcount 1"
This reverts commit
f4cb5cc09d44e6940fecebe52b8013b288ed67c4 .
breaks tests Zend/tests/bug27268.phpt and Zend/tests/bug68262.phpt
Stanislav Malyshev [Mon, 5 Jan 2015 05:08:24 +0000 (21:08 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 05:08:16 +0000 (21:08 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 05:07:57 +0000 (21:07 -0800)]
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 04:55:25 +0000 (20:55 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 04:54:46 +0000 (20:54 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 04:46:40 +0000 (20:46 -0800)]
Merge branch 'pull-request/975' into PHP-5.5
* pull-request/975:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 03:57:46 +0000 (19:57 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:57:29 +0000 (19:57 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:46:33 +0000 (19:46 -0800)]
Merge branch 'pull-request/742' into PHP-5.5
* pull-request/742:
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:45:57 +0000 (19:45 -0800)]
fix GD tests with no GD loaded
Gustavo Frederico Temple Pedrosa [Tue, 16 Dec 2014 19:10:32 +0000 (19:10 +0000)]
Specifying MACRO for ppc64
Add PowerPC64 too, which is capable to access unaligned words.
Chris Christoff [Sat, 6 Dec 2014 01:59:07 +0000 (20:59 -0500)]
Formatting fixes for git rules file
Formatting fixes for git rules file
This commit fixes 2 issues with the git rules
file. First, a typo of "::" has been changed to
":". Second, an extraneous space has been
removed.
Xinchen Hui [Mon, 5 Jan 2015 03:08:35 +0000 (22:08 -0500)]
Still -1 on *BSD now
Xinchen Hui [Mon, 5 Jan 2015 03:04:32 +0000 (22:04 -0500)]
Stanislav Malyshev [Mon, 5 Jan 2015 03:00:05 +0000 (19:00 -0800)]
Merge branch 'pull-request/731'
* pull-request/731:
Set FPM_BACKLOG_DEFAULT to 511
Bob Weinand [Sun, 4 Jan 2015 23:28:53 +0000 (00:28 +0100)]
Fix memory leak when dereferencing reference with refcount 1
Nikita Popov [Sun, 4 Jan 2015 17:07:44 +0000 (18:07 +0100)]
Add missing string cast for non-cv var fetches