]>
granicus.if.org Git - php/log
Christoph M. Becker [Mon, 4 Mar 2019 18:51:39 +0000 (19:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 18:51:17 +0000 (19:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 18:50:41 +0000 (19:50 +0100)]
Update NEWS
Stanislav Malyshev [Mon, 4 Mar 2019 17:20:21 +0000 (09:20 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:18:55 +0000 (09:18 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:18:22 +0000 (09:18 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:17:14 +0000 (09:17 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Sun, 3 Mar 2019 07:42:53 +0000 (23:42 -0800)]
Fix bug #77630 - safer rename() procedure
In order to rename safer, we do the following:
- set umask to 077 (unfortunately, not TS, so excluding ZTS)
- chown() first, to set proper group before allowing group access
- chmod() after, even if chown() fails
Peter Kokot [Mon, 4 Mar 2019 13:48:56 +0000 (14:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace --with-gd by --enable-gd for Travis
Fabien Villepinte [Mon, 4 Mar 2019 13:11:34 +0000 (14:11 +0100)]
Replace --with-gd by --enable-gd for Travis
Anatol Belski [Mon, 4 Mar 2019 13:30:55 +0000 (14:30 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:30:32 +0000 (14:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:30:01 +0000 (14:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:28:47 +0000 (14:28 +0100)]
Fix test portability
Christoph M. Becker [Mon, 4 Mar 2019 12:48:04 +0000 (13:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 12:47:45 +0000 (13:47 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Mon, 4 Mar 2019 12:47:14 +0000 (13:47 +0100)]
Update NEWS
Nikita Popov [Mon, 4 Mar 2019 12:16:33 +0000 (13:16 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 4 Mar 2019 12:16:25 +0000 (13:16 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 4 Mar 2019 12:16:01 +0000 (13:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 4 Mar 2019 12:11:12 +0000 (13:11 +0100)]
Fixed bug #77691
We cannot replace an op1_def opcode with an ASSIGN, if it also has
a used res_def. Usually this doesn't happen because the res_def use
can be eliminated first. The example is a case where operand replacement
on the res_def use fails.
Peter Kokot [Mon, 4 Mar 2019 11:32:39 +0000 (12:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Move Makefile.global and Makefile.gcov to build directory
Peter Kokot [Mon, 4 Mar 2019 05:06:10 +0000 (06:06 +0100)]
Move Makefile.global and Makefile.gcov to build directory
These files can be stored in the build directory instead of bloating the
project root directory.
Nikita Popov [Mon, 4 Mar 2019 11:24:09 +0000 (12:24 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 4 Mar 2019 11:18:33 +0000 (12:18 +0100)]
Revert "Detect invalid uses of parent:: during compilation"
This reverts commit
a9e6667817c38f22f4645ec5b4e5c6b0e4b928fa .
Breakage found in the wild: Mockery uses a parent:: call in the
implementation regardless of whether the class has a parent or not:
https://github.com/mockery/mockery/blob/
4324afeaf9d95b492507e6587abb3f024e2576de /library/Mockery/Mock.php#L600
This change is not worth the compat break in 7.4.
Peter Kokot [Mon, 4 Mar 2019 11:13:22 +0000 (12:13 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace PHP_TM_GMTOFF with AC_CHECK_MEMBERS
Peter Kokot [Sun, 3 Mar 2019 01:54:03 +0000 (02:54 +0100)]
Replace PHP_TM_GMTOFF with AC_CHECK_MEMBERS
Changes:
- PHP_TM_GMTOFF removed
- HAVE_TM_GMTOFF replaced with HAVE_STRUCT_TM_TM_GMTOFF
- HAVE_TM_ZONE replaced with HAVE_STRUCT_TM_TM_ZONE
- HAVE_TZNAME removed
The PHP_TM_GMTOFF macro can be replaced with Autoconf's AC_CHECK_MEMBERS
that defines the HAVE_STRUCT_TM_TM_GMTOFF symbol instead of the
HAVE_TM_ZONE.
The HAVE_TZNAME symbol is not used in current code. The obsolete
HAVE_TM_ZONE symbol has been replaced with more proper
HAVE_STRUCT_TM_TM_ZONE. These are defined by the AC_STRUCT_TIMEZONE
macro.
Peter Kokot [Mon, 4 Mar 2019 11:11:01 +0000 (12:11 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove mkinstalldirs, install-sh and missing
Peter Kokot [Mon, 4 Mar 2019 04:25:04 +0000 (05:25 +0100)]
Remove mkinstalldirs, install-sh and missing
These scripts are part of Automake [1] and are in current *nix build
system not used anymore nor empty files need to be created.
[1] https://www.gnu.org/software/automake/manual/html_node/Auxiliary-Programs.html
Remi Collet [Mon, 4 Mar 2019 10:09:41 +0000 (11:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add NEWS entries
Remi Collet [Mon, 4 Mar 2019 10:09:31 +0000 (11:09 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add NEWS entries
Remi Collet [Mon, 4 Mar 2019 10:09:17 +0000 (11:09 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entries
Remi Collet [Mon, 4 Mar 2019 10:09:01 +0000 (11:09 +0100)]
add NEWS entries
Nikita Popov [Mon, 4 Mar 2019 09:54:38 +0000 (10:54 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 4 Mar 2019 09:52:50 +0000 (10:52 +0100)]
Don't generate script for proc_open_pipes tests
Commit the generated script instead, which is much simpler than
the code generating it...
Nikita Popov [Mon, 4 Mar 2019 09:48:09 +0000 (10:48 +0100)]
Use separate output files in x2gd tests
Nikita Popov [Mon, 4 Mar 2019 09:37:10 +0000 (10:37 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 1 Mar 2019 14:15:31 +0000 (15:15 +0100)]
Use separate directories for win32 dir tests
Also remove one redundant piece of cleanup code.
Stanislav Malyshev [Mon, 4 Mar 2019 07:34:00 +0000 (23:34 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
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
Stanislav Malyshev [Mon, 4 Mar 2019 03:30:14 +0000 (19:30 -0800)]
Fix test error message
Stanislav Malyshev [Sat, 2 Mar 2019 23:07:40 +0000 (15:07 -0800)]
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Also fix for bug #77659
Stanislav Malyshev [Sat, 2 Mar 2019 21:38:00 +0000 (13:38 -0800)]
Fix bug #77540 - Invalid Read on exif_process_SOFn
Stanislav Malyshev [Sat, 2 Mar 2019 07:25:45 +0000 (23:25 -0800)]
Fix integer overflows on 32-bits
Christoph M. Becker [Wed, 9 Jan 2019 13:26:18 +0000 (14:26 +0100)]
Fix #77431 SplFileInfo::__construct() accepts NUL bytes
`SplFileInfo::__construct()` has to expect a path instead of a string,
analogous to `SplFileObject::__construct()`.
Stanislav Malyshev [Mon, 4 Mar 2019 02:22:32 +0000 (18:22 -0800)]
Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
Stanislav Malyshev [Mon, 4 Mar 2019 07:33:54 +0000 (23:33 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
Stanislav Malyshev [Mon, 4 Mar 2019 07:33:48 +0000 (23:33 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
Stanislav Malyshev [Mon, 4 Mar 2019 07:33:43 +0000 (23:33 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
Stanislav Malyshev [Mon, 4 Mar 2019 06:33:38 +0000 (22:33 -0800)]
Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
Stanislav Malyshev [Mon, 4 Mar 2019 06:20:49 +0000 (22:20 -0800)]
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
Stanislav Malyshev [Mon, 4 Mar 2019 06:20:42 +0000 (22:20 -0800)]
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
Stanislav Malyshev [Mon, 4 Mar 2019 06:20:35 +0000 (22:20 -0800)]
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
Stanislav Malyshev [Mon, 4 Mar 2019 04:10:12 +0000 (20:10 -0800)]
Update NEWS
Stanislav Malyshev [Mon, 4 Mar 2019 03:30:14 +0000 (19:30 -0800)]
Fix test error message
Stanislav Malyshev [Sat, 2 Mar 2019 23:07:40 +0000 (15:07 -0800)]
Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
Also fix for bug #77659
Stanislav Malyshev [Sat, 2 Mar 2019 21:38:00 +0000 (13:38 -0800)]
Fix bug #77540 - Invalid Read on exif_process_SOFn
Stanislav Malyshev [Sat, 2 Mar 2019 07:25:45 +0000 (23:25 -0800)]
Fix integer overflows on 32-bits
Christoph M. Becker [Wed, 9 Jan 2019 13:26:18 +0000 (14:26 +0100)]
Fix #77431 SplFileInfo::__construct() accepts NUL bytes
`SplFileInfo::__construct()` has to expect a path instead of a string,
analogous to `SplFileObject::__construct()`.
Stanislav Malyshev [Mon, 4 Mar 2019 02:22:32 +0000 (18:22 -0800)]
Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
Peter Kokot [Mon, 4 Mar 2019 00:29:31 +0000 (01:29 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Remove oniguruma and libzip leftovers
Peter Kokot [Mon, 4 Mar 2019 00:26:56 +0000 (01:26 +0100)]
[ci skip] Remove oniguruma and libzip leftovers
Oniguruma and libzip are unbundled from php-src.
Peter Kokot [Sun, 3 Mar 2019 13:51:44 +0000 (14:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove outdated hack for AIX 4
Peter Kokot [Sat, 2 Mar 2019 21:59:06 +0000 (22:59 +0100)]
Remove outdated hack for AIX 4
AIX 4 is not supported anymore for a while. This hack was added very
long time ago into PHP and is not needed anymore.
Peter Kokot [Sun, 3 Mar 2019 13:49:10 +0000 (14:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove AC_PROG_CC_C_O
Peter Kokot [Sat, 2 Mar 2019 22:15:52 +0000 (23:15 +0100)]
Remove AC_PROG_CC_C_O
The AC_PROG_CC_C_O macro checks if compiler can use both -c and -o
options together and if not it defines the NO_MINUS_C_MINUS_O symbol.
It is not used in current codebase and therefore removed.
Anatol Belski [Sat, 2 Mar 2019 20:33:02 +0000 (21:33 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Heedlessly enable thread LS cache for ext/hash.
Anatol Belski [Sat, 2 Mar 2019 20:25:35 +0000 (21:25 +0100)]
Heedlessly enable thread LS cache for ext/hash.
It's always static now and as such always has access to the cached
TLS pointer.
Peter Kokot [Sat, 2 Mar 2019 17:52:44 +0000 (18:52 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Fix shared module generation on AIX bug #77676
Peter Kokot [Sat, 2 Mar 2019 17:52:30 +0000 (18:52 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Fix shared module generation on AIX bug #77676
Peter Kokot [Sat, 2 Mar 2019 17:52:01 +0000 (18:52 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix shared module generation on AIX bug #77676
Peter Kokot [Sat, 2 Mar 2019 17:50:33 +0000 (18:50 +0100)]
Update NEWS
Kevin Adler [Mon, 18 Feb 2019 17:01:23 +0000 (11:01 -0600)]
Fix shared module generation on AIX bug #77676
Makefiles for PHP extensions generated by phpize expect the PHP_MODULES
to contain a list of libtool .la files so that it can read the $dlname
variable from them by sourcing them in to a shell. On AIX, the code was
setting PHP_MODULES to a list of .so files, which meant the dlname was
blank, preventing the tests from being able to run.
Change the AIX code path in the PHP_SHARED_MODULE macro to match the
output on other platforms, using libtool .la files.
Peter Kokot [Sat, 2 Mar 2019 12:42:55 +0000 (13:42 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove LIBZEND_CHECK_INT_TYPE and PHP_CHECK_TYPES
Peter Kokot [Sat, 2 Mar 2019 11:11:44 +0000 (12:11 +0100)]
Remove LIBZEND_CHECK_INT_TYPE and PHP_CHECK_TYPES
Checking for int32_t and uint32_t types is already done by the
PHP_CHECK_STDINT_TYPES m4 macro.
The PHP_CHECK_TYPES m4 macro has been once used by the mysqlnd and has
been removed via
14caf174ff219376e4f1234bd297ffe973cc416e and
additionally, the internal unused macro _PHP_DEF_HAVE_FILE has been
removed.
Additionally, the unused PHP_HAVE_STDINT_TYPES symbol has been removed.
Peter Kokot [Fri, 1 Mar 2019 21:45:49 +0000 (22:45 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Fix #77609: Tests from mailparse extension fails
Peter Kokot [Fri, 1 Mar 2019 21:45:32 +0000 (22:45 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Fix #77609: Tests from mailparse extension fails
Peter Kokot [Fri, 1 Mar 2019 21:44:37 +0000 (22:44 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix #77609: Tests from mailparse extension fails
Peter Kokot [Fri, 1 Mar 2019 21:44:22 +0000 (22:44 +0100)]
Update NEWS
Ralf Habacker [Fri, 1 Mar 2019 21:32:01 +0000 (22:32 +0100)]
Fix #77609: Tests from mailparse extension fails
Add installed php extensions to temporary created ini file
In php extensions configured with phpize, a temporarily generated
php.ini is used for testing, but currently contains no installed
PHP extensions, which is required by the mailparse extension,
for example.
Installed extensions must be added with their absolute path,
because the extension_dir parameter is already occupied.
See https://bugs.php.net/bug.php?id=77609
Peter Kokot [Fri, 1 Mar 2019 18:24:06 +0000 (19:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove obsolescent AC_HEADER_STDC and memcpy check
Peter Kokot [Wed, 27 Feb 2019 23:41:30 +0000 (00:41 +0100)]
Remove obsolescent AC_HEADER_STDC and memcpy check
Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems anymore, including the `AC_HEADER_STDC`.
This macro checks if given system has C89 compliant header files such
as `<string.h>`, `<stdlib.h>`, `<stdarg.h>`, `<float.h>`,... and defines
the `STDC_HEADERS` symbol [2]. Case is that current systems should be
well supported with at least C89 standard headers [3].
Given headers are still additionally checked with the `AC_PROG_CC`
macro, yet not needed anyway.
Additionally, the HAVE_MEMCPY check has been removed. The memcpy
function is standardized by C89 and later.
Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
[3] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
Nikita Popov [Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)]
Merge branch 'PHP-7.4'
[ci skip]
c9s [Fri, 1 Mar 2019 06:15:32 +0000 (14:15 +0800)]
Fix out-dated docs and typo
[ci skip]
Nikita Popov [Fri, 1 Mar 2019 14:35:18 +0000 (15:35 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 1 Mar 2019 14:32:02 +0000 (15:32 +0100)]
Use separate files for SplFileObject::setCsvControl() tests
Nikita Popov [Fri, 1 Mar 2019 13:56:36 +0000 (14:56 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 1 Mar 2019 13:55:24 +0000 (14:55 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 1 Mar 2019 13:55:15 +0000 (14:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jay Satiro [Fri, 1 Mar 2019 06:37:00 +0000 (01:37 -0500)]
curl_error: return an empty string if no error occurred
CURLOPT_ERRORBUFFER doc says "Do not rely on the contents of the
buffer unless an error code was returned." [1]
Prior to this change the error buffer was returned even if no error had
occurred, and that buffer may contain incorrect information in such a
case. [2]
[1]: https://curl.haxx.se/libcurl/c/CURLOPT_ERRORBUFFER.html
[2]: https://github.com/curl/curl/issues/3629
Nikita Popov [Fri, 1 Mar 2019 13:52:09 +0000 (14:52 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 1 Mar 2019 13:52:02 +0000 (14:52 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 1 Mar 2019 13:51:37 +0000 (14:51 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Kevin Adler [Mon, 18 Feb 2019 16:32:38 +0000 (10:32 -0600)]
Fix bug #77677: WCOREDUMP not available on all systems
Add #ifdef WCOREDUMP around all uses.
Also Change core dump message to yes/no/unknown in lsapilib.
Nikita Popov [Fri, 1 Mar 2019 13:35:41 +0000 (14:35 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 1 Mar 2019 13:35:26 +0000 (14:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 1 Mar 2019 13:32:11 +0000 (14:32 +0100)]
Check for NULL GC type in objects_store_del
This might happen if OBJ_RELEASE is used on an object that was already
released by GC. Specific cases of this issue were previously fixed in
ffaee27478a9cb338e40edeb5acf233f9cb67111 and
72104d2b6ecbbabd18de15f10739be5ce3dc9ce0 , however the issue still
affects 3rd-party extensions using OBJ_RELEASE.
The whole GC type NULL + OBJ_IS_VALID + IS_FREE_CALLED system seems
overly complicated and can probably be simplified in 7.4.
Dmitry Stogov [Fri, 1 Mar 2019 11:34:58 +0000 (14:34 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Unused parameter
Dmitry Stogov [Fri, 1 Mar 2019 11:34:17 +0000 (14:34 +0300)]
Unused parameter
Dmitry Stogov [Fri, 1 Mar 2019 11:12:16 +0000 (14:12 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Keep original debug info
Dmitry Stogov [Fri, 1 Mar 2019 11:11:37 +0000 (14:11 +0300)]
Keep original debug info