]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 17 Jan 2017 08:11:12 +0000 (11:11 +0300)]
Separate zend_fetch_static_property_address() into an inline function
Xinchen Hui [Tue, 17 Jan 2017 07:35:46 +0000 (15:35 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
Xinchen Hui [Tue, 17 Jan 2017 07:35:29 +0000 (15:35 +0800)]
Update NEWS
Xinchen Hui [Tue, 17 Jan 2017 07:35:06 +0000 (15:35 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
Xinchen Hui [Tue, 17 Jan 2017 07:34:19 +0000 (15:34 +0800)]
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
Stanislav Malyshev [Mon, 16 Jan 2017 20:14:10 +0000 (12:14 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73648 - integer overflow in substr
Stanislav Malyshev [Mon, 16 Jan 2017 20:14:03 +0000 (12:14 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73648 - integer overflow in substr
Stanislav Malyshev [Mon, 16 Jan 2017 20:11:50 +0000 (12:11 -0800)]
Fix bug #73648 - integer overflow in substr
Nikita Popov [Mon, 16 Jan 2017 13:26:54 +0000 (14:26 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 16 Jan 2017 13:25:58 +0000 (14:25 +0100)]
Make unserialize() ref unwrapping compatible with 7.0
Also fix output difference in merged test (unrelated).
Nikita Popov [Mon, 16 Jan 2017 13:12:10 +0000 (14:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 16 Jan 2017 13:11:41 +0000 (14:11 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Mon, 16 Jan 2017 12:24:13 +0000 (13:24 +0100)]
Add additional serialize tests for fixed bugs
These have been fixed as a side-effect of the delayed __wakeup
patch.
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:57 +0000 (01:18 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73634 - grapheme_strpos illegal memory access
Fix typo
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:50 +0000 (01:18 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73634 - grapheme_strpos illegal memory access
Fix typo
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:38 +0000 (01:18 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix typo
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:16 +0000 (01:18 -0800)]
Fix bug #73634 - grapheme_strpos illegal memory access
Stanislav Malyshev [Mon, 16 Jan 2017 08:23:06 +0000 (00:23 -0800)]
Fix typo
Joe Watkins [Mon, 16 Jan 2017 04:33:22 +0000 (04:33 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73939 memory allocation in signal handler when HAVE_STRUCT_SIGINFO_T
Joe Watkins [Mon, 16 Jan 2017 04:32:27 +0000 (04:32 +0000)]
Fix bug #73939 memory allocation in signal handler when HAVE_STRUCT_SIGINFO_T
Joe Watkins [Mon, 16 Jan 2017 04:13:44 +0000 (04:13 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add test ini_set with invalid time zone
Joe Watkins [Mon, 16 Jan 2017 04:13:26 +0000 (04:13 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add test ini_set with invalid time zone
Niklas Keller [Sun, 15 Jan 2017 22:06:08 +0000 (23:06 +0100)]
Add test ini_set with invalid time zone
Wasn't covered before according to gcov.php.net.
Stanislav Malyshev [Mon, 16 Jan 2017 02:42:48 +0000 (18:42 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix test
Stanislav Malyshev [Mon, 16 Jan 2017 02:42:44 +0000 (18:42 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test
Stanislav Malyshev [Mon, 16 Jan 2017 02:42:33 +0000 (18:42 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test
Stanislav Malyshev [Mon, 16 Jan 2017 02:42:22 +0000 (18:42 -0800)]
Fix test
Stanislav Malyshev [Mon, 16 Jan 2017 01:33:48 +0000 (17:33 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update more functions with path check
Stanislav Malyshev [Mon, 16 Jan 2017 01:32:37 +0000 (17:32 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update more functions with path check
Stanislav Malyshev [Mon, 16 Jan 2017 01:32:26 +0000 (17:32 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update more functions with path check
Stanislav Malyshev [Mon, 16 Jan 2017 01:31:08 +0000 (17:31 -0800)]
Update more functions with path check
Anatol Belski [Sun, 15 Jan 2017 20:27:05 +0000 (21:27 +0100)]
move some var declarations to the top for better grouping
Anatol Belski [Sun, 15 Jan 2017 20:20:18 +0000 (21:20 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix AppVeyor failures with Opcache enabled
Anatol Belski [Sun, 15 Jan 2017 20:18:48 +0000 (21:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix AppVeyor failures with Opcache enabled
Anatol Belski [Sun, 15 Jan 2017 20:13:15 +0000 (21:13 +0100)]
fix AppVeyor failures with Opcache enabled
opcache_reset() only schedules the restart. Under circumstances,
the follow up requests might run uncached, until the restart
condition is met. To mitigate the false positives caused by this
behavior, any tests using opcache_reset() should not be put in
between other tests. Thus, moving the corresponding test to be
executed last.
Bob Weinand [Sun, 15 Jan 2017 18:26:15 +0000 (19:26 +0100)]
Fix small mistake in generator creation introduced in
9a159f37
Anatol Belski [Sun, 15 Jan 2017 16:15:46 +0000 (17:15 +0100)]
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
This reverts commit
a8931df672bb173ef81c10e4fc2a5de23789c935 , reversing
changes made to
f2f35a2b27d0074ab015b8a37d6563eec74147d5 .
(cherry picked from commit
57736cc937fc6dfdfb403293d7bf88b264e83e15 )
Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.
Adam Saponara [Sun, 15 Jan 2017 02:51:33 +0000 (21:51 -0500)]
Fix segfault in `pcntl_signal_handler` (bug #73939)
Nikita Popov [Sat, 14 Jan 2017 13:13:49 +0000 (14:13 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 14 Jan 2017 13:13:23 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Yordan Gigov [Fri, 12 Aug 2016 14:52:18 +0000 (17:52 +0300)]
Fixed bug #69993
Nikita Popov [Sat, 14 Jan 2017 12:53:58 +0000 (13:53 +0100)]
Merge branch 'PHP-7.1'
Tom Sommer [Sat, 14 Jan 2017 12:51:12 +0000 (13:51 +0100)]
Fix bug #69061
Make mail.log append correct PHP_EOL and remove timestamp when
sending to syslog.
Nikita Popov [Sat, 14 Jan 2017 12:28:52 +0000 (13:28 +0100)]
Merge branch 'PHP-7.1'
Andrey Andreev [Wed, 11 Jan 2017 19:54:38 +0000 (21:54 +0200)]
Add hash_hkdf()
Joe Watkins [Sat, 14 Jan 2017 07:33:35 +0000 (07:33 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Added test for "opcache: print restart reason" to basic_logging.phpt
Joe Watkins [Sat, 14 Jan 2017 07:33:08 +0000 (07:33 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added test for "opcache: print restart reason" to basic_logging.phpt
Mitch Hagstrand [Sat, 14 Jan 2017 00:33:05 +0000 (16:33 -0800)]
Added test for "opcache: print restart reason" to basic_logging.phpt
Nikita Popov [Thu, 5 May 2016 14:45:13 +0000 (16:45 +0200)]
Write $http_response_header to local var at end
Rather than trying to modify it mid-request. The protection against
tampering that was used (addref) violates COW because an rc>1 array
is being modified.
Test bug69337.phpt changed because it was testing tampering with
$http_response_header while the HTTP request is being executed.
This simply no longer matters, so behavior is the same as if no
tampering occurred.
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason
Alexander Polyakov [Fri, 13 Jan 2017 11:55:10 +0000 (14:55 +0300)]
opcache: print restart reason
Dmitry Stogov [Fri, 13 Jan 2017 16:51:12 +0000 (19:51 +0300)]
Fixed nullable handling (phpunit failure)
Anatol Belski [Fri, 13 Jan 2017 16:23:05 +0000 (17:23 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix remaining tests for Opcache runs
Anatol Belski [Fri, 13 Jan 2017 16:21:01 +0000 (17:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix remaining tests for Opcache runs
Anatol Belski [Fri, 13 Jan 2017 16:16:15 +0000 (17:16 +0100)]
fix remaining tests for Opcache runs
The fail reason here is the TMP change while both top and test
run same binary with opcache enabled.
Anatol Belski [Fri, 13 Jan 2017 15:55:49 +0000 (16:55 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
ensure the end path wouldn't contain double slashes
Anatol Belski [Fri, 13 Jan 2017 15:54:10 +0000 (16:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
ensure the end path wouldn't contain double slashes
Anatol Belski [Fri, 13 Jan 2017 15:50:05 +0000 (16:50 +0100)]
ensure the end path wouldn't contain double slashes
Anatol Belski [Fri, 13 Jan 2017 14:50:36 +0000 (15:50 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
templatize the resource number
Anatol Belski [Fri, 13 Jan 2017 14:48:33 +0000 (15:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
templatize the resource number
Anatol Belski [Fri, 13 Jan 2017 14:45:35 +0000 (15:45 +0100)]
templatize the resource number
Anatol Belski [Fri, 13 Jan 2017 14:35:42 +0000 (15:35 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
refix test
Anatol Belski [Fri, 13 Jan 2017 14:31:10 +0000 (15:31 +0100)]
refix test
Anatol Belski [Fri, 13 Jan 2017 13:46:44 +0000 (14:46 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test
Fix test runs with Opcache enabled PHP on top
Anatol Belski [Fri, 13 Jan 2017 13:40:31 +0000 (14:40 +0100)]
fix test
Same as before actulaly - the host process running with Opcache
enabled, all the intermediate scripts land in cache. So the count
can be variable, maybe even better to just test for > 0.
Anatol Belski [Fri, 13 Jan 2017 13:37:37 +0000 (14:37 +0100)]
Fix test runs with Opcache enabled PHP on top
Writing to the same file, while it's cached, is an issue.
Dmitry Stogov [Fri, 13 Jan 2017 09:51:23 +0000 (12:51 +0300)]
Avoid NULL dereference
Dmitry Stogov [Fri, 13 Jan 2017 08:37:46 +0000 (11:37 +0300)]
Introduced "zend_type" - an abstraction for type-hinting representation.
Joe Watkins [Fri, 13 Jan 2017 06:45:31 +0000 (06:45 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Increase wait time for tests involving sockets to improve Travis relability
Joe Watkins [Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Increase wait time for tests involving sockets to improve Travis relability
Mitch Hagstrand [Fri, 13 Jan 2017 06:09:46 +0000 (22:09 -0800)]
Increase wait time for tests involving sockets to improve Travis relability
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
Xinchen Hui [Fri, 13 Jan 2017 05:05:51 +0000 (13:05 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Remove redundant reference handling
Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
Xinchen Hui [Fri, 13 Jan 2017 05:05:22 +0000 (13:05 +0800)]
Remove redundant reference handling
Xinchen Hui [Fri, 13 Jan 2017 05:04:53 +0000 (13:04 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
Xinchen Hui [Fri, 13 Jan 2017 05:04:37 +0000 (13:04 +0800)]
Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
Anatol Belski [Thu, 12 Jan 2017 21:46:24 +0000 (22:46 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Anatol Belski [Thu, 12 Jan 2017 21:45:18 +0000 (22:45 +0100)]
update NEWS
Anatol Belski [Thu, 12 Jan 2017 21:08:20 +0000 (22:08 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
Anatol Belski [Thu, 12 Jan 2017 21:06:03 +0000 (22:06 +0100)]
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
Nikita Popov [Thu, 12 Jan 2017 20:50:53 +0000 (21:50 +0100)]
Fix memory error in reflection export
Also simplify code while at it ... no point in going through a
smart_str for a single printf.
Nikita Popov [Thu, 12 Jan 2017 20:16:13 +0000 (21:16 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 12 Jan 2017 20:14:42 +0000 (21:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
rfussenegger [Fri, 30 Sep 2016 08:49:08 +0000 (10:49 +0200)]
Fix bug #69899
Anatol Belski [Thu, 12 Jan 2017 18:01:19 +0000 (19:01 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Anatol Belski [Thu, 12 Jan 2017 17:59:36 +0000 (18:59 +0100)]
update NEWS
Nikita Popov [Thu, 12 Jan 2017 17:54:06 +0000 (18:54 +0100)]
Merge branch 'PHP-7.1'
Leigh [Mon, 31 Oct 2016 16:25:33 +0000 (16:25 +0000)]
Fixed bug #73374
Add "0b" prefix detection to intval($str, 0). The implementation
is relatively complicated because we need to handle whitespace and
sign.
Anatol Belski [Thu, 12 Jan 2017 16:27:14 +0000 (17:27 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
Anatol Belski [Thu, 12 Jan 2017 16:25:26 +0000 (17:25 +0100)]
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
Anatol Belski [Thu, 12 Jan 2017 13:17:23 +0000 (14:17 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
Anatol Belski [Thu, 12 Jan 2017 13:15:21 +0000 (14:15 +0100)]
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
Joe Watkins [Thu, 12 Jan 2017 09:24:47 +0000 (09:24 +0000)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Update to SQLite 3.16.2
Joe Watkins [Thu, 12 Jan 2017 09:10:53 +0000 (09:10 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7
Joe Watkins [Thu, 12 Jan 2017 09:10:39 +0000 (09:10 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7
Mitch Hagstrand [Thu, 12 Jan 2017 04:57:33 +0000 (20:57 -0800)]
Fixed bug #72680 gdbinit print_cvs not prepared for PHP 7
Christoph M. Becker [Wed, 11 Jan 2017 23:14:55 +0000 (00:14 +0100)]
Update to SQLite 3.16.2
Joe Watkins [Wed, 11 Jan 2017 11:18:38 +0000 (11:18 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
added a note to opache.fast_shutdown why its not enabled by default in php.ini
Joe Watkins [Wed, 11 Jan 2017 11:18:26 +0000 (11:18 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
added a note to opache.fast_shutdown why its not enabled by default in php.ini
Markus Staab [Wed, 11 Jan 2017 10:51:25 +0000 (11:51 +0100)]
added a note to opache.fast_shutdown why its not enabled by default in php.ini