]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 10 Jan 2017 22:32:46 +0000 (23:32 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 22 Nov 2016 21:43:23 +0000 (22:43 +0100)]
Add support for "xfail" to phpt SKIPIF sections
If SKIPIF output starts with "xfail" instead of "skip", the test
will be marked as XFAIL with the following message. Example:
--TEST--
Test xfailif feature
--SKIPIF--
<?php
if (some_cond()) die('xfail Expected to fail!');
?>
--FILE--
...
Nikita Popov [Tue, 10 Jan 2017 22:29:50 +0000 (23:29 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:29:16 +0000 (23:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Arnout Boks [Tue, 10 Jan 2017 19:48:45 +0000 (20:48 +0100)]
Fixed #73907 (nextSibling property not included in var_dump of DOMNode)
Nikita Popov [Tue, 10 Jan 2017 22:25:23 +0000 (23:25 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:24:41 +0000 (23:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Arnout Boks [Tue, 10 Jan 2017 20:19:37 +0000 (21:19 +0100)]
Fixed bug #61858 (DOMAttr debug info generates E_WARNING)
It seems fair to remove this warning, given that:
* it is not documented in the official documentation
* the $specified property, which has a similar 'not implemented' status,
also does not trigger a warning
* it apparently hinders quite a lot of people during debugging, judging by
the number of votes on the bug
Nikita Popov [Tue, 10 Jan 2017 22:19:43 +0000 (23:19 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 10 Jan 2017 22:19:30 +0000 (23:19 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 10 Jan 2017 22:19:19 +0000 (23:19 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Mitch Hagstrand [Tue, 10 Jan 2017 19:51:55 +0000 (11:51 -0800)]
Fix glob-wrapper.phpt to not fail in Windows
Rasmus Lerdorf [Tue, 10 Jan 2017 20:18:36 +0000 (15:18 -0500)]
Set a session path for this test
Rasmus Lerdorf [Tue, 10 Jan 2017 20:17:50 +0000 (15:17 -0500)]
Set a session path for this test
Christoph M. Becker [Tue, 10 Jan 2017 19:15:05 +0000 (20:15 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix #73893: A hidden danger of death cycle in a function of gd
# Conflicts:
# ext/gd/libgd/gd_rotate.c
Christoph M. Becker [Tue, 10 Jan 2017 19:12:42 +0000 (20:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #73893: A hidden danger of death cycle in a function of gd
Christoph M. Becker [Tue, 10 Jan 2017 19:08:59 +0000 (20:08 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Missing %s
Christoph M. Becker [Tue, 10 Jan 2017 18:31:33 +0000 (19:31 +0100)]
Fix #73893: A hidden danger of death cycle in a function of gd
We remove the unused, but potentially dangerous functions.
Rasmus Lerdorf [Tue, 10 Jan 2017 18:51:19 +0000 (13:51 -0500)]
Missing %s
Rasmus Lerdorf [Tue, 10 Jan 2017 18:50:49 +0000 (13:50 -0500)]
Missing %s
Christoph M. Becker [Tue, 10 Jan 2017 18:49:54 +0000 (19:49 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Ok, maybe Nikita is right. We should default this on.
Missed one. This needs gc as well
These tests expect gc to be enabled
Rasmus Lerdorf [Tue, 10 Jan 2017 17:17:31 +0000 (12:17 -0500)]
More missing gc inis
Rasmus Lerdorf [Tue, 10 Jan 2017 17:16:45 +0000 (12:16 -0500)]
Ok, maybe Nikita is right. We should default this on.
Rasmus Lerdorf [Tue, 10 Jan 2017 17:08:34 +0000 (12:08 -0500)]
Missed one. This needs gc as well
Rasmus Lerdorf [Tue, 10 Jan 2017 17:07:47 +0000 (12:07 -0500)]
Missed one. This needs gc as well
Rasmus Lerdorf [Tue, 10 Jan 2017 16:57:59 +0000 (11:57 -0500)]
These tests rely on gc being enabled
Rasmus Lerdorf [Tue, 10 Jan 2017 16:54:49 +0000 (11:54 -0500)]
These tests expect gc to be enabled
Joe Watkins [Tue, 10 Jan 2017 13:57:10 +0000 (13:57 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
pull-request/1807: test for dns_get_record
Joe Watkins [Tue, 10 Jan 2017 13:56:49 +0000 (13:56 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
pull-request/1807: test for dns_get_record
Joe Watkins [Tue, 10 Jan 2017 13:56:26 +0000 (13:56 +0000)]
Merge branch 'pull-request/1807' into PHP-7.0
* pull-request/1807:
test for dns_get_record
marcosptf [Sun, 13 Mar 2016 04:29:04 +0000 (01:29 -0300)]
pull-request/1807:
test for dns_get_record
Joe Watkins [Tue, 10 Jan 2017 11:51:56 +0000 (11:51 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Prevent fd leak in readdir_r that causes false negative on readdir_r implementation when compiled with AddressSanitizer
Joe Watkins [Tue, 10 Jan 2017 11:51:39 +0000 (11:51 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Prevent fd leak in readdir_r that causes false negative on readdir_r implementation when compiled with AddressSanitizer
Ondřej Surý [Tue, 10 Jan 2017 09:21:54 +0000 (10:21 +0100)]
Prevent fd leak in readdir_r that causes false negative on readdir_r implementation when compiled with AddressSanitizer
Joe Watkins [Tue, 10 Jan 2017 06:21:14 +0000 (06:21 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed #73902 mention router support in usage output for php-cli
Joe Watkins [Tue, 10 Jan 2017 06:20:56 +0000 (06:20 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #73902 mention router support in usage output for php-cli
Joe Watkins [Tue, 10 Jan 2017 06:19:34 +0000 (06:19 +0000)]
Fixed #73902 mention router support in usage output for php-cli
Sara Golemon [Tue, 10 Jan 2017 00:08:31 +0000 (16:08 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix open_basedir check for glob:// opendir wrapper
Sara Golemon [Tue, 10 Jan 2017 00:08:08 +0000 (16:08 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix open_basedir check for glob:// opendir wrapper
Sara Golemon [Tue, 10 Jan 2017 00:07:33 +0000 (16:07 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix open_basedir check for glob:// opendir wrapper
Nikita Popov [Fri, 30 Dec 2016 21:23:12 +0000 (22:23 +0100)]
Compact literals: Deduplicate empty array literals
Nikita Popov [Mon, 9 Jan 2017 23:09:41 +0000 (00:09 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 9 Jan 2017 23:09:02 +0000 (00:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 9 Jan 2017 23:07:38 +0000 (00:07 +0100)]
Un-XFAIL serialization test
Andy Postnikov [Sat, 10 Dec 2016 20:51:17 +0000 (23:51 +0300)]
Fix ZEND_SIGNED_MULTIPLY_LONG for AArch64
Register operands are required in this context.
Nikita Popov [Mon, 9 Jan 2017 22:30:07 +0000 (23:30 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 9 Jan 2017 22:29:33 +0000 (23:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Leigh [Wed, 23 Dec 2015 21:54:15 +0000 (21:54 +0000)]
Fix check for linux getrandom syscall
Nikita Popov [Mon, 9 Jan 2017 22:23:07 +0000 (23:23 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 9 Jan 2017 22:22:59 +0000 (23:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Mon, 9 Jan 2017 21:10:57 +0000 (13:10 -0800)]
Add print zend string function to gdbinit
Nikita Popov [Mon, 9 Jan 2017 22:21:17 +0000 (23:21 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 9 Jan 2017 22:20:29 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Mon, 9 Jan 2017 19:25:25 +0000 (22:25 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Improved GENERATOR_CREATE opcode handler.
Dmitry Stogov [Mon, 9 Jan 2017 19:24:21 +0000 (22:24 +0300)]
Improved GENERATOR_CREATE opcode handler.
Sara Golemon [Mon, 9 Jan 2017 19:02:50 +0000 (11:02 -0800)]
Fix open_basedir check for glob:// opendir wrapper
php_check_open_basedir() expects a local filesystem path,
but we're handing it a `glob://...` URI instead.
Move the check to after the path trim so that we're checking
a meaningful pathspec.
Joe Watkins [Mon, 9 Jan 2017 17:08:07 +0000 (17:08 +0000)]
Revert "set more suitable defaults for opcache in ini and code"
This reverts commit
b655f2d6325c64e5da1f016a2742a6abf669ecaf .
This has been deemed unsuitable for 7.0
Adam Baratz [Mon, 9 Jan 2017 16:41:54 +0000 (11:41 -0500)]
Remove trailing whitespace
Adam Baratz [Mon, 9 Jan 2017 16:13:13 +0000 (11:13 -0500)]
Explicitly allow NULL values for dblib compatibility
MSSQL won't necessarily default columns to NULL, see:
https://msdn.microsoft.com/en-us/library/ms174979.aspx#Nullability Rules Within a Table Definition
Joe Watkins [Mon, 9 Jan 2017 16:22:01 +0000 (16:22 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update release process notes
Joe Watkins [Mon, 9 Jan 2017 16:21:21 +0000 (16:21 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update release process notes
Joe Watkins [Mon, 9 Jan 2017 16:20:48 +0000 (16:20 +0000)]
update release process notes
Joe Watkins [Mon, 9 Jan 2017 16:00:03 +0000 (16:00 +0000)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Joe Watkins [Mon, 9 Jan 2017 15:59:40 +0000 (15:59 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Joe Watkins [Mon, 9 Jan 2017 15:59:21 +0000 (15:59 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Joe Watkins [Mon, 9 Jan 2017 15:58:22 +0000 (15:58 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix stub to accept user properly
Joe Watkins [Mon, 9 Jan 2017 15:58:09 +0000 (15:58 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix stub to accept user properly
Joe Watkins [Mon, 9 Jan 2017 15:57:46 +0000 (15:57 +0000)]
fix stub to accept user properly
Dmitry Stogov [Mon, 9 Jan 2017 12:13:48 +0000 (15:13 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Dmitry Stogov [Mon, 9 Jan 2017 12:12:22 +0000 (15:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Dmitry Stogov [Mon, 9 Jan 2017 12:11:33 +0000 (15:11 +0300)]
Fixed bug #73896 (spl_autoload() crashes when calls magic _call())
Joe Watkins [Mon, 9 Jan 2017 11:00:37 +0000 (11:00 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
merge PR #2290: enable opcache in CLI in 7.1+
Joe Watkins [Mon, 9 Jan 2017 11:00:05 +0000 (11:00 +0000)]
merge PR #2290: enable opcache in CLI in 7.1+
Joe Watkins [Mon, 9 Jan 2017 10:57:29 +0000 (10:57 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
set more suitable defaults for opcache in ini and code
Joe Watkins [Mon, 9 Jan 2017 10:56:54 +0000 (10:56 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
set more suitable defaults for opcache in ini and code
Joe Watkins [Mon, 9 Jan 2017 10:54:57 +0000 (10:54 +0000)]
Merge branch 'pull-request/2291' into PHP-7.0
* pull-request/2291:
set more suitable defaults for opcache in ini and code
Markus Staab [Mon, 9 Jan 2017 10:33:05 +0000 (11:33 +0100)]
set more suitable defaults for opcache in ini and code
Xinchen Hui [Mon, 9 Jan 2017 08:30:55 +0000 (16:30 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
Xinchen Hui [Mon, 9 Jan 2017 08:30:48 +0000 (16:30 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
Xinchen Hui [Mon, 9 Jan 2017 08:30:00 +0000 (16:30 +0800)]
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
Joe Watkins [Mon, 9 Jan 2017 05:33:22 +0000 (05:33 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72979 money_format stores wrong length on AIX
Joe Watkins [Mon, 9 Jan 2017 05:32:22 +0000 (05:32 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72979 money_format stores wrong length on AIX
Joe Watkins [Mon, 9 Jan 2017 05:31:41 +0000 (05:31 +0000)]
Fixed bug #72979 money_format stores wrong length on AIX
Joe Watkins [Mon, 9 Jan 2017 05:25:31 +0000 (05:25 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update ip2long_varation2 test to skip for AIX, see bug #72973
Joe Watkins [Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update ip2long_varation2 test to skip for AIX, see bug #72973
Joe Watkins [Mon, 9 Jan 2017 05:24:44 +0000 (05:24 +0000)]
update ip2long_varation2 test to skip for AIX, see bug #72973
Joe Watkins [Mon, 9 Jan 2017 05:21:29 +0000 (05:21 +0000)]
[ci skip] news entry for #72974
Joe Watkins [Mon, 9 Jan 2017 05:20:42 +0000 (05:20 +0000)]
[ci skip] news entry for issue #72974
Joe Watkins [Mon, 9 Jan 2017 05:15:48 +0000 (05:15 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed #72974 imap is undefined service on AIX
Joe Watkins [Mon, 9 Jan 2017 05:15:34 +0000 (05:15 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #72974 imap is undefined service on AIX
Joe Watkins [Mon, 9 Jan 2017 05:13:46 +0000 (05:13 +0000)]
Fixed #72974 imap is undefined service on AIX
Joe Watkins [Mon, 9 Jan 2017 00:37:24 +0000 (00:37 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix FTP tests for Travis CI.
Joe Watkins [Mon, 9 Jan 2017 00:36:57 +0000 (00:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix FTP tests for Travis CI.
Mitch Hagstrand [Sun, 8 Jan 2017 21:25:46 +0000 (13:25 -0800)]
Fix FTP tests for Travis CI.
This suppresses the errors from stream_socket_server() until
server.inc will not make anymore attempts.
Anatol Belski [Sun, 8 Jan 2017 23:01:19 +0000 (00:01 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve and generalize the recognition of a cli sapi
Anatol Belski [Sun, 8 Jan 2017 22:54:58 +0000 (23:54 +0100)]
improve and generalize the recognition of a cli sapi
Joe Watkins [Sun, 8 Jan 2017 21:05:36 +0000 (21:05 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Use proper file extension for the README
Joe Watkins [Sun, 8 Jan 2017 21:05:24 +0000 (21:05 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use proper file extension for the README
Markus Staab [Sun, 8 Jan 2017 21:02:50 +0000 (22:02 +0100)]
Use proper file extension for the README
Joe Watkins [Sun, 8 Jan 2017 20:28:22 +0000 (20:28 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix 404 links in Litespeed README - Bug 73890