Call zend_unregister_ini_entries() when unload extension loaded through dl() without MSHUTDOWN callback.
Extensions with MSHUTDOWN should use UNREGISTER_INI_ENTRIES().

Merge branch 'PHP-7.3' into PHP-7.4

Merge branch 'PHP-7.2' into PHP-7.3

Fix leak in phar open

Revert "Drop free_filename field from zend_file_handle"

This reverts commit e0eca262852dba1a78afcde64a49126c81fead1a.

free_filename is used by the wincache extension, restore this

Revert "Drop free_filename field from zend_file_handle"

This reverts commit e0eca262852dba1a78afcde64a49126c81fead1a.

free_filename is used by the wincache extension, restore this
field for PHP 7.4.

show more ...

Also report errors from Zend stream reader operation

Revert "Avoid unused fstat() call"

This reverts commit 5a90dc77b8f244f603082aea022fadc0ce2c009c.

Let's try to go with the reverse direction here and actually trust
the reported

Revert "Avoid unused fstat() call"

This reverts commit 5a90dc77b8f244f603082aea022fadc0ce2c009c.

Let's try to go with the reverse direction here and actually trust
the reported size...

show more ...

Avoid unused fstat() call

If we're including a file via PHP streams, we're not going to trust
the reported file size anyway and populate in a loop -- so don't
bother determining the

Avoid unused fstat() call

If we're including a file via PHP streams, we're not going to trust
the reported file size anyway and populate in a loop -- so don't
bother determining the file size in the first place. Only do this
for non-tty HANDLE_FP now, which is the only case where this
information was used.

show more ...

Remove ZEND_HANDLE_MAPPED

The buf/len members are now simply used in addition to the main
stream, without changing the handle kind.

Drop free_filename field from zend_file_handle

free_filename was always zero.

Use ZEND_HASH_FOREACH APIs in a few more places

Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols

The hash extension is always available since PHP-7.4. The symbol
HAVE_HASH_EXT is kept for BC reasons and removed in PHP-8.0.

Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols

The hash extension is always available since PHP-7.4. The symbol
HAVE_HASH_EXT is kept for BC reasons and removed in PHP-8.0.

This patch also removes the PHAR_HASH_OK since it is no longer
relevant.

show more ...

Fix stream leak in phar cache_list

Avoid confusing gotos in phar_split_cache_list

Fix VirtualProtect() related Phar issues

We must not (try to) modify shared values, but rather have to use our
own copies, if unixified filenames are required on Windows. To avoid
e

Fix VirtualProtect() related Phar issues

We must not (try to) modify shared values, but rather have to use our
own copies, if unixified filenames are required on Windows. To avoid
excessive string duplication, we add checks whether the filenames are
already unixified (i.e. do not contain backslashes). To improve the
performance if we need to copy strings, we use do_alloca() and friends.

Besides generally being somewhat messy, the handling of unixified
filenames is still suboptimal performance-wise, but we leave this for a
future cleanup, and focus on fixing the issue at hand for now.

We also enable opcache.protect_memory for the AppVeyor CI.

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540 - Invalid Read on exif_process_SOFn
Fix integer overflows on 32-bits
Fix #77431 SplFileInfo::__construct() accepts NUL bytes
Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename

show more ...

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540 - Invalid Read on exif_process_SOFn
Fix integer overflows on 32-bits
Fix #77431 SplFileInfo::__construct() accepts NUL bytes
Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename

show more ...

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Update NEWS
Fix test error message
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Fix bug #77540 - Invalid Read on exif_process_SOFn
Fix integer overflows on 32-bits
Fix #77431 SplFileInfo::__construct() accepts NUL bytes
Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename

show more ...

Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename

Update and fix remaining year ranges (2019)

This patch follows previous license year ranges updates. With new
approach source code files now have simplified headers with license
info

Update and fix remaining year ranges (2019)

This patch follows previous license year ranges updates. With new
approach source code files now have simplified headers with license
information without year ranges.

show more ...

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly

Remove local variables

This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.

A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.

This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.

With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.

Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files. All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.

show more ...

Merge branch 'PHP-7.3'

* PHP-7.3:
Fix #77367: Negative size parameter in mb_split
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with enc

Merge branch 'PHP-7.3'

* PHP-7.3:
Fix #77367: Negative size parameter in mb_split
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with encodilng length
Fix #77270: imagecolormatch Out Of Bounds Write on Heap
Fix bug #77380 (Global out of bounds read in xmlrpc base64 code)
Fix bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
Fix bug #77370 - check that we do not read past buffer end when parsing multibytes
Fix #77269: Potential unsigned underflow in gdImageScale
Fix bug #77247 (heap buffer overflow in phar_detect_phar_fname_ext)
Fix bug #77242 (heap out of bounds read in xmlrpc_decode())
Regenerate certs for openssl tests

show more ...

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with encodilng length
Fix #77270: imagecolo

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with encodilng length
Fix #77270: imagecolormatch Out Of Bounds Write on Heap
Fix bug #77380 (Global out of bounds read in xmlrpc base64 code)
Fix bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
Fix bug #77370 - check that we do not read past buffer end when parsing multibytes
Fix #77269: Potential unsigned underflow in gdImageScale
Fix bug #77247 (heap buffer overflow in phar_detect_phar_fname_ext)
Fix bug #77242 (heap out of bounds read in xmlrpc_decode())
Regenerate certs for openssl tests

show more ...

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with encodilng length
Fix #77270: imagecolo

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fix #77369 - memcpy with negative length via crafted DNS response
Fix more issues with encodilng length
Fix #77270: imagecolormatch Out Of Bounds Write on Heap
Fix bug #77380 (Global out of bounds read in xmlrpc base64 code)
Fix bug #77371 (heap buffer overflow in mb regex functions - compile_string_node)
Fix bug #77370 - check that we do not read past buffer end when parsing multibytes
Fix #77269: Potential unsigned underflow in gdImageScale
Fix bug #77247 (heap buffer overflow in phar_detect_phar_fname_ext)
Fix bug #77242 (heap out of bounds read in xmlrpc_decode())
Regenerate certs for openssl tests

show more ...

Fix bug #77247 (heap buffer overflow in phar_detect_phar_fname_ext)