]>
granicus.if.org Git - php/log
Máté Kocsis [Thu, 22 Oct 2020 17:03:04 +0000 (19:03 +0200)]
Merge branch 'PHP-8.0'
Máté Kocsis [Thu, 22 Oct 2020 10:48:12 +0000 (12:48 +0200)]
Run arginfo/ZPP verification tests in strict mode as well
Closes GH-6370
George Peter Banyard [Thu, 22 Oct 2020 16:06:07 +0000 (17:06 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug 76618
George Peter Banyard [Thu, 22 Oct 2020 16:01:48 +0000 (17:01 +0100)]
Fix bug 76618
Apply patch which was attached to the bug in July 2018
Dmitry Stogov [Thu, 22 Oct 2020 15:24:22 +0000 (18:24 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Checj type guards before loading values into CPU registers
Avoid register allocation for ASSIGN into aliased variable (it might be indirectly changed into IS_REFERENCE)
Dmitry Stogov [Thu, 22 Oct 2020 15:23:49 +0000 (18:23 +0300)]
Checj type guards before loading values into CPU registers
Dmitry Stogov [Thu, 22 Oct 2020 15:22:36 +0000 (18:22 +0300)]
Avoid register allocation for ASSIGN into aliased variable (it might be indirectly changed into IS_REFERENCE)
George Peter Banyard [Thu, 22 Oct 2020 14:50:42 +0000 (15:50 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix segfaults after conversion from zval to zend_string params
George Peter Banyard [Thu, 22 Oct 2020 14:21:57 +0000 (15:21 +0100)]
Fix segfaults after conversion from zval to zend_string params
Nikita Popov [Thu, 22 Oct 2020 14:06:16 +0000 (16:06 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't crash on uninitialized tidy object
Nikita Popov [Thu, 22 Oct 2020 14:05:57 +0000 (16:05 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Don't crash on uninitialized tidy object
Nikita Popov [Thu, 22 Oct 2020 14:05:34 +0000 (16:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't crash on uninitialized tidy object
Nikita Popov [Thu, 22 Oct 2020 14:04:22 +0000 (16:04 +0200)]
Don't crash on uninitialized tidy object
"Uninitialized" here means that the object was created ordinarily
-- no constructor skipping involved. Most tidy methods seem to
handle this fine, but these three need to be guarded.
Nikita Popov [Thu, 22 Oct 2020 13:20:51 +0000 (15:20 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Properly validate ArrayObject::asort() argument
Nikita Popov [Thu, 22 Oct 2020 13:19:47 +0000 (15:19 +0200)]
Properly validate ArrayObject::asort() argument
Nikita Popov [Thu, 22 Oct 2020 13:06:47 +0000 (15:06 +0200)]
Fix zpp for GdFont|int
Use Z_PARAM_OBJ_OF_TYPE_OR_LONG to get standard behavior.
Nikita Popov [Thu, 22 Oct 2020 12:56:00 +0000 (14:56 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix parameter name of pspell_config_save_repl()
Máté Kocsis [Thu, 22 Oct 2020 09:44:19 +0000 (11:44 +0200)]
Fix parameter name of pspell_config_save_repl()
Closes GH-6369.
Nikita Popov [Thu, 22 Oct 2020 12:52:03 +0000 (14:52 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix stub for dba_key_split()
Nikita Popov [Thu, 22 Oct 2020 12:49:48 +0000 (14:49 +0200)]
Fix stub for dba_key_split()
This is an extremely weird function, but the behavior seems to be
intentional, and is quite clearly documented.
So we adjust the stub to also accept false|null as arguments. I
believe the implementation already correctly matches union type
semantics.
Nikita Popov [Thu, 22 Oct 2020 12:35:40 +0000 (14:35 +0200)]
Accept zend_string in highlight_string API
Nikita Popov [Thu, 22 Oct 2020 12:31:54 +0000 (14:31 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Make highlight_string() accept string in zpp
Nikita Popov [Thu, 22 Oct 2020 12:31:23 +0000 (14:31 +0200)]
Make highlight_string() accept string in zpp
To satisfy the type declaration.
Nikita Popov [Thu, 22 Oct 2020 12:23:07 +0000 (14:23 +0200)]
Remove unused pasv_listen() function
Nikita Popov [Thu, 22 Oct 2020 12:22:16 +0000 (14:22 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't leak pcntl last_error across requests
Nikita Popov [Thu, 22 Oct 2020 12:18:45 +0000 (14:18 +0200)]
Don't leak pcntl last_error across requests
Nikita Popov [Thu, 22 Oct 2020 10:42:26 +0000 (12:42 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't leak json error_code across requests
Nikita Popov [Thu, 22 Oct 2020 10:41:52 +0000 (12:41 +0200)]
Don't leak json error_code across requests
Nikita Popov [Thu, 22 Oct 2020 09:20:21 +0000 (11:20 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't leak pcre error_code across requests
Updated to version 2020.4 (2020d)
Nikita Popov [Thu, 22 Oct 2020 09:01:59 +0000 (11:01 +0200)]
Don't leak pcre error_code across requests
Derick Rethans [Thu, 22 Oct 2020 09:12:27 +0000 (10:12 +0100)]
Updated to version 2020.4 (2020d)
Derick Rethans [Thu, 22 Oct 2020 09:12:27 +0000 (10:12 +0100)]
Updated to version 2020.4 (2020d)
Derick Rethans [Thu, 22 Oct 2020 09:12:27 +0000 (10:12 +0100)]
Empty merge
Derick Rethans [Thu, 22 Oct 2020 09:12:27 +0000 (10:12 +0100)]
Empty merge
Derick Rethans [Thu, 22 Oct 2020 09:12:26 +0000 (10:12 +0100)]
Updated to version 2020.4 (2020d)
Derick Rethans [Thu, 22 Oct 2020 09:12:25 +0000 (10:12 +0100)]
Empty merge
Derick Rethans [Thu, 22 Oct 2020 09:12:24 +0000 (10:12 +0100)]
Updated to version 2020.4 (2020d)
Nikita Popov [Thu, 22 Oct 2020 08:42:26 +0000 (10:42 +0200)]
Remove unused single.leaf member
Nikita Popov [Thu, 22 Oct 2020 08:35:03 +0000 (10:35 +0200)]
Don't allow properties on former resource objects
Nikita Popov [Thu, 22 Oct 2020 08:34:44 +0000 (10:34 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Don't allow properties on GdImage
Nikita Popov [Thu, 22 Oct 2020 08:34:14 +0000 (10:34 +0200)]
Don't allow properties on GdImage
Just like all the other former resources... we missed this case.
Nikita Popov [Thu, 22 Oct 2020 08:27:01 +0000 (10:27 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Simplify and fix generator tree management
Nikita Popov [Thu, 15 Oct 2020 14:42:59 +0000 (16:42 +0200)]
Simplify and fix generator tree management
This makes a number of related changes to the generator tree
management, that should hopefully make it easier to understand,
more robust and faster for the common linear-chain case. Fixes
https://bugs.php.net/bug.php?id=80240, which was the original
motivation here.
* Generators now only add a ref to their direct parent.
* Nodes only store their children, not their leafs, which avoids
any need for leaf updating. This means it's no longer possible
to fetch the child for a certain leaf, which is something we
only needed in one place (update_current). If multi-children
nodes are involved, this will require doing a walk in the other
direction (from leaf to root). It does not affect the common
case of single-child nodes.
* The root/leaf pointers are now seen as a pair. One leaf generator
can point to the current root. If a different leaf generator is
used, we'll move the root pointer over to that one. Again, this
is a cache to make the common linear chain case fast, trees may
need to scan up the parent link.
Closes GH-6344.
Sara Golemon [Thu, 22 Oct 2020 00:12:55 +0000 (00:12 +0000)]
Convert pspell resources to objects
Sara Golemon [Wed, 21 Oct 2020 23:43:28 +0000 (23:43 +0000)]
NEWS for gdFont conversion
Sara Golemon [Wed, 21 Oct 2020 23:21:25 +0000 (23:21 +0000)]
Convert gdFont from resource to object
Sara Golemon [Wed, 21 Oct 2020 22:09:08 +0000 (22:09 +0000)]
Convert FTP resource to object
Nikita Popov [Wed, 21 Oct 2020 15:07:12 +0000 (17:07 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update bcmath.scale when calling bcscale()
Nikita Popov [Wed, 21 Oct 2020 15:03:54 +0000 (17:03 +0200)]
Update bcmath.scale when calling bcscale()
We should keep the value of bcmath.scale and the internal
bc_precision global synchronized.
Probably more important than the ability to retrieve bcmath.scale
via ini_get(), this also makes sure that the set scale does not
leak into the next request, as it currently does.
Dmitry Stogov [Wed, 21 Oct 2020 13:05:34 +0000 (16:05 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
More accurate live range construction
Dmitry Stogov [Wed, 21 Oct 2020 13:05:13 +0000 (16:05 +0300)]
More accurate live range construction
Dmitry Stogov [Wed, 21 Oct 2020 13:03:54 +0000 (16:03 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Eliminate useless mov(s)
Dmitry Stogov [Wed, 21 Oct 2020 13:03:28 +0000 (16:03 +0300)]
Eliminate useless mov(s)
Nikita Popov [Wed, 21 Oct 2020 10:17:14 +0000 (12:17 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add test for zend_extension loading
Nikita Popov [Wed, 21 Oct 2020 08:34:34 +0000 (10:34 +0200)]
Add test for zend_extension loading
Closes GH-6363.
Nikita Popov [Wed, 21 Oct 2020 08:07:24 +0000 (10:07 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix invalid memory read on libpath
twosee [Wed, 21 Oct 2020 05:17:16 +0000 (13:17 +0800)]
Fix invalid memory read on libpath
Introduced in
3e33e1e86d15e262cd9e0224a9604e252f5d9284 .
Closes GH-6362.
Dmitry Stogov [Tue, 20 Oct 2020 20:37:39 +0000 (23:37 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Eliminate dead type store
Dmitry Stogov [Tue, 20 Oct 2020 20:37:19 +0000 (23:37 +0300)]
Eliminate dead type store
Dmitry Stogov [Tue, 20 Oct 2020 17:31:09 +0000 (20:31 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve JIT for fetching character form string
Dmitry Stogov [Tue, 20 Oct 2020 17:29:33 +0000 (20:29 +0300)]
Improve JIT for fetching character form string
Christoph M. Becker [Tue, 20 Oct 2020 17:02:32 +0000 (19:02 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
Christoph M. Becker [Tue, 20 Oct 2020 17:01:56 +0000 (19:01 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
Christoph M. Becker [Tue, 20 Oct 2020 17:00:04 +0000 (19:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
Christoph M. Becker [Tue, 20 Oct 2020 14:38:16 +0000 (16:38 +0200)]
Fix #80242: imap_mail_compose() segfaults for multipart with rfc822
libc-client expects `TYPEMESSAGE` with an explicit subtype of `RFC822`
to have a `nested.msg` (otherwise there will be a segfault during
free), but not to have any `contents.text.data` (this will leak
otherwise).
Closes GH-6345.
Nikita Popov [Tue, 20 Oct 2020 14:48:28 +0000 (16:48 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix default value handling of mysqli_fetch_object()
Máté Kocsis [Tue, 13 Oct 2020 22:12:51 +0000 (00:12 +0200)]
Fix default value handling of mysqli_fetch_object()
Make [] acceptable both for classes without constructors and
classes with a constructor that takes no arguments.
Closes GH-6336.
Christoph M. Becker [Tue, 20 Oct 2020 14:34:40 +0000 (16:34 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Add char* cast to avoid compiler warnings
Christoph M. Becker [Tue, 20 Oct 2020 14:33:56 +0000 (16:33 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add char* cast to avoid compiler warnings
Christoph M. Becker [Tue, 20 Oct 2020 14:31:25 +0000 (16:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add char* cast to avoid compiler warnings
Christoph M. Becker [Tue, 20 Oct 2020 14:25:00 +0000 (16:25 +0200)]
Add char* cast to avoid compiler warnings
In libc-client 2007f `data` is declared as `unsigned char *`; there may
be variants which declare it as `void *`, but in any case picky
compilers may warn about a pointer type mismatch in the conditional
(and error with `-W-error`), so we're adding a `char *` cast for good
measure.
Nikita Popov [Tue, 20 Oct 2020 13:36:02 +0000 (15:36 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80256
Nikita Popov [Tue, 20 Oct 2020 13:32:01 +0000 (15:32 +0200)]
Fixed bug #80256
Remove the transfer_encoding stream filter immediately when we
destroy the old stream, to make sure it doesn't get attached to
the new stream.
Christoph M. Becker [Tue, 20 Oct 2020 11:37:07 +0000 (13:37 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Properly fix #80220
Christoph M. Becker [Tue, 20 Oct 2020 11:36:17 +0000 (13:36 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Properly fix #80220
Christoph M. Becker [Tue, 20 Oct 2020 11:34:27 +0000 (13:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Properly fix #80220
Christoph M. Becker [Fri, 16 Oct 2020 09:58:50 +0000 (11:58 +0200)]
Properly fix #80220
The original fix for that bug[1] broke the formerly working composition
of message/rfc822 messages, which results in a segfault when freeing
the message body now. While `imap_mail_compose()` does not really
support composition of meaningful message/rfc822 messages (although
libc-client appears to support that), some code may still use this to
compose partial messages, and using string manipulation to create the
final message.
The point is that libc-client expects `TYPEMESSAGE` with an explicit
subtype of `RFC822` to have a `nested.msg` (otherwise there will be a
segfault during free), but not to have any `contents.text.data` (this
will leak otherwise).
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
0d022ddf03c5fabaaa22e486d1e4a367ed9170a7 >
Closes GH-6343.
Nikita Popov [Tue, 20 Oct 2020 10:51:17 +0000 (12:51 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
Nikita Popov [Tue, 20 Oct 2020 10:51:08 +0000 (12:51 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
twosee [Tue, 9 Jun 2020 06:55:36 +0000 (14:55 +0800)]
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
Dmitry Stogov [Tue, 20 Oct 2020 10:46:47 +0000 (13:46 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve register allocator (register reuse)
Dmitry Stogov [Tue, 20 Oct 2020 10:46:32 +0000 (13:46 +0300)]
Improve register allocator (register reuse)
Dmitry Stogov [Tue, 20 Oct 2020 09:22:32 +0000 (12:22 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve register allocator (give preference to loop variables).
Dmitry Stogov [Tue, 20 Oct 2020 09:19:44 +0000 (12:19 +0300)]
Improve register allocator (give preference to loop variables).
Nikita Popov [Tue, 20 Oct 2020 08:53:01 +0000 (10:53 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix CCM tag length setting for old OpenSSL versions
Nikita Popov [Tue, 20 Oct 2020 08:52:50 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix CCM tag length setting for old OpenSSL versions
Nikita Popov [Tue, 20 Oct 2020 08:50:50 +0000 (10:50 +0200)]
Fix CCM tag length setting for old OpenSSL versions
While OpenSSL 1.1 allows unconditionally setting the CCM tag length
even for decryption, some older versions apparently do not. As such,
we do need to treat CCM and OCB separately after all.
Nikita Popov [Tue, 20 Oct 2020 07:54:10 +0000 (09:54 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Increase timeout on file cache job
[ci skip]
Nikita Popov [Tue, 20 Oct 2020 07:53:50 +0000 (09:53 +0200)]
Increase timeout on file cache job
[ci skip]
Dmitry Stogov [Mon, 19 Oct 2020 23:27:53 +0000 (02:27 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed range propagation
Dmitry Stogov [Mon, 19 Oct 2020 23:27:24 +0000 (02:27 +0300)]
Fixed range propagation
Dmitry Stogov [Mon, 19 Oct 2020 20:23:04 +0000 (23:23 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Avoid partial register stall
Dmitry Stogov [Mon, 19 Oct 2020 20:22:43 +0000 (23:22 +0300)]
Avoid partial register stall
Dmitry Stogov [Mon, 19 Oct 2020 16:43:20 +0000 (19:43 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Use zero-extended mov insted of sign-signed movsxd
Dmitry Stogov [Mon, 19 Oct 2020 16:39:51 +0000 (19:39 +0300)]
Use zero-extended mov insted of sign-signed movsxd
Nikita Popov [Mon, 19 Oct 2020 14:59:00 +0000 (16:59 +0200)]
Use zend_accel_error_noreturn in more places
Missed the place in accelerator_blacklist that was the actual
motivation here...
Nikita Popov [Mon, 19 Oct 2020 14:09:03 +0000 (16:09 +0200)]
Add zend_accel_error_noreturn() helper
Avoid confusing the compiler when code relies on the fact that
LOG_FATAL/LOG_ERROR will bailout/abort.
Nikita Popov [Mon, 19 Oct 2020 13:24:29 +0000 (15:24 +0200)]
Don't use global for array_walk_fci
There's really no good reason for this to be a global, we can
easily pass it down to php_array_walk().
Nikita Popov [Mon, 19 Oct 2020 13:14:57 +0000 (15:14 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80255
Nikita Popov [Mon, 19 Oct 2020 13:13:40 +0000 (15:13 +0200)]
Fixed bug #80255
This was a copy&paste mistake, target_block was used where
follow_block was intended. Also update copy&paste mistakes in
the comments.