]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.4'
Derick Rethans [Thu, 28 Feb 2019 13:52:46 +0000 (13:52 +0000)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Derick Rethans [Thu, 28 Feb 2019 13:52:33 +0000 (13:52 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Thu, 28 Feb 2019 13:51:10 +0000 (13:51 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'DateIntervalBogusData' into PHP-7.2
Derick Rethans [Thu, 28 Feb 2019 13:50:58 +0000 (13:50 +0000)]
Merge branch 'DateIntervalBogusData' into PHP-7.2

6 years agoFixed bug #50020 (DateInterval:createDateFromString() silently fails)
Derick Rethans [Thu, 28 Feb 2019 13:50:35 +0000 (13:50 +0000)]
Fixed bug #50020 (DateInterval:createDateFromString() silently fails)

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Thu, 28 Feb 2019 13:04:29 +0000 (14:04 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Sync with 7be0e06b482e5bf14eaf4fe9a882d8b72d644038

6 years agoSync with 7be0e06b482e5bf14eaf4fe9a882d8b72d644038
Anatol Belski [Thu, 28 Feb 2019 13:03:49 +0000 (14:03 +0100)]
Sync with 7be0e06b482e5bf14eaf4fe9a882d8b72d644038

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 28 Feb 2019 12:18:49 +0000 (13:18 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove dead code

6 years agoRemove dead code
Christoph M. Becker [Thu, 28 Feb 2019 12:11:41 +0000 (13:11 +0100)]
Remove dead code

`_php_image_output()` is only ever called for `PHP_GDIMG_CONVERT_WBM`,
`PHP_GDIMG_TYPE_GD` and `PHP_GDIMG_TYPE_GD2`.  All other image types
solely use the more flexible `_php_image_output_ctx()`.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 28 Feb 2019 11:56:00 +0000 (12:56 +0100)]
Merge branch 'PHP-7.4'

6 years agoRemove mysqli embedded server support
Nikita Popov [Thu, 28 Feb 2019 11:51:19 +0000 (12:51 +0100)]
Remove mysqli embedded server support

This code is not compatible with PHP 7.0. The fact that nobody
complained that the mysqli embedded server functionality doesn't
build anymore seems like a strong signal that we can drop it...

6 years agoMerge branch 'PHP-7.4'
Anatol Belski [Thu, 28 Feb 2019 11:53:31 +0000 (12:53 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Sync with behavior change in OpenSSL 1.1.1b

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Anatol Belski [Thu, 28 Feb 2019 11:53:05 +0000 (12:53 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Sync with behavior change in OpenSSL 1.1.1b

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 28 Feb 2019 11:52:28 +0000 (12:52 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync with behavior change in OpenSSL 1.1.1b

6 years agoSync with behavior change in OpenSSL 1.1.1b
Anatol Belski [Thu, 28 Feb 2019 11:48:47 +0000 (12:48 +0100)]
Sync with behavior change in OpenSSL 1.1.1b

A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.

6 years agoUse zpp string argument in imagecreatefromstring()
Nikita Popov [Thu, 28 Feb 2019 11:07:34 +0000 (12:07 +0100)]
Use zpp string argument in imagecreatefromstring()

Instead of accepting a zval and casting it.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 28 Feb 2019 09:58:19 +0000 (10:58 +0100)]
Merge branch 'PHP-7.4'

6 years agoDisable test parallelization on AppVeyor with opcache
Nikita Popov [Thu, 28 Feb 2019 09:57:24 +0000 (10:57 +0100)]
Disable test parallelization on AppVeyor with opcache

This is too unstable due to shared opcache state. Disabling it until
this issue is resolved to reduce the number of spurious failures.

6 years agoMark ext/xmlreader/tests/bug70309.phpt as online test
Nikita Popov [Thu, 28 Feb 2019 09:12:40 +0000 (10:12 +0100)]
Mark ext/xmlreader/tests/bug70309.phpt as online test

The relax NG schema is fetched from a remote server. We could
include it in the repo, but it's 500KB. A minimized test case would
be better.

Also, apparently this bug has never been reported upstream and just
patched in the libxml we build on Windows?

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 28 Feb 2019 08:59:19 +0000 (09:59 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 28 Feb 2019 08:59:07 +0000 (09:59 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 28 Feb 2019 08:58:30 +0000 (09:58 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #77669
Nikita Popov [Thu, 28 Feb 2019 08:58:01 +0000 (09:58 +0100)]
Fixed bug #77669

6 years agoMerge branch 'PHP-7.4'
Bob Weinand [Thu, 28 Feb 2019 08:11:50 +0000 (09:11 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix test (order of warning / notice changes due to delaying until runtime)
Bob Weinand [Thu, 28 Feb 2019 08:10:07 +0000 (09:10 +0100)]
Fix test (order of warning / notice changes due to delaying until runtime)

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Thu, 28 Feb 2019 00:09:30 +0000 (01:09 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused package2.xml file
  Remove not needed PHP_PDO_PEAR_CHECK m4 macro

6 years agoRemove unused package2.xml file
Peter Kokot [Wed, 27 Feb 2019 22:45:52 +0000 (23:45 +0100)]
Remove unused package2.xml file

6 years agoRemove not needed PHP_PDO_PEAR_CHECK m4 macro
Peter Kokot [Wed, 27 Feb 2019 22:37:33 +0000 (23:37 +0100)]
Remove not needed PHP_PDO_PEAR_CHECK m4 macro

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Wed, 27 Feb 2019 21:54:23 +0000 (22:54 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove ZEND_FP_EXCEPT macro and HAVE_FP_EXCEPT

6 years agoRemove ZEND_FP_EXCEPT macro and HAVE_FP_EXCEPT
Peter Kokot [Wed, 27 Feb 2019 20:39:26 +0000 (21:39 +0100)]
Remove ZEND_FP_EXCEPT macro and HAVE_FP_EXCEPT

Usage of the HAVE_FP_EXCEPT symbol has been removed via
c3340584128a9c8b75e2c1aa5630911ad2dc9b9f and isn't used in current code
anymore.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Wed, 27 Feb 2019 20:20:49 +0000 (21:20 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused PHP_AC_BROKEN_SNPRINTF m4 macro

6 years agoRemove unused PHP_AC_BROKEN_SNPRINTF m4 macro
Peter Kokot [Sat, 23 Feb 2019 22:39:21 +0000 (23:39 +0100)]
Remove unused PHP_AC_BROKEN_SNPRINTF m4 macro

The snprintf function is part of the C99 standard and newer systems in
most cases all support it as defined in the standard. However, some old
Windows and HP-UX systems the function behaves differently. These checks
were also removed and PHP now uses a replacement for the snprintf
function. With gradual transition to C99 usage as a minimum requirement,
it will also be able to be replaced to system's snprintf function
directly.

Additionally in this context the unused HAVE_VSNPRINTF and check for
vsnprintf have been removed. PHP uses its own vsnprintf implementation
for now until more reliable C99 compliant function can be used from the
C libraries.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Wed, 27 Feb 2019 19:13:25 +0000 (20:13 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove deprecated PHP_EXTENSION m4 macro

6 years agoRemove deprecated PHP_EXTENSION m4 macro
Peter Kokot [Sat, 23 Feb 2019 23:35:36 +0000 (00:35 +0100)]
Remove deprecated PHP_EXTENSION m4 macro

The PHP_EXTENSION macro was used before the introduction of the updated
build system in the 9d9d39a0de3bec962c343051011f5a2ed7d7b242. The
extensions at that time possibly still used the Makefile.in and Automake
and the PHP_EXTENSION macro has been replaced with the PHP_NEW_EXTENSION
macro.

Today, the once deprecated macro can be removed in favor of only
PHP_NEW_EXTENSION macro.

6 years agoMerge branch 'PHP-7.4'
Bob Weinand [Wed, 27 Feb 2019 17:47:03 +0000 (18:47 +0100)]
Merge branch 'PHP-7.4'

6 years agoDelay array to string conversion notice until runtime
Bob Weinand [Wed, 27 Feb 2019 17:46:31 +0000 (18:46 +0100)]
Delay array to string conversion notice until runtime

6 years agoMerge branch 'PHP-7.4'
Bob Weinand [Wed, 27 Feb 2019 12:02:32 +0000 (13:02 +0100)]
Merge branch 'PHP-7.4'

6 years agoUncomment cleanup for runtime_compile_time_binary_operands.phpt
Bob Weinand [Wed, 27 Feb 2019 12:02:14 +0000 (13:02 +0100)]
Uncomment cleanup for runtime_compile_time_binary_operands.phpt

6 years agoAdd runtime_compile_time_binary_operands.phpt
rjhdby [Mon, 25 Feb 2019 14:46:30 +0000 (17:46 +0300)]
Add runtime_compile_time_binary_operands.phpt

6 years agoMerge branch 'PHP-7.4'
Joe Watkins [Wed, 27 Feb 2019 08:18:20 +0000 (09:18 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77673 ReflectionClass::getDefaultProperties returns spooky array

6 years agoMerge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Wed, 27 Feb 2019 08:18:04 +0000 (09:18 +0100)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4

6 years agoFix #77673 ReflectionClass::getDefaultProperties returns spooky array
Joe Watkins [Wed, 27 Feb 2019 08:17:09 +0000 (09:17 +0100)]
Fix #77673 ReflectionClass::getDefaultProperties returns spooky array

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Feb 2019 16:27:16 +0000 (17:27 +0100)]
Merge branch 'PHP-7.4'

6 years agoSync types in .gdbinit, improve property dumping
Nikita Popov [Tue, 26 Feb 2019 16:26:16 +0000 (17:26 +0100)]
Sync types in .gdbinit, improve property dumping

If an object doesn't have a property table, we need to go through
the property into table and read the corresponding slots.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 16:45:35 +0000 (17:45 +0100)]
Merge branch 'PHP-7.4'

6 years agoMake regex replacements in zend_vm_gen.php more obvious
Benjamin Eberlei [Sat, 23 Feb 2019 20:14:12 +0000 (21:14 +0100)]
Make regex replacements in zend_vm_gen.php more obvious

Change specializing preg_replace code in VM to be map of search to
replacement for easier understanding.

6 years agoFix tests bareword fallback with error suppression
Nikita Popov [Thu, 31 Jan 2019 11:25:51 +0000 (12:25 +0100)]
Fix tests bareword fallback with error suppression

Re-merge commit a369326003995c137046c908e79b6ab482d34cec into PHP-7.4
(cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c)
(cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b)

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 12:03:26 +0000 (13:03 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 25 Feb 2019 12:02:58 +0000 (13:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 25 Feb 2019 12:01:18 +0000 (13:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix assertion in Exception::getMessage() if $message is a ref
Nikita Popov [Mon, 25 Feb 2019 12:00:16 +0000 (13:00 +0100)]
Fix assertion in Exception::getMessage() if $message is a ref

And same for other properties. Encountered in Symfony.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Feb 2019 08:36:20 +0000 (09:36 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix some directory collisions in dir tests
Nikita Popov [Mon, 25 Feb 2019 08:34:20 +0000 (09:34 +0100)]
Fix some directory collisions in dir tests

6 years agoFix some port collisions in sockets tests
Nikita Popov [Mon, 25 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Fix some port collisions in sockets tests

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 07:04:13 +0000 (15:04 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed compiler warning

6 years agoFixed compiler warning
Xinchen Hui [Mon, 25 Feb 2019 07:04:04 +0000 (15:04 +0800)]
Fixed compiler warning

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 07:00:44 +0000 (15:00 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS
  Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 07:00:37 +0000 (15:00 +0800)]
Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 07:00:23 +0000 (15:00 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoFixed bug #77660 (Segmentation fault on break 2147483648)
Xinchen Hui [Mon, 25 Feb 2019 07:00:14 +0000 (15:00 +0800)]
Fixed bug #77660 (Segmentation fault on break 2147483648)

6 years agoMerge branch 'PHP-7.3'
Xinchen Hui [Mon, 25 Feb 2019 06:42:56 +0000 (14:42 +0800)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 06:42:18 +0000 (14:42 +0800)]
Update NEWS

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 06:42:01 +0000 (14:42 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoFixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
Xinchen Hui [Mon, 25 Feb 2019 06:40:53 +0000 (14:40 +0800)]
Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 24 Feb 2019 13:15:57 +0000 (13:15 +0000)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 24 Feb 2019 13:15:17 +0000 (13:15 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 24 Feb 2019 13:14:36 +0000 (13:14 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sun, 24 Feb 2019 13:13:10 +0000 (13:13 +0000)]
Merge branch 'PHP-7.4'

6 years agoRevert "Disable bug77390.phpt"
Jakub Zelenka [Sun, 24 Feb 2019 13:12:38 +0000 (13:12 +0000)]
Revert "Disable bug77390.phpt"

This reverts commit 139492b1ae67efe541f88f8d1f3183e40ad7636d.

6 years agoPrint empty string in test for but 77390 just once
Jakub Zelenka [Sun, 24 Feb 2019 13:11:27 +0000 (13:11 +0000)]
Print empty string in test for but 77390 just once

6 years agoUse spaces instead of tabs in bug 77390 test
Jakub Zelenka [Sun, 24 Feb 2019 13:05:43 +0000 (13:05 +0000)]
Use spaces instead of tabs in bug 77390 test

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 23 Feb 2019 21:29:16 +0000 (22:29 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF

6 years agoRemove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF
Peter Kokot [Wed, 20 Feb 2019 22:17:15 +0000 (23:17 +0100)]
Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF

The sprintf function has been normalized to php_sprintf via
61364b5bb172fa512c871b795c2613b1b587e4cd.

This patch removes the checks to make a custom sprintf function

The ZEND_BROKEN_SPRINTF has been removed and the
hardcoded #define zend_sprintf sprintf is used.

The php_sprintf and zend_sprintf are now symbols to sprintf.

This patch now removes the custom PHP definitions of the php_sprintf and
zend_sprintf functions in favor of the C99 sprintf which is also
standardized in C89 already. Once, on some systems sprintf didn't behave
in same way.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 23 Feb 2019 21:18:19 +0000 (22:18 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Replace Hebrew characters with escape sequences

6 years agoReplace Hebrew characters with escape sequences
Peter Kokot [Thu, 21 Feb 2019 21:46:41 +0000 (22:46 +0100)]
Replace Hebrew characters with escape sequences

calendar.c includes ISO-8859-8 encoded Hebrew characters, which may
cause compile errors, and is causing issues when saving file as UTF-8.
This patch replaces characters with appropriate escape sequences.

Following 99fdf5916eccbd72c10cc4d84693e677996b1229.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 16:40:08 +0000 (17:40 +0100)]
Merge branch 'PHP-7.4'

6 years agoDisable bug77390.phpt
Nikita Popov [Fri, 22 Feb 2019 16:39:43 +0000 (17:39 +0100)]
Disable bug77390.phpt

This is causing a lot of spurious failures on AppVeyor.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 14:44:13 +0000 (15:44 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix anon class handling in ext mode
Nikita Popov [Fri, 22 Feb 2019 14:42:37 +0000 (15:42 +0100)]
Fix anon class handling in ext mode

Opcode order changes in 7.4 and the EXT_STMT is now declare the
DECLARE_ANON. Fix this by returning the opline from compile_class_decl
to avoid any fragile opcode searching.

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 12:42:22 +0000 (13:42 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Feb 2019 12:42:13 +0000 (13:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoRemove result def during jmp_set optimization
Nikita Popov [Fri, 22 Feb 2019 12:41:47 +0000 (13:41 +0100)]
Remove result def during jmp_set optimization

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 11:45:39 +0000 (12:45 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix removal of unreachable code in SCCP
Nikita Popov [Fri, 22 Feb 2019 11:44:36 +0000 (12:44 +0100)]
Fix removal of unreachable code in SCCP

Due to a wrongly placed check, we were only performing the
unreachable code removal if there were loop vars...

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 11:00:49 +0000 (12:00 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Feb 2019 11:00:35 +0000 (12:00 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 11:00:20 +0000 (12:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix inference warning about missing key type
Nikita Popov [Fri, 22 Feb 2019 10:55:16 +0000 (11:55 +0100)]
Fix inference warning about missing key type

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 10:26:26 +0000 (11:26 +0100)]
Merge branch 'PHP-7.4'

6 years agoFix get_unresolved_initializer for static props
Nikita Popov [Fri, 22 Feb 2019 10:23:16 +0000 (11:23 +0100)]
Fix get_unresolved_initializer for static props

For static props the offset is a simple index.

6 years agoFix directory collisions in zlib tests
Nikita Popov [Fri, 22 Feb 2019 10:11:20 +0000 (11:11 +0100)]
Fix directory collisions in zlib tests

6 years agoFix more file name collisions in phar tests
Nikita Popov [Fri, 22 Feb 2019 10:06:04 +0000 (11:06 +0100)]
Fix more file name collisions in phar tests

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Feb 2019 10:11:59 +0000 (11:11 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 22 Feb 2019 10:11:27 +0000 (11:11 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoFix #77648: BOM in sapi/apache2handler/php_functions.c
Christoph M. Becker [Fri, 22 Feb 2019 10:03:52 +0000 (11:03 +0100)]
Fix #77648: BOM in sapi/apache2handler/php_functions.c

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Feb 2019 09:53:28 +0000 (10:53 +0100)]
Merge branch 'PHP-7.4'

6 years agoUse separate files in phar tests
Nikita Popov [Fri, 22 Feb 2019 09:48:17 +0000 (10:48 +0100)]
Use separate files in phar tests

6 years agoStricter validation for popen mode argument on Windows
Nikita Popov [Thu, 21 Feb 2019 15:59:30 +0000 (16:59 +0100)]
Stricter validation for popen mode argument on Windows

Context: The ext/standard/tests/file/popen_pclose_error-win32.phpt
test often fails under parallel testing, because the "is not recognized
as an internal or external command" message doesn't actually have a
guaranteed position in the output.

While looking into this, I noticed that this test on Windows tests
something very different (invalid comand) than on Linux (invalid mode).
Here I'm adjusting the Windows popen implementation so it immediately
fails on a `rw` mode, just like it does on Linux.

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 22 Feb 2019 09:35:46 +0000 (10:35 +0100)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid potentially superfluous string reallocation

6 years agoAvoid potentially superfluous string reallocation
Christoph M. Becker [Fri, 22 Feb 2019 09:18:39 +0000 (10:18 +0100)]
Avoid potentially superfluous string reallocation

If we're not going to register the constant, it makes no sense to
allocate a `zend_string` and free it shortly after.