]>
granicus.if.org Git - php/log
Peter Kokot [Sun, 30 Jun 2019 21:59:47 +0000 (23:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Sync functions checks
Peter Kokot [Fri, 28 Jun 2019 21:10:37 +0000 (23:10 +0200)]
Sync functions checks
Removed unused checks:
- mbsinit check removed, HAVE_MBSINIT removed (not used in php-src)
- mempcpy check removed, HAVE_MEMPCPY removed (not used in php-src anymore since
560ed89bfbb56526251e9bd2fbcb27e5932641d8 which uses PHP's own implementation)
- strpncpy check removed, added via
a8c9e893b6911c785f698d724b2ff61e7aebb737 and
not used.
- setpgid check removed since HAVE_SETPGID is not used
Moved to a central configure.ac:
- fpclass
- mbrlen moved to configure.ac (since the HAVE_MBRLEN is used accross the php-src)
- sigprocmask
- getcwd
- getwd
- glob
- strfmon
- nice
Duplicated checks removed:
- gethostname
- getlogin
- getpwuid_r
- socketpair
- mprotect check simplified
Peter Kokot [Sun, 30 Jun 2019 21:55:27 +0000 (23:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused build specific symbols
Peter Kokot [Wed, 26 Jun 2019 19:55:26 +0000 (21:55 +0200)]
Remove unused build specific symbols
These were part of the following decomissioned extensions:
- PHP_SYBASE part of the sybase extension
- PHP_MSQL_* part of the msql extension
- PHP_APACHE_* symbols were used in apache and apache_hooks sapis
- PHP_FHTTPD_* symbols part of old sapi/fhttpd
- PHP_MYSQL_* symbols were part of the legacy mysql extension
- Remove PHP_ORACLE_* symbols
These were part of the obsolete oracle extension that was moved to PECL
via
f35af61ef8fd10f2d1bada1909e888293fb519b8 .
- PHP_OCI8_SHARED_LIBADD and PHP_OCI8_DIR were removed via
c33f88ccb08ca05ebf822ef94cb3fa41a1838226
And other are not used anywhere across the php-src codebase
Peter Kokot [Sun, 30 Jun 2019 21:52:30 +0000 (23:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix phar tests with hash extension
Fix missing file and remove SKIP section
Peter Kokot [Sat, 29 Jun 2019 12:40:31 +0000 (14:40 +0200)]
Fix phar tests with hash extension
- The hash extension is now always available.
- Remove unfinished test
The Phar::PGP currently doesn't exist yet.
Peter Kokot [Sat, 29 Jun 2019 12:46:51 +0000 (14:46 +0200)]
Fix missing file and remove SKIP section
Test now passes on VC 14, 15 and 16 with current MSVC runtimes.
Peter Kokot [Sun, 30 Jun 2019 21:46:02 +0000 (23:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_LIMITS_H check
Peter Kokot [Sun, 30 Jun 2019 21:44:45 +0000 (23:44 +0200)]
Remove HAVE_LIMITS_H check
The limits.h header is part of the C89 and is today available
everywhere. There is no need to check for presence of this header
anymore.
The timelib has already been patched upstream via
aae5907cb7e775f16bedf61b010b8692c12a2843
PHP extensions out there shouldn't rely on symbols defined during the
build anyway and neither they do on this particular symbol anymore.
Peter Kokot [Sun, 30 Jun 2019 21:40:32 +0000 (23:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_DEV_ARANDOM
Peter Kokot [Sun, 30 Jun 2019 02:38:07 +0000 (04:38 +0200)]
Remove HAVE_DEV_ARANDOM
The arandom check is not needed anymore since the implementations of:
3467526a65bfb15eaf9ec49a0b5673b84e26bca4
and
6554f721f770c99037f07d465a7d610568576ce4
Derick Rethans [Sun, 30 Jun 2019 14:51:04 +0000 (15:51 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Sun, 30 Jun 2019 14:50:55 +0000 (15:50 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Derick Rethans [Sun, 30 Jun 2019 14:50:38 +0000 (15:50 +0100)]
Fixed tests due to changed timezone data
Derick Rethans [Sun, 30 Jun 2019 14:45:13 +0000 (15:45 +0100)]
Update timelib to 2018.02
Anatol Belski [Sat, 29 Jun 2019 15:41:52 +0000 (17:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS [ci skip]
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:41:29 +0000 (17:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:40:58 +0000 (17:40 +0200)]
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:40:14 +0000 (17:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:39:45 +0000 (17:39 +0200)]
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:36:39 +0000 (17:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:35:25 +0000 (17:35 +0200)]
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:19:20 +0000 (17:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Set buffer to NULL to prevent double free (Kamil Dudka at redhat)
Anatol Belski [Sat, 29 Jun 2019 15:10:29 +0000 (17:10 +0200)]
Set buffer to NULL to prevent double free (Kamil Dudka at redhat)
Based on the upstream patch
d13204e8da43f1d8a98cf3f74591cde02ecdb2f7 .
Anatol Belski [Sat, 29 Jun 2019 14:53:10 +0000 (16:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix magic data
Anatol Belski [Sat, 29 Jun 2019 14:51:41 +0000 (16:51 +0200)]
Fix magic data
Christoph M. Becker [Sat, 29 Jun 2019 12:51:40 +0000 (14:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix memory leak in COM ctor
Christoph M. Becker [Sat, 29 Jun 2019 12:47:06 +0000 (14:47 +0200)]
Fix memory leak in COM ctor
We have to free strings returned from php_com_olestring_to_string().
Anatol Belski [Sat, 29 Jun 2019 11:31:56 +0000 (13:31 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Add tests from fix #78183 from PHP-7.2
Fix #78183: finfo_file shows wrong mime-type for .tga file
Anatol Belski [Sat, 29 Jun 2019 11:31:22 +0000 (13:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix typo
Add tests from fix #78183 from PHP-7.2
Fix #78183: finfo_file shows wrong mime-type for .tga file
Anatol Belski [Sat, 29 Jun 2019 11:30:35 +0000 (13:30 +0200)]
Fix typo
Joshua Westerheide [Sat, 29 Jun 2019 09:59:08 +0000 (11:59 +0200)]
Add tests from fix #78183 from PHP-7.2
Anatol Belski [Sat, 29 Jun 2019 11:29:41 +0000 (13:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78183: finfo_file shows wrong mime-type for .tga file
Joshua Westerheide [Fri, 28 Jun 2019 13:07:14 +0000 (15:07 +0200)]
Fix #78183: finfo_file shows wrong mime-type for .tga file
Due to a bug in the underlying libmagic 5.31, .tga images returned mime type "image/x-tgaimage/x-tga".
Joe Watkins [Sat, 29 Jun 2019 03:28:12 +0000 (05:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
implement support for workers in cli-server on platforms supporting fork
Joe Watkins [Thu, 27 Jun 2019 13:09:58 +0000 (15:09 +0200)]
implement support for workers in cli-server on platforms supporting fork
Joe Watkins [Sat, 29 Jun 2019 03:26:38 +0000 (05:26 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add ini config details to php-config
Joe Watkins [Wed, 26 Jun 2019 10:49:01 +0000 (12:49 +0200)]
add ini config details to php-config
Peter Kokot [Fri, 28 Jun 2019 18:19:20 +0000 (20:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Clean up files after the tests are run
Peter Kokot [Thu, 27 Jun 2019 00:21:31 +0000 (02:21 +0200)]
Clean up files after the tests are run
Peter Kokot [Fri, 28 Jun 2019 18:14:29 +0000 (20:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update changelogs [ci skip]
Remove HAVE_ERRNO_H from libgd
Peter Kokot [Fri, 28 Jun 2019 18:14:22 +0000 (20:14 +0200)]
Update changelogs [ci skip]
Peter Kokot [Thu, 27 Jun 2019 22:58:26 +0000 (00:58 +0200)]
Remove HAVE_ERRNO_H from libgd
The check for errno.h has been removed via
50b9ef8d9435d23be40cea7fb484a02e99fdb617
Upstream libgd library is also patched via
https://github.com/libgd/libgd/commit/
1e7f93922fb3adf9f131d7e94aa13386062ffe11
Nikita Popov [Fri, 28 Jun 2019 15:47:55 +0000 (17:47 +0200)]
Increase timeout of asan job on master
This will additionally be testing the JIT and 120 is cutting it
close for that.
Nikita Popov [Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Jun 2019 15:24:30 +0000 (17:24 +0200)]
Use strcmp() in phpdbg_eol_global_update
memcmp() only makes sense on equal length strings, and here we don't
know anything about the length of the input.
Nikita Popov [Fri, 28 Jun 2019 15:15:56 +0000 (17:15 +0200)]
Disable ifunc resolvers if memory sanitizer is used
Just marking them as no_sanitize("memory") is unforunately not
sufficient, as the function still gets instrumented -- the attribute
only disables reporting.
Nikita Popov [Fri, 28 Jun 2019 14:59:52 +0000 (16:59 +0200)]
Remove phpdbg_xml_asprintf()
Clang doesn't like the use of promoted zend_bool in va_start. As
the function isn't used anyway, I'm simply dropping it...
Nikita Popov [Fri, 28 Jun 2019 14:55:54 +0000 (16:55 +0200)]
Mark ifunc resolver functions as unused
It looks like clang doesn't see that these are used through
__attribute__((ifunc)) and generates a warning.
Nikita Popov [Fri, 28 Jun 2019 14:39:57 +0000 (16:39 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Jun 2019 14:36:58 +0000 (16:36 +0200)]
Fix arginfo leak in disable_functions
Arginfo is allocated if types are used, we need to free it.
Nikita Popov [Fri, 28 Jun 2019 14:11:37 +0000 (16:11 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Jun 2019 14:09:23 +0000 (16:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 28 Jun 2019 14:09:09 +0000 (16:09 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
sunnyeo [Fri, 28 Jun 2019 14:06:01 +0000 (16:06 +0200)]
Fix bugs in AST printer
Closes GH-4324.
Nikita Popov [Fri, 28 Jun 2019 13:05:00 +0000 (15:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 20 Jun 2019 14:51:14 +0000 (16:51 +0200)]
Set up asan+ubsan scheduled build on azure
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.
I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
Nikita Popov [Fri, 28 Jun 2019 12:48:08 +0000 (14:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Jun 2019 10:38:28 +0000 (12:38 +0200)]
Fix out of bounds read in sccp
Nikita Popov [Fri, 28 Jun 2019 10:32:54 +0000 (12:32 +0200)]
Avoid reliance on arena details on phpdbg oplog
Instead of guessing what the address of the first arena allocation
is going to be, embed the sentinel in the oplog_list structure
directly.
Nikita Popov [Fri, 28 Jun 2019 12:36:10 +0000 (14:36 +0200)]
Update error message in libmysql test
Sebastian Pop [Fri, 21 Jun 2019 07:15:35 +0000 (07:15 +0000)]
Fix compilation errors when building against libmysql
Closes GH-4316.
Nikita Popov [Fri, 28 Jun 2019 10:45:26 +0000 (12:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 28 Jun 2019 08:24:56 +0000 (10:24 +0200)]
Fix out-of-bounds read in array compilation
UNPACK elements only have one child. Don't access the second one
until we have excluded this case.
Nikita Popov [Fri, 28 Jun 2019 08:19:18 +0000 (10:19 +0200)]
Add tracked arena allocator
Available under -DZEND_TRACK_ARENA_ALLOC. This will use the system
allocator combined with arena checkpointing & release semantics
and allows analyzing arena usage under asan/valgrind.
I've sacrificed the duplicate arena implementation in mysqlnd, as
the integration with mysqlnd alloc is not worth the code duplication
to me.
Christoph M. Becker [Fri, 28 Jun 2019 10:38:17 +0000 (12:38 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Christoph M. Becker [Fri, 28 Jun 2019 10:37:28 +0000 (12:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Christoph M. Becker [Fri, 28 Jun 2019 10:36:33 +0000 (12:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Vincent [Wed, 26 Jun 2019 09:37:08 +0000 (11:37 +0200)]
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Reset stmt->columns when column count changed on new execution of prepared statement
Nikita Popov [Fri, 28 Jun 2019 09:10:25 +0000 (11:10 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 24 Jun 2019 10:53:40 +0000 (12:53 +0200)]
Add support for proc_open() with a command array
In this case the progarm will be executed directly, without a shell.
On Linux the arguments are passed directly to execvp and no escaping
is necessary. On Windows we construct a command string using escaping
with the default Windows command-line argument parsing method described
at https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments.
Apart from avoiding the issue of argument escaping, passing an array
and bypassing shell has the advantage of allowing proper signal
delivery to the opened process (rather than the shell).
Dmitry Stogov [Fri, 28 Jun 2019 09:03:27 +0000 (12:03 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reduce overhead
Dmitry Stogov [Fri, 28 Jun 2019 09:03:01 +0000 (12:03 +0300)]
Reduce overhead
Joe Watkins [Fri, 28 Jun 2019 08:27:39 +0000 (10:27 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
implement tsrm_is_shutdown API
Joe Watkins [Wed, 26 Jun 2019 11:18:50 +0000 (13:18 +0200)]
implement tsrm_is_shutdown API
Christoph M. Becker [Fri, 28 Jun 2019 08:24:15 +0000 (10:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use the portable zend_strndup() instead of strndup()
Christoph M. Becker [Fri, 28 Jun 2019 08:20:50 +0000 (10:20 +0200)]
Use the portable zend_strndup() instead of strndup()
Dmitry Stogov [Fri, 28 Jun 2019 07:44:13 +0000 (10:44 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed use-after-free
Dmitry Stogov [Fri, 28 Jun 2019 07:43:56 +0000 (10:43 +0300)]
Fixed use-after-free
Nikita Popov [Fri, 28 Jun 2019 07:19:49 +0000 (09:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 27 Jun 2019 14:52:19 +0000 (16:52 +0200)]
Fix mysqlnd memory leak
The actual leak is observed in ext/pdo_mysql/tests/bug_74376.phpt.
The persistent connection leaks because a refcount decrement on a
result is missed. The refcount decrement is missed because
free_result_contents is used, rather than free_result.
Looking at other uses of free_result_contents, it looks like they
could also suffer from this problem. Apart from one case,
free_result_contents is always used to release the result entirely
(I've adjusted the one differing case to only free meta), so I'm
moving most of the logic from free_result into free_result_contents.
The only difference is now that free_result will skip_result first.
Nikita Popov [Thu, 27 Jun 2019 14:01:13 +0000 (16:01 +0200)]
Free ZTS lock in opcache
For some reason this only shows up as a leak when using phpdbg.
Nikita Popov [Thu, 27 Jun 2019 13:43:50 +0000 (15:43 +0200)]
Fix init_file leak in phpdbg
Nikita Popov [Thu, 27 Jun 2019 12:07:20 +0000 (14:07 +0200)]
run-tests: Don't pass --INI-- settings to --SKIPIF--
If we're testing ini settings that cause startup failures, we'll
never get to that SKIPIF block...
Also change settings2param to return a value instead of modifying
(to a different type no less!) in place.
Nikita Popov [Fri, 28 Jun 2019 07:13:45 +0000 (09:13 +0200)]
Fix custom heap free
This seems to be designed around the use-case where the custom
allocator is a wrapper around ZMM.
Sara Golemon [Thu, 27 Jun 2019 23:28:04 +0000 (19:28 -0400)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bugfix #78208 Needs rehash with an unknown algo should always return true.
Sara Golemon [Thu, 27 Jun 2019 23:00:32 +0000 (19:00 -0400)]
Bugfix #78208 Needs rehash with an unknown algo should always return true.
Peter Kokot [Thu, 27 Jun 2019 22:32:08 +0000 (00:32 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Catch up with some recent changes [ci skip]
Peter Kokot [Tue, 25 Jun 2019 20:32:54 +0000 (22:32 +0200)]
Catch up with some recent changes [ci skip]
- Mention mysqli::stat()
- Mention removal of HAVE_* for always defined extensions
- Mention removed symbols defined during the build
Peter Kokot [Thu, 27 Jun 2019 22:26:24 +0000 (00:26 +0200)]
Fix typo
Peter Kokot [Thu, 27 Jun 2019 22:13:25 +0000 (00:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_STRCOLL check
Peter Kokot [Sun, 23 Jun 2019 13:51:24 +0000 (15:51 +0200)]
Remove HAVE_STRCOLL check
The strcoll function is defined in the C89 standard and should be
on today's systems always available via the <string.h> header.
https://port70.net/~nsz/c/c89/c89-draft.html#4.11.4.3
- Remove also SKIPIF strcoll check in test
Peter Kokot [Thu, 27 Jun 2019 21:29:11 +0000 (23:29 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols
Peter Kokot [Wed, 26 Jun 2019 01:01:45 +0000 (03:01 +0200)]
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.
Nikita Popov [Thu, 27 Jun 2019 14:16:57 +0000 (16:16 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 27 Jun 2019 14:15:13 +0000 (16:15 +0200)]
Remove posix_getlogin_basic.phpt test
The premise of this test (that the getlogin user has to be the same
as the geteuid user) is incorrect.
Nikita Popov [Thu, 27 Jun 2019 11:09:14 +0000 (13:09 +0200)]
Fix opcache blacklist leak
Don't recompute (and leak) the regex for every glob element, only
do this once at the end.
Nikita Popov [Thu, 27 Jun 2019 12:21:49 +0000 (14:21 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 27 Jun 2019 10:46:06 +0000 (12:46 +0200)]
Fix phpdbg shutdown order
In particular, make sure that everything using zmm is released
before zmm is shut down. phpdbg currently gets away with this,
because either a) its custom handlers are used and no auto-free
happens or b) the system allocator is used and no auto-free happens.
With the tracking allocator for asan this no longer works.
Nikita Popov [Thu, 27 Jun 2019 10:41:41 +0000 (12:41 +0200)]
Don't use zmm for PHPDBG_G(exec)
Uses system allocator when backing up settings ... let's avoid
unnecessary confusion.