]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 20 Jan 2017 07:39:27 +0000 (10:39 +0300)]
Optimized extract(). Avoided double hash lookups and repeatable checks through loop splitting.
Joe Watkins [Thu, 19 Jan 2017 10:49:09 +0000 (10:49 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update comment, incorrect since
224aaf94
SjonHortensius [Thu, 19 Jan 2017 10:41:02 +0000 (11:41 +0100)]
Update comment, incorrect since
224aaf94
In
224aaf94 ; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
Xinchen Hui [Thu, 19 Jan 2017 04:24:04 +0000 (12:24 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed another part in ldap (bug #73933)
Xinchen Hui [Thu, 19 Jan 2017 04:23:56 +0000 (12:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed another part in ldap (bug #73933)
Xinchen Hui [Thu, 19 Jan 2017 04:23:23 +0000 (12:23 +0800)]
Fixed another part in ldap (bug #73933)
Ferenc Kovacs [Thu, 19 Jan 2017 00:23:36 +0000 (01:23 +0100)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Thu, 19 Jan 2017 00:22:10 +0000 (01:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 19 Jan 2017 00:20:57 +0000 (01:20 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 19 Jan 2017 00:16:31 +0000 (01:16 +0100)]
update NEWS
Nikita Popov [Wed, 18 Jan 2017 20:20:07 +0000 (21:20 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 18 Jan 2017 20:20:00 +0000 (21:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Tue, 17 Jan 2017 20:39:07 +0000 (12:39 -0800)]
Removing zmemcheck from .gdbinit
It doesn't seem to make sense anymore
Andrey Andreev [Mon, 16 Jan 2017 13:51:13 +0000 (15:51 +0200)]
Disallow non-crypto hashes in HMAC and PBKDF2
For this purpose add is_crypto flag to php_hash_ops.
Joe Watkins [Wed, 18 Jan 2017 18:24:14 +0000 (18:24 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73949 leak in mysqli_fetch_object
Joe Watkins [Wed, 18 Jan 2017 18:23:30 +0000 (18:23 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73949 leak in mysqli_fetch_object
Joe Watkins [Wed, 18 Jan 2017 18:22:57 +0000 (18:22 +0000)]
Fix bug #73949 leak in mysqli_fetch_object
Joe Watkins [Wed, 18 Jan 2017 17:46:35 +0000 (17:46 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Remove remnants of TSMRLS_* macro calls
Joe Watkins [Wed, 18 Jan 2017 17:46:11 +0000 (17:46 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove remnants of TSMRLS_* macro calls
Thomas Punt [Wed, 18 Jan 2017 09:48:23 +0000 (09:48 +0000)]
Remove remnants of TSMRLS_* macro calls
Joe Watkins [Wed, 18 Jan 2017 17:25:52 +0000 (17:25 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
Joe Watkins [Wed, 18 Jan 2017 17:23:29 +0000 (17:23 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
Marcus Bointon [Tue, 3 Jan 2017 22:32:22 +0000 (23:32 +0100)]
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
Leigh [Wed, 18 Jan 2017 15:04:19 +0000 (15:04 +0000)]
Merge branch 'PHP-7.1'
Leigh [Wed, 18 Jan 2017 15:02:52 +0000 (15:02 +0000)]
Add php_openssl_store_errors to bailouts
Leigh [Wed, 18 Jan 2017 14:48:36 +0000 (14:48 +0000)]
Merge branch 'PHP-7.1'
Leigh [Wed, 18 Jan 2017 14:47:49 +0000 (14:47 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Leigh [Wed, 18 Jan 2017 14:45:41 +0000 (14:45 +0000)]
Change free to OPENSSL_free
Remi Collet [Wed, 18 Jan 2017 12:02:51 +0000 (13:02 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
NEWS
NEWS
Fix #73956 Link use CC instead of CXX
Remi Collet [Wed, 18 Jan 2017 12:02:33 +0000 (13:02 +0100)]
NEWS
Remi Collet [Wed, 18 Jan 2017 12:02:19 +0000 (13:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fix #73956 Link use CC instead of CXX
Remi Collet [Wed, 18 Jan 2017 12:02:03 +0000 (13:02 +0100)]
NEWS
Remi Collet [Wed, 18 Jan 2017 12:00:49 +0000 (13:00 +0100)]
Fix #73956 Link use CC instead of CXX
Joe Watkins [Wed, 18 Jan 2017 10:00:26 +0000 (10:00 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Remove more TSRMLS_CC macros
Thomas Punt [Wed, 18 Jan 2017 09:57:27 +0000 (09:57 +0000)]
Remove more TSRMLS_CC macros
Joe Watkins [Wed, 18 Jan 2017 05:06:59 +0000 (05:06 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix ce comparison
Joe Watkins [Wed, 18 Jan 2017 05:06:07 +0000 (05:06 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix ce comparison
Thomas Punt [Tue, 17 Jan 2017 18:10:33 +0000 (18:10 +0000)]
Fix ce comparison
Joe Watkins [Tue, 17 Jan 2017 20:33:57 +0000 (20:33 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
updates to release docs
Joe Watkins [Tue, 17 Jan 2017 20:33:44 +0000 (20:33 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
updates to release docs
Joe Watkins [Tue, 17 Jan 2017 20:33:25 +0000 (20:33 +0000)]
updates to release docs
Joe Watkins [Tue, 17 Jan 2017 17:08:08 +0000 (17:08 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixes in .gdbinit for ZE 3
Joe Watkins [Tue, 17 Jan 2017 17:07:53 +0000 (17:07 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixes in .gdbinit for ZE 3
Mitch Hagstrand [Tue, 17 Jan 2017 05:55:03 +0000 (21:55 -0800)]
Fixes in .gdbinit for ZE 3
1. Fixed print_pi function
2. Fixed printing properties in ____printzv_contents
3. Added optional max length parameter in ____print_str
Anatol Belski [Tue, 17 Jan 2017 09:59:56 +0000 (10:59 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
[ci skip] sync NEWS
Anatol Belski [Tue, 17 Jan 2017 09:57:56 +0000 (10:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] sync NEWS
Anatol Belski [Tue, 17 Jan 2017 09:54:53 +0000 (10:54 +0100)]
[ci skip] sync NEWS
Anatol Belski [Tue, 17 Jan 2017 09:10:12 +0000 (10:10 +0100)]
fix changed symbol
Anatol Belski [Tue, 17 Jan 2017 08:36:42 +0000 (09:36 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix #73869: Signed Integer Overflow gd_io.c
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
Anatol Belski [Tue, 17 Jan 2017 08:35:26 +0000 (09:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #73869: Signed Integer Overflow gd_io.c
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
Anatol Belski [Tue, 17 Jan 2017 08:33:51 +0000 (09:33 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #73869: Signed Integer Overflow gd_io.c
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
Christoph M. Becker [Sat, 17 Dec 2016 16:06:58 +0000 (17:06 +0100)]
Fix #73869: Signed Integer Overflow gd_io.c
GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.
(cherry picked from commit
5b5d9db3988b829e0b121b74bb3947f01c2796a1 )
Christoph M. Becker [Tue, 16 Aug 2016 16:23:36 +0000 (18:23 +0200)]
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.
(cherry picked from commit
cdb648dc4115ce0722f3cc75e6a65115fc0e56ab )
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