]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 29 Sep 2016 07:57:39 +0000 (10:57 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Dmitry Stogov [Thu, 29 Sep 2016 07:57:09 +0000 (10:57 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Dmitry Stogov [Thu, 29 Sep 2016 07:56:01 +0000 (10:56 +0300)]
Better fix for bug #72854 (avoid extra copy and creating reference to stack variable)
Ferenc Kovacs [Wed, 28 Sep 2016 23:02:20 +0000 (01:02 +0200)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Wed, 28 Sep 2016 22:59:50 +0000 (00:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 28 Sep 2016 22:58:02 +0000 (00:58 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 28 Sep 2016 22:55:36 +0000 (00:55 +0200)]
5.6.28 is next
Derick Rethans [Wed, 28 Sep 2016 22:30:29 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:29 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:28 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:28 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:27 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Derick Rethans [Wed, 28 Sep 2016 22:30:27 +0000 (23:30 +0100)]
Empty merge
Derick Rethans [Wed, 28 Sep 2016 22:30:26 +0000 (23:30 +0100)]
Updated to version 2016.7 (2016g)
Nikita Popov [Wed, 28 Sep 2016 21:23:01 +0000 (23:23 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 28 Sep 2016 21:12:45 +0000 (23:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 28 Sep 2016 21:11:02 +0000 (23:11 +0200)]
Handle resource keys in constexpr arrays
Nikita Popov [Wed, 28 Sep 2016 21:05:21 +0000 (23:05 +0200)]
Fix the constant array case as well
Nikita Popov [Wed, 28 Sep 2016 20:39:17 +0000 (22:39 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 20:38:47 +0000 (22:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 28 Sep 2016 20:36:36 +0000 (22:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 28 Sep 2016 20:33:40 +0000 (22:33 +0200)]
Check next_index_insert failure in ADD_ARRAY_ELEMENT
Davey Shafik [Wed, 28 Sep 2016 20:02:02 +0000 (13:02 -0700)]
Prepare to Re-roll 7.1.0RC3
Nikita Popov [Wed, 28 Sep 2016 19:43:58 +0000 (21:43 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 19:41:56 +0000 (21:41 +0200)]
Combine code for keyed/unkeyed list()
Nikita Popov [Wed, 28 Sep 2016 19:31:06 +0000 (21:31 +0200)]
Fix segfault when empty entry in keyed array assignment
Anatol Belski [Wed, 28 Sep 2016 19:30:59 +0000 (21:30 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix exports which are now referenced by phpdbg
Update UPGRADING to reflect new reality
Update NEWS for 7.1.0RC4
Update NEWS
Anatol Belski [Wed, 28 Sep 2016 18:06:10 +0000 (20:06 +0200)]
fix exports which are now referenced by phpdbg
(cherry picked from commit
cd0f1c8a5ed6d4e677dbf891fc69326e5b05cccc )
Davey Shafik [Wed, 28 Sep 2016 18:23:31 +0000 (11:23 -0700)]
Update UPGRADING to reflect new reality
Davey Shafik [Wed, 28 Sep 2016 18:07:19 +0000 (18:07 +0000)]
Update NEWS for 7.1.0RC4
Anatol Belski [Wed, 28 Sep 2016 18:06:10 +0000 (20:06 +0200)]
fix exports which are now referenced by phpdbg
Davey Shafik [Wed, 28 Sep 2016 17:31:22 +0000 (10:31 -0700)]
Update NEWS
Nikita Popov [Wed, 28 Sep 2016 17:23:09 +0000 (19:23 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 27 Sep 2016 17:26:50 +0000 (19:26 +0200)]
Don't mark ReflectionType::__toString() as deprecated for now
Nikita Popov [Wed, 21 Sep 2016 19:36:09 +0000 (21:36 +0200)]
Revert ReflectionType::__toString() behavior + deprecate
Nikita Popov [Wed, 28 Sep 2016 17:20:30 +0000 (19:20 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 28 Sep 2016 17:19:31 +0000 (19:19 +0200)]
Ensure symtable exists before checking it
Bob Weinand [Wed, 28 Sep 2016 11:26:49 +0000 (13:26 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 28 Sep 2016 11:26:08 +0000 (13:26 +0200)]
Add phpdbg generator command
Nikita Popov [Tue, 27 Sep 2016 17:49:01 +0000 (19:49 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 27 Sep 2016 17:48:35 +0000 (19:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 27 Sep 2016 17:47:48 +0000 (19:47 +0200)]
Fix bug #73181
Anatol Belski [Tue, 27 Sep 2016 10:51:56 +0000 (12:51 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
prepare next
Anatol Belski [Tue, 27 Sep 2016 10:51:24 +0000 (12:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepare next
Anatol Belski [Tue, 27 Sep 2016 10:49:52 +0000 (12:49 +0200)]
prepare next
Adam Baratz [Mon, 26 Sep 2016 21:14:51 +0000 (17:14 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Ignore potentially misleading dberr values
Adam Baratz [Mon, 26 Sep 2016 21:13:50 +0000 (17:13 -0400)]
update NEWS
Adam Baratz [Mon, 26 Sep 2016 21:13:14 +0000 (17:13 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Ignore potentially misleading dberr values
Adam Baratz [Mon, 26 Sep 2016 21:09:11 +0000 (17:09 -0400)]
update NEWS
Chris Kings-Lynne [Fri, 13 Sep 2013 06:09:08 +0000 (14:09 +0800)]
Ignore potentially misleading dberr values
FreeTDS had a buggy behavior where it would pass invalid values:
https://sourceforge.net/p/freetds/bugs/59/
The fix for this issue --
bc22b2ef817fb5d102bd758111ff3634b39a1319 on their
repo -- was to always use SYBESMSG for dberr. This makes it so the existing
pdo_dblib code would work as is. But by ignoring the dberr value in this
function, it will behave correctly, even with older versions of FreeTDS.
Anatol Belski [Mon, 26 Sep 2016 17:56:12 +0000 (19:56 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Anatol Belski [Mon, 26 Sep 2016 17:55:43 +0000 (19:55 +0200)]
update NEWS
Anatol Belski [Mon, 26 Sep 2016 17:55:05 +0000 (19:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 26 Sep 2016 17:54:10 +0000 (19:54 +0200)]
update NEWS
Anatol Belski [Mon, 26 Sep 2016 16:55:20 +0000 (18:55 +0200)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Mon, 26 Sep 2016 16:55:08 +0000 (18:55 +0200)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Anatol Belski [Mon, 26 Sep 2016 16:54:43 +0000 (18:54 +0200)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Anatol Belski [Mon, 26 Sep 2016 16:50:06 +0000 (18:50 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73172 parse error: Invalid numeric literal
Anatol Belski [Mon, 26 Sep 2016 16:49:40 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73172 parse error: Invalid numeric literal
Anatol Belski [Mon, 26 Sep 2016 16:47:30 +0000 (18:47 +0200)]
Fixed bug #73172 parse error: Invalid numeric literal
Christoph M. Becker [Mon, 26 Sep 2016 16:45:53 +0000 (18:45 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 26 Sep 2016 16:45:05 +0000 (18:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 26 Sep 2016 16:16:50 +0000 (18:16 +0200)]
Fix #53745: cgi.discard_path option is missing from php.ini
Also cgi.check_shebang_line has been missing.
Dmitry Stogov [Mon, 26 Sep 2016 14:44:28 +0000 (17:44 +0300)]
Expose information about calls to "fake" closures (created through ReflectionFunction::getClosure), to allow extra specialization of RETRUN opcode handler.
Anatol Belski [Mon, 26 Sep 2016 13:42:56 +0000 (15:42 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update libs_versions.txt
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:42:32 +0000 (15:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs_versions.txt
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:41:41 +0000 (15:41 +0200)]
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:41:16 +0000 (15:41 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs_versions.txt
Anatol Belski [Mon, 26 Sep 2016 13:39:01 +0000 (15:39 +0200)]
update libs_versions.txt
Dmitry Stogov [Mon, 26 Sep 2016 13:17:39 +0000 (16:17 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Revert "update NEWS"
Dmitry Stogov [Mon, 26 Sep 2016 13:16:59 +0000 (16:16 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.
Dmitry Stogov [Mon, 26 Sep 2016 13:16:07 +0000 (16:16 +0300)]
On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.
Adam Baratz [Mon, 26 Sep 2016 13:15:59 +0000 (09:15 -0400)]
Revert "update NEWS"
This reverts commit
fdbc673f8cf8d81847f3eb11e1e7520c77ed09d8 .
These changes were applied to earlier versions so these notes shouldn't have
been added here.
Dmitry Stogov [Mon, 26 Sep 2016 11:18:59 +0000 (14:18 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73156 (segfault on undefined function)
Dmitry Stogov [Mon, 26 Sep 2016 11:17:27 +0000 (14:17 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73156 (segfault on undefined function)
Dmitry Stogov [Mon, 26 Sep 2016 11:14:57 +0000 (14:14 +0300)]
Fixed bug #73156 (segfault on undefined function)
Anatol Belski [Sun, 25 Sep 2016 18:58:09 +0000 (20:58 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add an include path for freetype which is relevant for cmake builds
Anatol Belski [Sun, 25 Sep 2016 18:57:30 +0000 (20:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add an include path for freetype which is relevant for cmake builds
Anatol Belski [Sun, 25 Sep 2016 18:55:13 +0000 (20:55 +0200)]
Add an include path for freetype which is relevant for cmake builds
Nikita Popov [Sun, 25 Sep 2016 10:39:33 +0000 (12:39 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 25 Sep 2016 10:30:32 +0000 (12:30 +0200)]
Use SEND_USER for CONST|TMP as well
Otherwise we're missing the "expected to be a reference, value
given" warning that appears for ordinary calls to call_user_func().
Also update an UPGRADING note with recent changes wrt
call_user_func().
Christoph M. Becker [Sun, 25 Sep 2016 07:47:23 +0000 (09:47 +0200)]
Refactor imagegammacorrect()
We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b
and positive r,s, so a single pow() suffices. Furthermore, we precompute the
gamma, so the refactored code is simpler and faster.
Christoph M. Becker [Sun, 25 Sep 2016 08:57:23 +0000 (10:57 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sun, 25 Sep 2016 08:49:43 +0000 (10:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 25 Sep 2016 08:46:44 +0000 (10:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 25 Sep 2016 08:30:48 +0000 (10:30 +0200)]
Fix test_image_equals_file() wrt. palette images
The recently introduced test_image_equals_file() doesn't properly work for
palette images, because in this case only the palette indexes are compared,
what can lead to false positives and negatives as shown in the added test.
To fix that we convert palette images to truecolor, what is supposed to be
faster than calling imagecolorsforindex() for each pixel.
We furthermore rely on PHP's refcounting to free unused images; after all,
this is not C.
Nikita Popov [Sat, 24 Sep 2016 20:46:43 +0000 (22:46 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 24 Sep 2016 19:26:17 +0000 (21:26 +0200)]
Fix a couple of ASSIGN_DIM/OBJ inference bugs
Account for possible null return values better.
Nikita Popov [Sat, 24 Sep 2016 19:03:13 +0000 (21:03 +0200)]
Add range inference for ZEND_STRLEN
On 32-bit systems we conservatively allow negative lengths.
On 64-bit systems, the range could additionally be restricted to
the canonical 48-bit size.
Christoph M. Becker [Sat, 24 Sep 2016 16:22:43 +0000 (18:22 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 24 Sep 2016 16:18:34 +0000 (18:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 16:05:21 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 15:52:15 +0000 (17:52 +0200)]
Merge branch 'pull-request/2120' into PHP-5.6
Christoph M. Becker [Sat, 24 Sep 2016 13:35:32 +0000 (15:35 +0200)]
Merge branch 'pull-request/2026'
Christoph M. Becker [Sat, 24 Sep 2016 12:44:57 +0000 (14:44 +0200)]
Don't enforce palette conversion when writing GD images
The GD image format is able to handle truecolor images as of libgd 2.0.12
(<https://github.com/libgd/libgd/blob/gd-2.2.3/src/gd_gd.c#L31-L33>).
Therefore we don't need the potentially lossy and time consuming palette
conversion.
This way, imagegd() can also be used to export raw truecolor image data.
Nikita Popov [Sat, 24 Sep 2016 11:23:54 +0000 (13:23 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 24 Sep 2016 11:22:00 +0000 (13:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 24 Sep 2016 11:18:43 +0000 (13:18 +0200)]
Fixed bug #73163