]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 3 May 2018 16:27:04 +0000 (19:27 +0300)]
zend_fcall_info_cache.calling_scope is not used by zend_call_function() and doesn't have to be initialized.
It's used only as a result of zend_is_callable() in forward_static_call and spl_autoload.
Dmitry Stogov [Thu, 3 May 2018 16:25:53 +0000 (19:25 +0300)]
zend_is_callable() improvement
Anatol Belski [Thu, 3 May 2018 15:17:02 +0000 (17:17 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix tests, ref bug #74385
Anatol Belski [Thu, 3 May 2018 15:16:42 +0000 (17:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tests, ref bug #74385
Anatol Belski [Thu, 3 May 2018 15:15:47 +0000 (17:15 +0200)]
Fix tests, ref bug #74385
Anatol Belski [Thu, 3 May 2018 14:44:22 +0000 (16:44 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #74385 Locale::parseLocale() broken with some arguments
Anatol Belski [Thu, 3 May 2018 14:43:59 +0000 (16:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #74385 Locale::parseLocale() broken with some arguments
Anatol Belski [Thu, 3 May 2018 14:34:33 +0000 (16:34 +0200)]
Fixed bug #74385 Locale::parseLocale() broken with some arguments
Rely on the ICU's defined values for the max locale id length.
Dmitry Stogov [Thu, 3 May 2018 11:40:18 +0000 (14:40 +0300)]
Implemented Request #76178 (Class constants are slow: they should be inlined at runtime)
Run-time cache is used to eliminate recalculation of constant expression in RECV_INIT opcode (only non reference countable values are cached).
Dmitry Stogov [Thu, 3 May 2018 09:12:07 +0000 (12:12 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)
Dmitry Stogov [Thu, 3 May 2018 09:11:07 +0000 (12:11 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)
Dmitry Stogov [Thu, 3 May 2018 09:10:33 +0000 (12:10 +0300)]
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)
Anatol Belski [Wed, 2 May 2018 15:28:10 +0000 (17:28 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix shared ext/zip build with static dependency lib
Anatol Belski [Wed, 2 May 2018 15:26:37 +0000 (17:26 +0200)]
Fix shared ext/zip build with static dependency lib
Anatol Belski [Mon, 30 Apr 2018 12:29:55 +0000 (14:29 +0200)]
Update libmagic.patch
Anatol Belski [Mon, 30 Apr 2018 12:27:11 +0000 (14:27 +0200)]
Use suitable datatypes
Anatol Belski [Mon, 30 Apr 2018 10:02:47 +0000 (12:02 +0200)]
Reuse the struct timespec based pieces in libmagic
Thomas Punt [Sun, 29 Apr 2018 19:05:20 +0000 (20:05 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix potential memory leak in the enchant extension
Fix potential memory leak in curl extension
Thomas Punt [Sun, 29 Apr 2018 19:04:18 +0000 (20:04 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix potential memory leak in the enchant extension
Fix potential memory leak in curl extension
Thomas Punt [Sun, 29 Apr 2018 18:23:07 +0000 (19:23 +0100)]
Fix potential memory leak in the enchant extension
Thomas Punt [Sun, 29 Apr 2018 18:04:10 +0000 (19:04 +0100)]
Fix potential memory leak in curl extension
Anatol Belski [Sun, 29 Apr 2018 17:39:57 +0000 (19:39 +0200)]
Reuse strcasestr implementation from libmagic
Thomas Punt [Sun, 29 Apr 2018 16:39:22 +0000 (17:39 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src
Thomas Punt [Sun, 29 Apr 2018 16:38:59 +0000 (17:38 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
The SO_PASSCRED constant is conditionally defined
Thomas Punt [Sun, 29 Apr 2018 16:38:12 +0000 (17:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
The SO_PASSCRED constant is conditionally defined
Thomas Punt [Sun, 29 Apr 2018 16:34:03 +0000 (17:34 +0100)]
The SO_PASSCRED constant is conditionally defined
Anatol Belski [Sun, 29 Apr 2018 14:18:59 +0000 (16:18 +0200)]
Fix C89 compat
Anatol Belski [Sun, 29 Apr 2018 13:49:56 +0000 (15:49 +0200)]
Port libmagic 5.33
Thomas Punt [Sat, 28 Apr 2018 12:58:45 +0000 (13:58 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix potential memory leaks in sockets extension
Thomas Punt [Sat, 28 Apr 2018 12:57:30 +0000 (13:57 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix potential memory leaks in sockets extension
Thomas Punt [Sat, 28 Apr 2018 12:56:09 +0000 (13:56 +0100)]
Merge branch 'PHP-7.1' of https://git.php.net/push/php-src into PHP-7.1
Thomas Punt [Sat, 28 Apr 2018 12:55:24 +0000 (13:55 +0100)]
Fix potential memory leaks in sockets extension
Dmitry Stogov [Sat, 28 Apr 2018 11:13:12 +0000 (14:13 +0300)]
Bit check micro-optimization
Dmitry Stogov [Sat, 28 Apr 2018 11:12:36 +0000 (14:12 +0300)]
Fixed mess between BOOL and SUCCESS/FAILURE
Dmitry Stogov [Sat, 28 Apr 2018 10:29:17 +0000 (13:29 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Revert "Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)."
Revert "Merge branch 'PHP-7.1' into PHP-7.2"
Dmitry Stogov [Sat, 28 Apr 2018 10:29:05 +0000 (13:29 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)."
Dmitry Stogov [Sat, 28 Apr 2018 10:28:00 +0000 (13:28 +0300)]
Revert "Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp)."
This reverts commit
c6ce03e45e09087de8fc65f8a0a3345fea163ba2 .
Dmitry Stogov [Sat, 28 Apr 2018 10:27:36 +0000 (13:27 +0300)]
Revert "Merge branch 'PHP-7.1' into PHP-7.2"
This reverts commit
c547c1b980468c6d5fd6e1a15606c858ffff36bf , reversing
changes made to
4c083e7a66525ef662f1ae211cafb09752832342 .
Dmitry Stogov [Sat, 28 Apr 2018 10:26:32 +0000 (13:26 +0300)]
Revert "Merge branch 'PHP-7.2'"
This reverts commit
f75b8a44cc078045b4e4a0a7dfe7e3ad3a8176e0 , reversing
changes made to
aeb734910ae396d87989005edcc956e8fcb4253c .
Dmitry Stogov [Fri, 27 Apr 2018 22:20:49 +0000 (01:20 +0300)]
Don't store values of PHP_SAPI and PHP_BINARY in file cache, because it may be used by different SAPI.
Dmitry Stogov [Fri, 27 Apr 2018 21:28:01 +0000 (00:28 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Dmitry Stogov [Fri, 27 Apr 2018 21:24:56 +0000 (00:24 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Dmitry Stogov [Fri, 27 Apr 2018 21:19:53 +0000 (00:19 +0300)]
Fixed bug #76205 (PHP-FPM sporadic crash when running Infinitewp).
Nikita Popov [Fri, 27 Apr 2018 20:24:36 +0000 (22:24 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 27 Apr 2018 20:23:55 +0000 (22:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 27 Apr 2018 20:17:59 +0000 (22:17 +0200)]
Fix bug #76281
Make sure we keep the smart-branch inhibiting NOP even if there
are multiple NOPs in sequence.
Nikita Popov [Fri, 27 Apr 2018 15:02:40 +0000 (17:02 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Fri, 27 Apr 2018 15:01:49 +0000 (17:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 27 Apr 2018 14:58:30 +0000 (16:58 +0200)]
Fixed bug #76275
* Adjust IS_SERIALIZED() check to account for potential empty
allocations at the end of the memory region.
* Deallocate empty allocation if all try/catch elements have been
removed in the block pass (similar to what we do if all live
ranges have been eliminated).
Thomas Punt [Thu, 26 Apr 2018 20:09:34 +0000 (21:09 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 20:09:08 +0000 (21:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 20:08:19 +0000 (21:08 +0100)]
Allocate default ini values into persistent memory
Thomas Punt [Thu, 26 Apr 2018 15:44:02 +0000 (16:44 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix memory leak when phpdbg fails to start up
Thomas Punt [Thu, 26 Apr 2018 15:42:21 +0000 (16:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak when phpdbg fails to start up
Thomas Punt [Thu, 26 Apr 2018 15:39:52 +0000 (16:39 +0100)]
Fix memory leak when phpdbg fails to start up
Nikita Popov [Thu, 26 Apr 2018 14:53:58 +0000 (16:53 +0200)]
Fix unused variable warnings
David Carlier [Wed, 4 Apr 2018 22:06:26 +0000 (23:06 +0100)]
Avoid using _N in SSE code
The _N constant is already defined in OpenSSL. Instead use some
more explicit variable names.
Nikita Popov [Thu, 26 Apr 2018 14:17:23 +0000 (16:17 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Thu, 26 Apr 2018 14:17:13 +0000 (16:17 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
shiguangqi2008@gmail.com [Thu, 26 Apr 2018 10:16:30 +0000 (18:16 +0800)]
Fix memory leak in zend_disable_class()
Anatol Belski [Thu, 26 Apr 2018 12:20:36 +0000 (14:20 +0200)]
Switch to more robust config for external pcre2
For the standard layout the first option is pkg-config. Otherwise,
pcre2-config is used, which is produced by a manual installation into a
prefix. This removes the most of the hackish pieces like checking for
the lib filenames and parsing headers.
Anatol Belski [Wed, 25 Apr 2018 14:30:10 +0000 (16:30 +0200)]
Fix regex
Anatol Belski [Wed, 25 Apr 2018 14:15:28 +0000 (16:15 +0200)]
Revamp pcre config for build with external lib
- support multiarch in addition to the usual lib path
- fix symbol checks
- fix jit availability check
- exit early on unsupported version
Scott Arciszewski [Tue, 24 Apr 2018 20:21:22 +0000 (16:21 -0400)]
Update NEWS
Add whitespace in NEWS file
Ferenc Kovacs [Tue, 24 Apr 2018 22:18:24 +0000 (00:18 +0200)]
Merge branch 'PHP-7.2'
Ferenc Kovacs [Tue, 24 Apr 2018 22:16:12 +0000 (00:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 24 Apr 2018 22:14:33 +0000 (00:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 24 Apr 2018 22:13:11 +0000 (00:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 24 Apr 2018 21:23:14 +0000 (23:23 +0200)]
5.6.37 will be next
Remi Collet [Tue, 24 Apr 2018 15:28:25 +0000 (17:28 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
update NEWS for 7.2.5
Remi Collet [Tue, 24 Apr 2018 15:28:05 +0000 (17:28 +0200)]
update NEWS for 7.2.5
Anatol Belski [Tue, 24 Apr 2018 15:06:04 +0000 (17:06 +0200)]
Fix lib names for build with external libpcre2
Anatol Belski [Tue, 24 Apr 2018 09:38:14 +0000 (11:38 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:37:57 +0000 (11:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:37:10 +0000 (11:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:36:12 +0000 (11:36 +0200)]
7.0.31 next
Anatol Belski [Tue, 24 Apr 2018 09:26:27 +0000 (11:26 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:24:10 +0000 (11:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:21:44 +0000 (11:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 09:21:03 +0000 (11:21 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 24 Apr 2018 08:49:34 +0000 (10:49 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:49:15 +0000 (10:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:48:49 +0000 (10:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:48:22 +0000 (10:48 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test portability
Anatol Belski [Tue, 24 Apr 2018 08:47:32 +0000 (10:47 +0200)]
Fix test portability
Stanislav Malyshev [Tue, 24 Apr 2018 05:04:22 +0000 (22:04 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 05:03:33 +0000 (22:03 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 05:00:24 +0000 (22:00 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 04:59:50 +0000 (21:59 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 23:48:27 +0000 (16:48 -0700)]
Fix tsrm_ls
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:19 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76249' into PHP-5.6
* security/bug76249:
Fix test
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:12 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76248' into PHP-5.6
* security/bug76248:
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Wed, 28 Mar 2018 04:22:28 +0000 (21:22 -0700)]
Fix #76129 - remove more potential unfiltered outputs for phar
Stanislav Malyshev [Mon, 23 Apr 2018 20:42:51 +0000 (13:42 -0700)]
Merge remote-tracking branch 'security/PHP-5.6' into PHP-5.6
* security/PHP-5.6:
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 05:19:51 +0000 (22:19 -0700)]
Fix test
Stanislav Malyshev [Mon, 23 Apr 2018 05:01:35 +0000 (22:01 -0700)]
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Mon, 23 Apr 2018 04:26:06 +0000 (21:26 -0700)]
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 03:28:44 +0000 (20:28 -0700)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Add a bit of defensive conding for bug #76155
Stanislav Malyshev [Mon, 23 Apr 2018 03:28:35 +0000 (20:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add a bit of defensive conding for bug #76155
Stanislav Malyshev [Mon, 23 Apr 2018 03:27:42 +0000 (20:27 -0700)]
Add a bit of defensive conding for bug #76155
Even though it should not be ever negative, since strlen() is size_t
better to be safe than sorry.