]>
granicus.if.org Git - php/log
Joe Watkins [Wed, 11 Jan 2017 08:10:58 +0000 (08:10 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #71219 configure script incorrectly checks for ttyname_r
Joe Watkins [Wed, 11 Jan 2017 08:09:55 +0000 (08:09 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #71219 configure script incorrectly checks for ttyname_r
Joe Watkins [Wed, 11 Jan 2017 08:09:10 +0000 (08:09 +0000)]
Fixed bug #71219 configure script incorrectly checks for ttyname_r
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
Joe Watkins [Sun, 8 Jan 2017 20:28:05 +0000 (20:28 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix 404 links in Litespeed README - Bug 73890
Peter Kokot [Sun, 8 Jan 2017 20:24:25 +0000 (21:24 +0100)]
Fix 404 links in Litespeed README - Bug 73890
Anatol Belski [Sun, 8 Jan 2017 19:16:44 +0000 (20:16 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Anatol Belski [Sun, 8 Jan 2017 19:13:27 +0000 (20:13 +0100)]
update NEWS
Anatol Belski [Sun, 8 Jan 2017 19:12:53 +0000 (20:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Sun, 8 Jan 2017 19:07:16 +0000 (20:07 +0100)]
update NEWS
Joe Watkins [Sun, 8 Jan 2017 19:03:33 +0000 (19:03 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve FPM tests (mostly for systemd build)
Joe Watkins [Sun, 8 Jan 2017 19:03:10 +0000 (19:03 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve FPM tests (mostly for systemd build)
Remi Collet [Sun, 8 Jan 2017 18:55:30 +0000 (19:55 +0100)]
improve FPM tests (mostly for systemd build)
Anatol Belski [Sun, 8 Jan 2017 17:56:05 +0000 (18:56 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
[ast] Fix exporting **= in expansion of assign op
Anatol Belski [Sun, 8 Jan 2017 17:54:28 +0000 (18:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ast] Fix exporting **= in expansion of assign op
Sara Golemon [Sat, 6 Aug 2016 22:12:09 +0000 (15:12 -0700)]
[ast] Fix exporting **= in expansion of assign op
(cherry picked from commit
9c3865eb6a72a6f369ba524c5a87b4896a3a9acb )
Nikita Popov [Sun, 8 Jan 2017 12:48:54 +0000 (13:48 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 8 Jan 2017 12:48:48 +0000 (13:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 8 Jan 2017 12:47:20 +0000 (13:47 +0100)]
deflate_add(): Don't add unnecessary +1 to size
zend_string_realloc will do this by itself.
Nikita Popov [Sun, 8 Jan 2017 11:00:58 +0000 (12:00 +0100)]
Add test for buf #65251
Anatol Belski [Sun, 8 Jan 2017 00:23:51 +0000 (01:23 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Anatol Belski [Sun, 8 Jan 2017 00:22:00 +0000 (01:22 +0100)]
update NEWS
Anatol Belski [Sat, 7 Jan 2017 23:39:53 +0000 (00:39 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
move various places to the centralized OpenSSL setup routine
use the new API for opaque symbol in OpenSSL 1.1.x
implement basic config support for OpenSSL 1.1.x
Anatol Belski [Sat, 7 Jan 2017 23:17:31 +0000 (00:17 +0100)]
move various places to the centralized OpenSSL setup routine
Anatol Belski [Sat, 7 Jan 2017 23:07:54 +0000 (00:07 +0100)]
use the new API for opaque symbol in OpenSSL 1.1.x
Anatol Belski [Sat, 7 Jan 2017 22:47:04 +0000 (23:47 +0100)]
implement basic config support for OpenSSL 1.1.x
Nikita Popov [Sat, 7 Jan 2017 23:02:42 +0000 (00:02 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 7 Jan 2017 23:02:33 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1