]>
granicus.if.org Git - php/log
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: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 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:50:49 +0000 (13:50 -0500)]
Missing %s
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:07:47 +0000 (12:07 -0500)]
Missed one. This needs gc as well
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: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: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: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: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 [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
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: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:20:29 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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
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 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: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: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:05 +0000 (11:00 +0000)]
merge PR #2290: enable opcache in CLI in 7.1+
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: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: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: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:20:42 +0000 (05:20 +0000)]
[ci skip] news entry for issue #72974
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: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 22:54:58 +0000 (23:54 +0100)]
improve and generalize the recognition of a cli sapi
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: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: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: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: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: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.
Anatol Belski [Sun, 8 Jan 2017 00:22:00 +0000 (01:22 +0100)]
update NEWS
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:33 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 7 Jan 2017 23:01:05 +0000 (00:01 +0100)]
Fix OOB read introduced by previous commit
Ooops...
Nikita Popov [Sat, 7 Jan 2017 22:55:20 +0000 (23:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Rowan Collins [Wed, 30 Mar 2016 22:12:03 +0000 (22:12 +0000)]
http_fopen_wrapper.c - Handle HTTP headers with varying white space
The stream handler assumed all HTTP headers contained exactly one space,
but the standard says there may be zero or more. Should fix Bug #47021,
and any other edge cases caused by a web server sending unusual spacing,
e.g. the MIME type discovered from Content-Type: can no longer contain
leading whitespace.
We strip trailing whitespace from the headers added into
$http_response_header as well.
Nikita Popov [Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 7 Jan 2017 21:51:18 +0000 (22:51 +0100)]
Fixed bug #67583
As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.
Nikita Popov [Sat, 7 Jan 2017 21:42:45 +0000 (22:42 +0100)]
Rename fcgi_request.closed to .ended
"closed" refers to whether FCGI_END_REQUEST has been sent, while
the "close" operation does something entirely different. It gets
extra confusing when fcgi_is_closed() does not actually return
fcgi_request.closed...
Joe Watkins [Sat, 7 Jan 2017 16:46:01 +0000 (16:46 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Adapts the readme to the new test-possibility
Joe Watkins [Sat, 7 Jan 2017 16:45:33 +0000 (16:45 +0000)]
Merge branch '1391' into PHP-7.0
* 1391:
Adapts the readme to the new test-possibility
Andreas Heigl [Mon, 6 Jul 2015 08:54:07 +0000 (10:54 +0200)]
Adapts the readme to the new test-possibility
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
Anatol Belski [Sat, 7 Jan 2017 14:40:00 +0000 (15:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Implement github PR #1736
Anatol Belski [Sat, 7 Jan 2017 14:36:14 +0000 (15:36 +0100)]
Implement github PR #1736
This fixes leak issues on *BSD systems, as described in the PR.
Anatol Belski [Sat, 7 Jan 2017 11:46:45 +0000 (12:46 +0100)]
update UPGRADING
Anatol Belski [Sat, 7 Jan 2017 11:44:56 +0000 (12:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix wrong version
extend UPGRADING
Anatol Belski [Sat, 7 Jan 2017 11:43:56 +0000 (12:43 +0100)]
fix wrong version
Anatol Belski [Sat, 7 Jan 2017 11:43:19 +0000 (12:43 +0100)]
extend UPGRADING
Anatol Belski [Sat, 7 Jan 2017 11:36:09 +0000 (12:36 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add 'e' flag for fopen() to enable CLOEXEC
Evgeniy Makhrov [Fri, 2 Oct 2015 19:51:58 +0000 (22:51 +0300)]
add 'e' flag for fopen() to enable CLOEXEC
Joe Watkins [Sat, 7 Jan 2017 10:15:15 +0000 (10:15 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix memleaks from #1755 and some pre-existing ones
Joe Watkins [Sat, 7 Jan 2017 10:14:36 +0000 (10:14 +0000)]
Merge branch 'pull-request/2283' into PHP-7.0
* pull-request/2283:
Fix memleaks from #1755 and some pre-existing ones
Leigh [Sat, 7 Jan 2017 09:43:05 +0000 (09:43 +0000)]
Remove superfluous variable reinit
Joe Watkins [Sat, 7 Jan 2017 08:08:09 +0000 (08:08 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
PR #2211 don't supress warnings in tests
Joe Watkins [Sat, 7 Jan 2017 08:07:17 +0000 (08:07 +0000)]
Merge branch '2211' into PHP-7.0
* pull-request/2211:
PR #2211 don't supress warnings in DOM tests
Craig Duncan [Sun, 20 Nov 2016 16:43:46 +0000 (16:43 +0000)]
PR #2211 don't supress warnings in tests
Joe Watkins [Sat, 7 Jan 2017 07:10:46 +0000 (07:10 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixes for session and fpm tests in PHP7.0 branch
Joe Watkins [Sat, 7 Jan 2017 07:10:23 +0000 (07:10 +0000)]
Merge branch 'pull-request/2284' into PHP-7.0
* pull-request/2284:
Fixes for session and fpm tests in PHP7.0 branch
Mitch Hagstrand [Sat, 7 Jan 2017 03:55:31 +0000 (19:55 -0800)]
Fixes for session and fpm tests in PHP7.0 branch
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
Anatol Belski [Sat, 7 Jan 2017 01:48:14 +0000 (02:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
/guard is also a security flag
Anatol Belski [Sat, 7 Jan 2017 01:25:00 +0000 (02:25 +0100)]
/guard is also a security flag
Anatol Belski [Sat, 7 Jan 2017 01:05:37 +0000 (02:05 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
Mitch Hagstrand [Fri, 6 Jan 2017 21:58:50 +0000 (13:58 -0800)]
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
This reverts commit
e55e93a1e335bec39b7edb28f0b8470fa974f4e3 .
This change should only apply to master. Not PHP-7.0 or PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 00:15:49 +0000 (01:15 +0100)]
fix edge case leak
Anatol Belski [Sat, 7 Jan 2017 00:09:17 +0000 (01:09 +0100)]
Fixed bug #73877 readlink() returns garbage for UTF-8 paths