]> granicus.if.org Git - php/log
php
5 years agoAdded arginfo stubs for svsvshm
Stephen Reay [Sun, 11 Aug 2019 18:09:38 +0000 (01:09 +0700)]
Added arginfo stubs for svsvshm

Closes GH-4524.

5 years agoRemove some misleading RETURN_FALSE
Nikita Popov [Mon, 12 Aug 2019 07:58:29 +0000 (09:58 +0200)]
Remove some misleading RETURN_FALSE

These functions throw, so they can't return false.

This is just a subset...

5 years agoDon't explicitly set return value on ZPP failure
Christoph M. Becker [Mon, 12 Aug 2019 08:01:30 +0000 (10:01 +0200)]
Don't explicitly set return value on ZPP failure

Failing ZPP throws as of PHP 8.0.0, so explicitly setting a return
value is useless, and also slightly confusing.

5 years agoClaim maintainership of ext/com_dotnet
Christoph M. Becker [Sun, 11 Aug 2019 20:25:39 +0000 (22:25 +0200)]
Claim maintainership of ext/com_dotnet

5 years agoDon't throw manual exceptions on ZPP failure
Christoph M. Becker [Sun, 11 Aug 2019 20:20:26 +0000 (22:20 +0200)]
Don't throw manual exceptions on ZPP failure

As of PHP 8.0.0, ZPP throws on failure, so manually throwing exceptions
is superfluous and confusing.

5 years agoAdd com_dotnet function stubs
Christoph M. Becker [Sun, 11 Aug 2019 19:44:51 +0000 (21:44 +0200)]
Add com_dotnet function stubs

5 years agoArginfo stubs for tokenizer
Stephen Reay [Sun, 11 Aug 2019 16:32:56 +0000 (23:32 +0700)]
Arginfo stubs for tokenizer

5 years agoAdd support for callable to the stub generator [ci skip]
Stephen Reay [Sun, 11 Aug 2019 16:12:42 +0000 (23:12 +0700)]
Add support for callable to the stub generator [ci skip]

5 years agoAdd crc32 stub
inem0o [Sun, 11 Aug 2019 15:35:33 +0000 (17:35 +0200)]
Add crc32 stub

5 years agoUpdated to version 2019.2 (2019b)
Derick Rethans [Sun, 11 Aug 2019 15:06:00 +0000 (16:06 +0100)]
Updated to version 2019.2 (2019b)

5 years agoEmpty merge
Derick Rethans [Sun, 11 Aug 2019 15:06:00 +0000 (16:06 +0100)]
Empty merge

5 years agoUpdated to version 2019.2 (2019b)
Derick Rethans [Sun, 11 Aug 2019 15:05:59 +0000 (16:05 +0100)]
Updated to version 2019.2 (2019b)

5 years agoEmpty merge
Derick Rethans [Sun, 11 Aug 2019 15:05:59 +0000 (16:05 +0100)]
Empty merge

5 years agoUpdated to version 2019.2 (2019b)
Derick Rethans [Sun, 11 Aug 2019 15:05:58 +0000 (16:05 +0100)]
Updated to version 2019.2 (2019b)

5 years agoFix arginfo
Christoph M. Becker [Sun, 11 Aug 2019 14:40:40 +0000 (16:40 +0200)]
Fix arginfo

The second parameter of `imagexbm()` is nullable.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 11 Aug 2019 14:17:50 +0000 (16:17 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix parameter order

5 years agoFix parameter order
Christoph M. Becker [Sun, 11 Aug 2019 14:05:53 +0000 (16:05 +0200)]
Fix parameter order

`imagecopymerge()` and `imagecopymergegray()` expect the destination
image first, not the other way round.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 11 Aug 2019 13:22:08 +0000 (15:22 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Extend color component range checks

5 years agoExtend color component range checks
Christoph M. Becker [Sun, 11 Aug 2019 13:00:23 +0000 (15:00 +0200)]
Extend color component range checks

We also check for alpha components to be within range, and we add yet
missing range checks for other functions as well.

5 years agoUse TypeError for preg_replace type check
Nikita Popov [Sun, 11 Aug 2019 12:28:10 +0000 (14:28 +0200)]
Use TypeError for preg_replace type check

This is a type violation warning, and as such should use TypeError
in PHP 8.

5 years agoFix arginfo
Christoph M. Becker [Sun, 11 Aug 2019 11:43:45 +0000 (13:43 +0200)]
Fix arginfo

5 years agoAdd GD function stubs
Christoph M. Becker [Sun, 11 Aug 2019 08:14:51 +0000 (10:14 +0200)]
Add GD function stubs

5 years agoAdd stubs for PCRE extension
Stephen Reay [Sat, 10 Aug 2019 12:52:50 +0000 (19:52 +0700)]
Add stubs for PCRE extension

Closes GH-4501.

5 years agoAdd partial openssl stubs
Rimvydas Zilinskas [Sat, 10 Aug 2019 17:16:13 +0000 (18:16 +0100)]
Add partial openssl stubs

Closes GH-4509.

5 years agoAdd BCMath PHP stubs
Simon Podlipsky [Sat, 10 Aug 2019 16:02:13 +0000 (18:02 +0200)]
Add BCMath PHP stubs

Closes GH-4508.

5 years agoConvert gettext functions arginfo to php stubs
Craig Duncan [Sat, 10 Aug 2019 14:39:25 +0000 (15:39 +0100)]
Convert gettext functions arginfo to php stubs

Closes GH-4506

5 years agoAdd base64_encode / base64_decode stubs
inem0o [Sat, 10 Aug 2019 13:54:43 +0000 (15:54 +0200)]
Add base64_encode / base64_decode stubs

Closes GH-4504.

5 years agoConvert json functions arginfo to php stubs
Craig Duncan [Sat, 10 Aug 2019 11:39:53 +0000 (12:39 +0100)]
Convert json functions arginfo to php stubs

Closes GH-4500

5 years agoHandle preprocessor conditions inside classes
Nikita Popov [Sat, 10 Aug 2019 14:28:57 +0000 (16:28 +0200)]
Handle preprocessor conditions inside classes

Also remove the dead parseClass() function.

5 years agoFallback to curl in gen_stub if wget fails
Stephen Reay [Sat, 10 Aug 2019 13:10:16 +0000 (20:10 +0700)]
Fallback to curl in gen_stub if wget fails

Closes GH-4502.

5 years agoExpand preprocessor support in gen_stubs
Nikita Popov [Sat, 10 Aug 2019 13:07:54 +0000 (15:07 +0200)]
Expand preprocessor support in gen_stubs

Support #ifdef, #ifndef, #else and nested #if's.

5 years agoAdd some basic_functions stubs
Nikita Popov [Sat, 10 Aug 2019 10:34:29 +0000 (12:34 +0200)]
Add some basic_functions stubs

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 9 Aug 2019 14:47:50 +0000 (17:47 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed handling of references in nested data of objects with destructor

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Fri, 9 Aug 2019 14:47:35 +0000 (17:47 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed handling of references in nested data of objects with destructor

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 9 Aug 2019 14:47:06 +0000 (17:47 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed handling of references in nested data of objects with destructor

5 years agoFixed handling of references in nested data of objects with destructor
Dmitry Stogov [Fri, 9 Aug 2019 14:43:50 +0000 (17:43 +0300)]
Fixed handling of references in nested data of objects with destructor

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 9 Aug 2019 14:34:47 +0000 (16:34 +0200)]
Merge branch 'PHP-7.4'

5 years agoDon't short-circuit MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE
Nikita Popov [Fri, 9 Aug 2019 14:33:21 +0000 (16:33 +0200)]
Don't short-circuit MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE

Make sure we always go through mbfl_filt_conv_illegal_output(), so
that the number of illegal characters gets counted.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 9 Aug 2019 13:04:10 +0000 (15:04 +0200)]
Merge branch 'PHP-7.4'

5 years agoFixed bug #78391
Nikita Popov [Fri, 9 Aug 2019 13:02:06 +0000 (15:02 +0200)]
Fixed bug #78391

5 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Fri, 9 Aug 2019 13:03:07 +0000 (16:03 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fixed bug #78391
  Make uninitialized DateTime an Error
  Generate arginfo from PHP stub files

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 9 Aug 2019 13:02:57 +0000 (15:02 +0200)]
Merge branch 'PHP-7.4'

5 years agoFixed bug #78391
Nikita Popov [Fri, 9 Aug 2019 13:02:06 +0000 (15:02 +0200)]
Fixed bug #78391

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 9 Aug 2019 12:58:44 +0000 (15:58 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Fri, 9 Aug 2019 12:58:33 +0000 (15:58 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 9 Aug 2019 12:58:16 +0000 (15:58 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMake uninitialized DateTime an Error
Nikita Popov [Fri, 9 Aug 2019 12:33:59 +0000 (14:33 +0200)]
Make uninitialized DateTime an Error

This avoids many spurious false return values.

5 years agoGenerate arginfo from PHP stub files
Nikita Popov [Tue, 18 Jun 2019 09:33:07 +0000 (11:33 +0200)]
Generate arginfo from PHP stub files

Signature stubs for internal functions are specified in xyz.stub.php,
from which we generate actual arginfo structures in xyz_arginfo.h.
This file then needs to be included in the implementation appropriately.

Arginfo from stubs can be regenerated using scripts/dev/gen_stub.php.
However, this should also automatically happen when the stub file is
modified.

5 years agoFixed second part of the bug #78379 (Cast to object confuses GC, causes crash)
Dmitry Stogov [Fri, 9 Aug 2019 12:42:39 +0000 (15:42 +0300)]
Fixed second part of the bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 9 Aug 2019 10:40:56 +0000 (13:40 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Added asserts to catch GC errors when refcount goes below zero.

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Fri, 9 Aug 2019 10:40:39 +0000 (13:40 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Added asserts to catch GC errors when refcount goes below zero.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 9 Aug 2019 10:39:59 +0000 (13:39 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Added asserts to catch GC errors when refcount goes below zero.

5 years agoAdded asserts to catch GC errors when refcount goes below zero.
Dmitry Stogov [Fri, 9 Aug 2019 10:37:23 +0000 (13:37 +0300)]
Added asserts to catch GC errors when refcount goes below zero.

5 years agoMerge branch 'PHP-7.4'
Matteo Beccati [Fri, 9 Aug 2019 08:33:23 +0000 (10:33 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip test when SIGKILL is not defined

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Matteo Beccati [Fri, 9 Aug 2019 08:33:15 +0000 (10:33 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Skip test when SIGKILL is not defined

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Matteo Beccati [Fri, 9 Aug 2019 08:32:56 +0000 (10:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Skip test when SIGKILL is not defined

5 years agoSkip test when SIGKILL is not defined
Matteo Beccati [Fri, 9 Aug 2019 08:32:15 +0000 (10:32 +0200)]
Skip test when SIGKILL is not defined

5 years agoMerge branch 'PHP-7.4'
Matteo Beccati [Fri, 9 Aug 2019 07:58:36 +0000 (09:58 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test when default TZ is not UTC

5 years agoFix test when default TZ is not UTC
Matteo Beccati [Fri, 9 Aug 2019 07:58:10 +0000 (09:58 +0200)]
Fix test when default TZ is not UTC

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 8 Aug 2019 08:55:07 +0000 (10:55 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 8 Aug 2019 08:55:02 +0000 (10:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFix GC tracing
Nikita Popov [Thu, 8 Aug 2019 08:52:29 +0000 (10:52 +0200)]
Fix GC tracing

Due to the GC changes in 7.3 we stopped tracing most of the
interesting coloring changes...

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 8 Aug 2019 08:12:43 +0000 (10:12 +0200)]
Merge branch 'PHP-7.4'

[ci skip]

5 years agoAdd UPGRADING note about stream_set_option() and includes
Nikita Popov [Thu, 8 Aug 2019 08:12:16 +0000 (10:12 +0200)]
Add UPGRADING note about stream_set_option() and includes

[ci skip]

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 8 Aug 2019 07:56:10 +0000 (09:56 +0200)]
Merge branch 'PHP-7.4'

5 years agoFixed bug #78383
Nikita Popov [Thu, 8 Aug 2019 07:55:29 +0000 (09:55 +0200)]
Fixed bug #78383

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 8 Aug 2019 07:09:04 +0000 (10:09 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Dmitry Stogov [Thu, 8 Aug 2019 07:07:39 +0000 (10:07 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Thu, 8 Aug 2019 07:05:59 +0000 (10:05 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #78379 (Cast to object confuses GC, causes crash)

5 years agoFixed bug #78379 (Cast to object confuses GC, causes crash)
Dmitry Stogov [Thu, 8 Aug 2019 07:00:39 +0000 (10:00 +0300)]
Fixed bug #78379 (Cast to object confuses GC, causes crash)

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 7 Aug 2019 11:25:27 +0000 (13:25 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix detection of pg_config.h

5 years agoFix detection of pg_config.h
Christoph M. Becker [Wed, 7 Aug 2019 11:24:05 +0000 (13:24 +0200)]
Fix detection of pg_config.h

pg_config.h is supposed to be placed right besides libpq-fe.h, so we
should check the same paths.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 7 Aug 2019 11:04:42 +0000 (13:04 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip test if ext/json is not available

5 years agoSkip test if ext/json is not available
Christoph M. Becker [Wed, 7 Aug 2019 11:02:23 +0000 (13:02 +0200)]
Skip test if ext/json is not available

Otherwise the test fails.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Wed, 7 Aug 2019 09:31:29 +0000 (11:31 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Make extension compatibility check more liberal

5 years agoMake extension compatibility check more liberal
Christoph M. Becker [Tue, 6 Aug 2019 09:53:41 +0000 (11:53 +0200)]
Make extension compatibility check more liberal

Checking for the exact linker version appears to be too restrictive; it
should be fine if the tens match.

We also refactor to avoid repeating ourselves.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 6 Aug 2019 15:29:13 +0000 (17:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78282: atime and mtime mismatch

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 6 Aug 2019 15:28:36 +0000 (17:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78282: atime and mtime mismatch

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 6 Aug 2019 15:27:32 +0000 (17:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78282: atime and mtime mismatch

5 years agoFix #78282: atime and mtime mismatch
Christoph M. Becker [Sat, 13 Jul 2019 07:40:50 +0000 (09:40 +0200)]
Fix #78282: atime and mtime mismatch

The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86.  We therefore enforce 64bit arithmetic to
avoid wrapping.

(cherry picked from commit bf242d58e77d50d4d8fdaaaca7ede686ec4467c0)

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 6 Aug 2019 13:33:27 +0000 (16:33 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Inline zend_zval_ptr() in executor explicitely (only on hot paths)

5 years agoInline zend_zval_ptr() in executor explicitely (only on hot paths)
Dmitry Stogov [Tue, 6 Aug 2019 13:28:42 +0000 (16:28 +0300)]
Inline zend_zval_ptr() in executor explicitely (only on hot paths)

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 6 Aug 2019 10:58:29 +0000 (13:58 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  typo

5 years agotypo
Dmitry Stogov [Tue, 6 Aug 2019 10:58:17 +0000 (13:58 +0300)]
typo

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 6 Aug 2019 09:45:48 +0000 (12:45 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Preloading is not comatible with dl() function

5 years agoPreloading is not comatible with dl() function
Dmitry Stogov [Tue, 6 Aug 2019 09:44:55 +0000 (12:44 +0300)]
Preloading is not comatible with dl() function

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 6 Aug 2019 08:37:08 +0000 (11:37 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't set GC_HAS_DESTRUCTORS flag if destructors were already called
  Update NEWS for 7.4.0beta3
  Update NEWS for PHP 7.4.0beta2

5 years agoDon't set GC_HAS_DESTRUCTORS flag if destructors were already called
Dmitry Stogov [Tue, 6 Aug 2019 08:35:53 +0000 (11:35 +0300)]
Don't set GC_HAS_DESTRUCTORS flag if destructors were already called

5 years agoUpdate NEWS for 7.4.0beta3
Derick Rethans [Tue, 6 Aug 2019 06:55:20 +0000 (06:55 +0000)]
Update NEWS for 7.4.0beta3

5 years agoUpdate NEWS for PHP 7.4.0beta2
Derick Rethans [Tue, 6 Aug 2019 06:54:01 +0000 (06:54 +0000)]
Update NEWS for PHP 7.4.0beta2

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 5 Aug 2019 19:56:03 +0000 (22:56 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78376 (Incorrect preloading of constant static properties)

5 years agoFixed bug #78376 (Incorrect preloading of constant static properties)
Dmitry Stogov [Mon, 5 Aug 2019 19:55:06 +0000 (22:55 +0300)]
Fixed bug #78376 (Incorrect preloading of constant static properties)

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 5 Aug 2019 09:39:09 +0000 (11:39 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix handling of succeeding XFAIL tests

5 years agoFix handling of succeeding XFAIL tests
Christoph M. Becker [Mon, 5 Aug 2019 09:35:17 +0000 (11:35 +0200)]
Fix handling of succeeding XFAIL tests

Due to a typo in commit e1151c9[1], succeeding XFAIL test without an
EXPECTF or EXPECTREGEX section have been reported reported as passed
instead of warned.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=e1151c9549cf5a7235c1609019f79bbb1bbcdbea>

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 4 Aug 2019 10:14:31 +0000 (12:14 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Support calling convention specific function name mangling

5 years agoSupport calling convention specific function name mangling
Christoph M. Becker [Fri, 26 Jul 2019 12:37:34 +0000 (14:37 +0200)]
Support calling convention specific function name mangling

On Windows certain calling conventions cause C function names to be
mangled, so to import them we have to use the properly mangled names.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 2 Aug 2019 15:05:01 +0000 (17:05 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78346: strip_tags no longer handling nested php tags

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 2 Aug 2019 15:03:47 +0000 (17:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78346: strip_tags no longer handling nested php tags

5 years agoFix #78346: strip_tags no longer handling nested php tags
Christoph M. Becker [Fri, 2 Aug 2019 15:03:20 +0000 (17:03 +0200)]
Fix #78346: strip_tags no longer handling nested php tags

When the strip tags state machine has been flattened, an if statement
has mistakenly been treated as else if.  We fix this, and also simplify
a bit right away.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 2 Aug 2019 14:46:06 +0000 (16:46 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78179: MariaDB server version incorrectly detected