]>
granicus.if.org Git - php/log
Nikita Popov [Sun, 18 Dec 2016 19:41:44 +0000 (20:41 +0100)]
Sync smart_string implementation with smart_str
Switch to using inline functions instead of macros, etc.
Nikita Popov [Sun, 18 Dec 2016 19:04:38 +0000 (20:04 +0100)]
Move smart_string to Zend
smart_str is already in Zend.
Nikita Popov [Sun, 1 Jan 2017 20:13:41 +0000 (21:13 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 1 Jan 2017 18:24:41 +0000 (19:24 +0100)]
Fixed bug #73154
The object that is being serialized may be destroyed during the
execution of __sleep(), so operate on a copy instead.
Nikita Popov [Sun, 1 Jan 2017 20:09:27 +0000 (21:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 27 Dec 2016 21:44:46 +0000 (22:44 +0100)]
Flush stderr on win32 in cli_log_message
This allows us to unfork a bunch of tests for Windows.
Nikita Popov [Sun, 1 Jan 2017 18:25:52 +0000 (19:25 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 1 Jan 2017 18:24:41 +0000 (19:24 +0100)]
Fixed bug #73154
The object that is being serialized may be destroyed during the
execution of __sleep(), so operate on a copy instead.
Joe Watkins [Sun, 1 Jan 2017 16:17:03 +0000 (16:17 +0000)]
fix test
Joe Watkins [Sun, 1 Jan 2017 15:48:38 +0000 (15:48 +0000)]
news entry for PR #2117
Joe Watkins [Sun, 1 Jan 2017 15:47:36 +0000 (15:47 +0000)]
Merge branch 'pull-request/2117'
* pull-request/2117:
Allow to configure php-fpm slow log trace callers limit
Joe Watkins [Sun, 1 Jan 2017 14:42:33 +0000 (14:42 +0000)]
add news entry for PR #1414
Joe Watkins [Sun, 1 Jan 2017 14:41:20 +0000 (14:41 +0000)]
news entry for PR #1414
Joe Watkins [Sun, 1 Jan 2017 14:40:20 +0000 (14:40 +0000)]
Merge branch 'PHP-7.1'
* Add subject to mail.log
Joe Watkins [Sun, 1 Jan 2017 14:39:35 +0000 (14:39 +0000)]
Merge branch 'pull-request/1414' into PHP-7.1
* Add subject to mail.log
Nikita Popov [Sun, 1 Jan 2017 13:14:00 +0000 (14:14 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 1 Jan 2017 13:13:29 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 1 Jan 2017 13:12:26 +0000 (14:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sun, 1 Jan 2017 13:10:49 +0000 (14:10 +0100)]
FIx bug #70213
Nikita Popov [Sun, 1 Jan 2017 11:20:52 +0000 (12:20 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 1 Jan 2017 11:20:46 +0000 (12:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
dreamszhu [Sun, 1 Jan 2017 09:10:28 +0000 (17:10 +0800)]
Fix dom class can't be inherited by the internal class
Nikita Popov [Sun, 1 Jan 2017 11:17:01 +0000 (12:17 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 1 Jan 2017 11:15:52 +0000 (12:15 +0100)]
Fix year dependent test
Joe Watkins [Sun, 1 Jan 2017 06:53:44 +0000 (06:53 +0000)]
Revert "add news entry for PR #2263"
This reverts commit
a9aefe5b9bed3cf5236d89140a8d71cceafe683e .
Joe Watkins [Sun, 1 Jan 2017 06:53:29 +0000 (06:53 +0000)]
Revert "Merge branch 'PHP-7.1'"
This reverts commit
7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b , reversing
changes made to
15b80f105cdb9a9210edd9dff7109f0951c843f4 .
Joe Watkins [Sun, 1 Jan 2017 06:52:59 +0000 (06:52 +0000)]
Revert "news entry for PR #2263"
This reverts commit
299e02c82a1d4626e209f978001bba6d66885c05 .
Joe Watkins [Sun, 1 Jan 2017 06:52:41 +0000 (06:52 +0000)]
Revert "Fix dom class can't be inherited by the internal class"
This reverts commit
705f60e481b891d009ec9bb4c88390545ff95880 .
Joe Watkins [Sun, 1 Jan 2017 06:50:37 +0000 (06:50 +0000)]
add news entry for PR #2263
Joe Watkins [Sun, 1 Jan 2017 06:49:42 +0000 (06:49 +0000)]
news entry for PR #2263
Joe Watkins [Sun, 1 Jan 2017 06:48:24 +0000 (06:48 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix dom class can't be inherited by the internal class
dreamszhu [Sun, 1 Jan 2017 01:45:09 +0000 (09:45 +0800)]
Fix dom class can't be inherited by the internal class
Joe Watkins [Sun, 1 Jan 2017 06:44:14 +0000 (06:44 +0000)]
Merge branch 'pull-request/2261'
* pull-request/2261:
Add PHPAPI php_session_flush and php_session_destroy
dreamszhu [Sat, 31 Dec 2016 23:30:22 +0000 (07:30 +0800)]
Add PHPAPI php_session_flush and php_session_destroy
Sara Golemon [Sat, 31 Dec 2016 16:59:49 +0000 (08:59 -0800)]
Use new param API in pdo_sqlite
Sara Golemon [Sat, 31 Dec 2016 16:56:15 +0000 (08:56 -0800)]
Use new param API in tokenizer
Sara Golemon [Sat, 31 Dec 2016 16:45:54 +0000 (08:45 -0800)]
Use new param API in PDO
Sara Golemon [Sat, 31 Dec 2016 16:38:14 +0000 (08:38 -0800)]
Use new param API in libxml
Sara Golemon [Sat, 31 Dec 2016 16:35:07 +0000 (08:35 -0800)]
Use new param API in json
Joe Watkins [Sat, 31 Dec 2016 13:55:17 +0000 (13:55 +0000)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix bug #73847
Joe Watkins [Sat, 31 Dec 2016 13:54:54 +0000 (13:54 +0000)]
Merge branch 'pull-request/2260'
* pull-request/2260:
Add PHPAPI for session class entry and related entries
Nikita Popov [Sat, 31 Dec 2016 12:34:09 +0000 (13:34 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 31 Dec 2016 12:33:21 +0000 (13:33 +0100)]
Fix bug #73847
dreamszhu [Sat, 31 Dec 2016 10:03:58 +0000 (18:03 +0800)]
Add PHPAPI for session class entry
Joe Watkins [Sat, 31 Dec 2016 08:35:50 +0000 (08:35 +0000)]
Merge branch 'pull-request/2264'
* pull-request/2264:
Fix header_remove function, the name parameter is optional
Mitch Hagstrand [Sat, 31 Dec 2016 03:13:46 +0000 (19:13 -0800)]
Fix header_remove function, the name parameter is optional
Sara Golemon [Sat, 31 Dec 2016 02:03:33 +0000 (18:03 -0800)]
Use new param API in standard
Sara Golemon [Sat, 31 Dec 2016 01:52:31 +0000 (17:52 -0800)]
Use new param API in standard/file
Sara Golemon [Sat, 31 Dec 2016 01:09:35 +0000 (17:09 -0800)]
Use new param API in standard
Sara Golemon [Sat, 31 Dec 2016 00:40:45 +0000 (16:40 -0800)]
Use new param API in standard/string
Sara Golemon [Sat, 31 Dec 2016 00:06:20 +0000 (16:06 -0800)]
Use new param API in standard/basic_functions
Sara Golemon [Fri, 30 Dec 2016 21:21:11 +0000 (13:21 -0800)]
Use new param API in standard
Sara Golemon [Fri, 30 Dec 2016 21:05:51 +0000 (13:05 -0800)]
Use new param API in standard
Sara Golemon [Fri, 30 Dec 2016 21:02:59 +0000 (13:02 -0800)]
Use new param API in standard/math
Sara Golemon [Fri, 30 Dec 2016 20:32:48 +0000 (12:32 -0800)]
Use new param API in standard
Adam Harvey [Fri, 30 Dec 2016 19:42:12 +0000 (11:42 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Document the changes to lexical scoping in 7.1.
Adam Harvey [Fri, 30 Dec 2016 19:39:45 +0000 (11:39 -0800)]
Document the changes to lexical scoping in 7.1.
Fixes bug #73844 (Cannot use lexical variable $variable as a parameter
name inside array_walk()).
Sara Golemon [Fri, 30 Dec 2016 18:32:03 +0000 (10:32 -0800)]
Use new param API in standard/array
Sara Golemon [Fri, 30 Dec 2016 16:54:55 +0000 (08:54 -0800)]
Use new param API in standard
Christoph M. Becker [Fri, 30 Dec 2016 13:18:31 +0000 (14:18 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update UPGRADING wrt. bug #72785
Christoph M. Becker [Fri, 30 Dec 2016 13:17:38 +0000 (14:17 +0100)]
Update UPGRADING wrt. bug #72785
Christoph M. Becker [Fri, 30 Dec 2016 12:56:34 +0000 (13:56 +0100)]
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
Another try at making concat_003 more reliable
Fix flaky openssl_pkey_new test
Make Opcache tests using the cli server more reliable
Sara Golemon [Fri, 30 Dec 2016 05:27:08 +0000 (21:27 -0800)]
Use new param API in standard/streamsfuncs
Sara Golemon [Wed, 28 Dec 2016 19:18:46 +0000 (11:18 -0800)]
Use new params API for throwable constructors in date
Sara Golemon [Wed, 28 Dec 2016 19:14:43 +0000 (11:14 -0800)]
Support ZEND_PARSE_PARAMS_THROW in new ZPP API
Nikita Popov [Thu, 29 Dec 2016 21:07:03 +0000 (22:07 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 29 Dec 2016 21:05:38 +0000 (22:05 +0100)]
Don't check for precise length in ecc.phpt
Again, this can be off by one.
Nikita Popov [Thu, 29 Dec 2016 20:41:28 +0000 (21:41 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 29 Dec 2016 20:41:21 +0000 (21:41 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 29 Dec 2016 20:39:40 +0000 (21:39 +0100)]
Another try at making concat_003 more reliable
Use array_fill() for the array population loop -- this isn't the
part that is being tested and on PHP 7.0 w/o opcache this duplicates
the inner array a lot.
Nikita Popov [Thu, 29 Dec 2016 20:18:58 +0000 (21:18 +0100)]
Merge branch 'PHP-7.1'
David Walker [Mon, 19 Dec 2016 21:29:18 +0000 (14:29 -0700)]
Fixed bug #73783
Bug #73783 raises an issue with signal handling when using SIG_IGN.
With PHP7.1 ZEND_SIGNALS is defaulted to on, which will for all
signals set the handler as zend_signal_handler_defer. This is
problematic for syscalls like sleep(), which will only return when the
requisite number of seconds have elapsed, or, a non-ignored signal is
raised. In this case we want to SIG_IGN SIGCHLD, however, SIG_IGN is
only stored in the SIGG(handlers) array, and the actual system level
handler is defined. This prevents proper signal ignoring when requeted.
Nikita Popov [Thu, 29 Dec 2016 20:00:34 +0000 (21:00 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 29 Dec 2016 20:00:14 +0000 (21:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 29 Dec 2016 19:59:28 +0000 (20:59 +0100)]
Fix flaky openssl_pkey_new test
Public key size may vary by one bit... switch to using %d for
key sizes.
Mitch Hagstrand [Thu, 29 Dec 2016 03:29:36 +0000 (19:29 -0800)]
Make Opcache tests using the cli server more reliable
Same fix already applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc
1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
Christoph M. Becker [Thu, 29 Dec 2016 12:58:14 +0000 (13:58 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Revert "Fix #73530: Unsetting result set may reset other result set"
Christoph M. Becker [Thu, 29 Dec 2016 12:49:29 +0000 (13:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Fix #73530: Unsetting result set may reset other result set"
Christoph M. Becker [Thu, 29 Dec 2016 12:31:18 +0000 (13:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Fix #73530: Unsetting result set may reset other result set"
# Conflicts:
# ext/sqlite3/sqlite3.c
Christoph M. Becker [Thu, 29 Dec 2016 11:41:39 +0000 (12:41 +0100)]
Revert "Fix #73530: Unsetting result set may reset other result set"
This reverts commit
eb570294a289b45d0dd38efc71065d6b0d314c4b .
That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
Xinchen Hui [Thu, 29 Dec 2016 07:56:38 +0000 (15:56 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
Xinchen Hui [Thu, 29 Dec 2016 07:56:26 +0000 (15:56 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
Xinchen Hui [Thu, 29 Dec 2016 07:46:47 +0000 (15:46 +0800)]
Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0
* 'bugfix_timeout_61471' of https://github.com/axot/php-src:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
Zheng SHAO [Thu, 29 Dec 2016 04:00:31 +0000 (13:00 +0900)]
define php_ap_map_http_request_error function for older httpd only
Sara Golemon [Wed, 28 Dec 2016 19:48:36 +0000 (11:48 -0800)]
Use new param API in posix
Sara Golemon [Wed, 28 Dec 2016 17:44:20 +0000 (09:44 -0800)]
Use new param API in date
Left the zend_parse_parameters_throw() uses along because
throwing isn't currently supported by the new API.
Also left the complex parsing in DatePeriod::__construct alone
because the macros don't really stack all that well.
Sara Golemon [Wed, 28 Dec 2016 17:11:53 +0000 (09:11 -0800)]
Use new param API in ctype
Sara Golemon [Wed, 28 Dec 2016 16:38:01 +0000 (08:38 -0800)]
Migrate curl to new parameters API
Plus a handful of char*->zend_string* conversions
Zheng SHAO [Wed, 28 Dec 2016 10:02:41 +0000 (19:02 +0900)]
add old versions of httpd support
Sara Golemon [Wed, 28 Dec 2016 07:44:18 +0000 (23:44 -0800)]
Convert bcmath to new parameter parsing API
Sara Golemon [Wed, 28 Dec 2016 07:35:38 +0000 (23:35 -0800)]
Use zend_string in bcmath params
Sara Golemon [Wed, 28 Dec 2016 06:52:26 +0000 (22:52 -0800)]
Correct function protos in intl/idn
Sara Golemon [Wed, 28 Dec 2016 06:47:16 +0000 (22:47 -0800)]
Use zend_string in intl/idn
Sara Golemon [Wed, 28 Dec 2016 06:37:29 +0000 (22:37 -0800)]
Simplify error path in intl/idn
Anatol Belski [Tue, 27 Dec 2016 22:43:13 +0000 (23:43 +0100)]
fix uninitialized value
Nikita Popov [Tue, 27 Dec 2016 21:22:14 +0000 (22:22 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 27 Dec 2016 21:22:05 +0000 (22:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 27 Dec 2016 21:20:40 +0000 (22:20 +0100)]
Disable AppVeyor fast_finish
As NTS and TS fail in different ways, we want to see both.
Graham Campbell [Tue, 27 Dec 2016 19:39:15 +0000 (19:39 +0000)]
Fixed typo in "session_module_name"
Nikita Popov [Tue, 27 Dec 2016 20:52:56 +0000 (21:52 +0100)]
Merge branch 'PHP-7.1'