]> granicus.if.org Git - php/log
php
5 years agoAdded arginfo stubs for IMAP extension
Stephen Reay [Sun, 22 Sep 2019 16:13:35 +0000 (18:13 +0200)]
Added arginfo stubs for IMAP extension

5 years agoAdd missing zend_parse_parameters_none()
Christoph M. Becker [Sun, 22 Sep 2019 16:19:37 +0000 (18:19 +0200)]
Add missing zend_parse_parameters_none()

5 years agoAdd skip reasons
Christoph M. Becker [Sun, 22 Sep 2019 16:55:20 +0000 (18:55 +0200)]
Add skip reasons

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 22 Sep 2019 16:43:45 +0000 (18:43 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix test to be skipped if dom is not available

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sun, 22 Sep 2019 16:43:24 +0000 (18:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test to be skipped if dom is not available

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 22 Sep 2019 16:42:40 +0000 (18:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test to be skipped if dom is not available

5 years agoFix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 16:39:55 +0000 (18:39 +0200)]
Fix test to be skipped if dom is not available

5 years agoJust return on ZPP exception
Christoph M. Becker [Sun, 22 Sep 2019 14:38:21 +0000 (16:38 +0200)]
Just return on ZPP exception

No need to return FALSE.

5 years agoFix arginfo of tidy_repair_string()
Christoph M. Becker [Sun, 22 Sep 2019 14:31:19 +0000 (16:31 +0200)]
Fix arginfo of tidy_repair_string()

Cf. 5356bad8c66d9df437c5136d02f6654a5b56b2b9.

5 years agoRemove unused parameter
Christoph M. Becker [Sun, 22 Sep 2019 14:28:42 +0000 (16:28 +0200)]
Remove unused parameter

The `$use_include_path` parameter doesn't make sense for
`tidy_repair_string()`, and actually unused, so we remove it.

5 years agoAdd ext/tidy stubs
Christoph M. Becker [Sun, 22 Sep 2019 14:17:23 +0000 (16:17 +0200)]
Add ext/tidy stubs

5 years agoProperly use zend_parse_method_parameters()
Christoph M. Becker [Sun, 22 Sep 2019 12:29:42 +0000 (14:29 +0200)]
Properly use zend_parse_method_parameters()

`zend_parse_method_parameters()` is meant for dual (procedural and OO)
APIs; there is no need to attempt to get "this" first, and to dispatch
to `zend_parse_parameters()` and `zend_parse_method_parameters()`,
respectively.

5 years agoAdd ext/dba stubs
Christoph M. Becker [Wed, 18 Sep 2019 15:54:25 +0000 (17:54 +0200)]
Add ext/dba stubs

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Sun, 22 Sep 2019 10:13:22 +0000 (12:13 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 10:10:49 +0000 (12:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 22 Sep 2019 10:10:42 +0000 (12:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix leak of temporary buffer during exif tag reading
Nikita Popov [Sun, 22 Sep 2019 10:10:17 +0000 (12:10 +0200)]
Fix leak of temporary buffer during exif tag reading

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Sun, 22 Sep 2019 08:27:21 +0000 (10:27 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 08:27:07 +0000 (10:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 22 Sep 2019 08:26:57 +0000 (10:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoEmploy zend_parse_method_parameters()
Christoph M. Becker [Sat, 21 Sep 2019 22:58:14 +0000 (00:58 +0200)]
Employ zend_parse_method_parameters()

5 years agoFix multiple leaks in exif_read_data()
Nikita Popov [Sat, 21 Sep 2019 18:38:24 +0000 (20:38 +0200)]
Fix multiple leaks in exif_read_data()

This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 21 Sep 2019 16:13:31 +0000 (18:13 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix length of key passed to zend_hash_str_find_ptr

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 21 Sep 2019 16:13:06 +0000 (18:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix length of key passed to zend_hash_str_find_ptr

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 21 Sep 2019 16:12:27 +0000 (18:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix length of key passed to zend_hash_str_find_ptr

5 years agoFix length of key passed to zend_hash_str_find_ptr
Jinesh Patel [Mon, 29 Jul 2019 18:21:25 +0000 (14:21 -0400)]
Fix length of key passed to zend_hash_str_find_ptr

5 years agoRemove unused parameter
Christoph M. Becker [Sat, 21 Sep 2019 14:25:17 +0000 (16:25 +0200)]
Remove unused parameter

Cf. <https://bugs.php.net/78579>.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 21 Sep 2019 14:18:20 +0000 (16:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78579: mb_decode_numericentity: args number inconsistency

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Sat, 21 Sep 2019 14:17:33 +0000 (16:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78579: mb_decode_numericentity: args number inconsistency

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 21 Sep 2019 14:16:09 +0000 (16:16 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency

5 years agoFix #78579: mb_decode_numericentity: args number inconsistency
Christoph M. Becker [Sat, 21 Sep 2019 13:56:06 +0000 (15:56 +0200)]
Fix #78579: mb_decode_numericentity: args number inconsistency

mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however.  Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.

For PHP 8, we will remove this parameter.

5 years ago[ci skip] Add phar + imap maintainer email
Bishop Bettini [Fri, 20 Sep 2019 16:59:50 +0000 (12:59 -0400)]
[ci skip] Add phar + imap maintainer email

Looks like commit c09b13cb (Add Bishop Bettini as maintainer for
phar & imap, 2019-03-16) missed adding my email address.

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Fri, 20 Sep 2019 11:30:28 +0000 (13:30 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78574 (broken shared build)

5 years agoFixed bug #78574 (broken shared build)
Remi Collet [Fri, 20 Sep 2019 11:30:13 +0000 (13:30 +0200)]
Fixed bug #78574 (broken shared build)

5 years agoMake MSVC happy again
Christoph M. Becker [Thu, 19 Sep 2019 18:06:28 +0000 (20:06 +0200)]
Make MSVC happy again

MSVC complains about unsupported preprocessor syntax, so we employ the
same workaround as in zend_cpuinfo.h.

5 years agoConvert soap functions arginfo to php stubs
Craig Duncan [Mon, 16 Sep 2019 17:07:49 +0000 (19:07 +0200)]
Convert soap functions arginfo to php stubs

We alos make the last parameter of `SoapClient::__setCookie()` and
`SoapFault::__construct()` properly nullable.

5 years agoConvert pcntl functions arginfo to php stubs
Craig Duncan [Mon, 26 Aug 2019 17:06:18 +0000 (18:06 +0100)]
Convert pcntl functions arginfo to php stubs

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 19 Sep 2019 20:46:45 +0000 (23:46 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Don't buid static libaraies when only DSO required

5 years agoDon't buid static libaraies when only DSO required
Dmitry Stogov [Thu, 19 Sep 2019 20:44:53 +0000 (23:44 +0300)]
Don't buid static libaraies when only DSO required

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 19:14:54 +0000 (21:14 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 19:14:46 +0000 (21:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 19:14:40 +0000 (21:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix out-of-bounds read in exif tag reading
Nikita Popov [Thu, 19 Sep 2019 19:11:57 +0000 (21:11 +0200)]
Fix out-of-bounds read in exif tag reading

This issue was recently introduced in c739023a50876e2a90588f915803b0140a95638e,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 19:02:20 +0000 (21:02 +0200)]
Merge branch 'PHP-7.4'

5 years agoClean up JSON parser
Nikita Popov [Thu, 19 Sep 2019 16:29:13 +0000 (18:29 +0200)]
Clean up JSON parser

Don't use <value> type for JSON tokens that don't have a value
and remove the errlex productions -- we're going to get an
unexpected token error anyway, there's no need to handle these
explicitly.

This also removes the awkward workarounds for the unused value
warnings.

5 years agoFixed 32-bit JIT
Dmitry Stogov [Thu, 19 Sep 2019 18:53:36 +0000 (21:53 +0300)]
Fixed 32-bit JIT

5 years agoConvert IMAP function aliases
Stephen Reay [Thu, 19 Sep 2019 09:37:58 +0000 (16:37 +0700)]
Convert IMAP function aliases

These are not really aliases, convert them to normal functions.

Closes GH-4725.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 15:22:34 +0000 (17:22 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 15:22:28 +0000 (17:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 15:21:45 +0000 (17:21 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix iterable return type optimization
Nikita Popov [Thu, 19 Sep 2019 15:20:10 +0000 (17:20 +0200)]
Fix iterable return type optimization

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 12:20:38 +0000 (14:20 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 12:20:13 +0000 (14:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 12:20:04 +0000 (14:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix exif leak on duplicate copyright tags
Nikita Popov [Thu, 19 Sep 2019 12:16:36 +0000 (14:16 +0200)]
Fix exif leak on duplicate copyright tags

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 09:36:29 +0000 (11:36 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 09:36:19 +0000 (11:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix typo
CJDennis [Wed, 18 Sep 2019 10:03:24 +0000 (20:03 +1000)]
Fix typo

`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour

5 years agoDon't make argument nullable based on AST null initializer
Nikita Popov [Wed, 18 Sep 2019 13:43:32 +0000 (15:43 +0200)]
Don't make argument nullable based on AST null initializer

Closes GH-4720.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 19 Sep 2019 07:17:53 +0000 (09:17 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78543: is_callable() on FFI\CData throws Exception

5 years agoFix #78543: is_callable() on FFI\CData throws Exception
Christoph M. Becker [Wed, 18 Sep 2019 09:55:20 +0000 (11:55 +0200)]
Fix #78543: is_callable() on FFI\CData throws Exception

If `Z_OBJ_HANDLER_P(callable, get_closure)` throws, we must not let the
exeception pass to userland, if called through `is_callable()`.

5 years agoIndicate entry is skipped in error message
George Peter Banyard [Sat, 31 Aug 2019 23:34:55 +0000 (01:34 +0200)]
Indicate entry is skipped in error message

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 14:37:23 +0000 (16:37 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 14:37:14 +0000 (16:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoRemove unstable test output
Nikita Popov [Wed, 18 Sep 2019 14:36:29 +0000 (16:36 +0200)]
Remove unstable test output

This may be printed in a different order, and we don't care about
it anyway.

5 years agoChange instructions to use oniguruma from git
Nikita Popov [Wed, 18 Sep 2019 12:11:36 +0000 (14:11 +0200)]
Change instructions to use oniguruma from git

Some bugs are already fixed there.

[ci skip]

5 years agoOptimize access to thread local cache.
Dmitry Stogov [Wed, 18 Sep 2019 11:03:07 +0000 (14:03 +0300)]
Optimize access to thread local cache.

This patch saves one CPU instruction on each "_tsrm_ls_cache" access in ZTS CLI/CGI/FPM builds.
This reduce typical instruction sequence for EG(current_execute_data) access from 4 to 3 CPU instructions.

5 years agoAdd instructions for building an instrumented libonig
Nikita Popov [Wed, 18 Sep 2019 09:53:15 +0000 (11:53 +0200)]
Add instructions for building an instrumented libonig

[ci skip]

5 years agoConvert session functions arginfo to php stubs
Craig Duncan [Sat, 10 Aug 2019 15:50:18 +0000 (16:50 +0100)]
Convert session functions arginfo to php stubs

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 08:45:19 +0000 (10:45 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 08:45:07 +0000 (10:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFixed bug #78272
Nikita Popov [Wed, 18 Sep 2019 07:44:00 +0000 (09:44 +0200)]
Fixed bug #78272

Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().

The check is based on
https://github.com/mono/mono/commit/f879e35e3ed7496d819bd766deb8be6992d068ed.

5 years agoAdd debugging code to usleep()
Nikita Popov [Wed, 18 Sep 2019 08:13:35 +0000 (10:13 +0200)]
Add debugging code to usleep()

To see if intermittent CI failures are caused by a signal interrupt.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 07:31:52 +0000 (09:31 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:31:44 +0000 (09:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoBackport MAP_JIT fixes from PCRE2 10.33
Nikita Popov [Wed, 18 Sep 2019 07:28:54 +0000 (09:28 +0200)]
Backport MAP_JIT fixes from PCRE2 10.33

This is intended to fix the primary issue from bug #77260.

Prior to macOS 10.14 multiple MAP_JIT segments were not permitted,
leading to mmap failures and corresponding "no more memory" errors
on macOS 10.13.

5 years agoChange XMLWriter resources to objects
Christoph M. Becker [Sat, 14 Sep 2019 16:31:59 +0000 (18:31 +0200)]
Change XMLWriter resources to objects

While we generally prefer objects over resources for quite a while, the
procedural XMLWriter API still uses resources, although there is
already an object-oriented API which uses objects.  This dichotomy
makes no sense, slightly complicates the implementation, and doesn't
allow a stepwise migration to the object-oriented API, which might be
desired.  Thus we completely drop the XMLWriter resources in favor of
XMLWriter objects.

We consider the minor BC break acceptable for a major version, since
only explicit type checks (`is_resource()`, `gettype()` etc.) need to
be adapted.

5 years agoUpgrading notes for removed ext/dom classes.
Benjamin Eberlei [Tue, 17 Sep 2019 21:52:08 +0000 (23:52 +0200)]
Upgrading notes for removed ext/dom classes.

5 years agoCleanup ext/dom: Removal of unimplemented dummy classes.
Benjamin Eberlei [Sun, 15 Sep 2019 13:09:33 +0000 (15:09 +0200)]
Cleanup ext/dom: Removal of unimplemented dummy classes.

The following classes were registered in ext/dom but
neither documented nor had any behavior (only test data).
These classes are now removed:

- DOMNameList
- DomImplementationList
- DOMConfiguration
- DomError
- DomErrorHandler
- DOMImplementationSource
- DOMLocator
- DOMUserDataHandler
- DOMTypeInfo

5 years agoUpdate NEWS for 7.4.0RC3
Derick Rethans [Tue, 17 Sep 2019 16:39:07 +0000 (16:39 +0000)]
Update NEWS for 7.4.0RC3

5 years agoUpdate NEWS for PHP 7.4.0RC2
Derick Rethans [Tue, 17 Sep 2019 16:37:49 +0000 (16:37 +0000)]
Update NEWS for PHP 7.4.0RC2

5 years agoMerge branch 'PHP-7.4'
Derick Rethans [Tue, 17 Sep 2019 16:34:31 +0000 (17:34 +0100)]
Merge branch 'PHP-7.4'

5 years agoRevert "Update NEWS for PHP 7.4.0RC2"
Derick Rethans [Tue, 17 Sep 2019 16:32:33 +0000 (17:32 +0100)]
Revert "Update NEWS for PHP 7.4.0RC2"

This reverts commit 050059cb269f3581901d3ac4d155292fee95d4cf.

5 years agoRevert "Update NEWS for 7.4.0RC3"
Derick Rethans [Tue, 17 Sep 2019 16:32:31 +0000 (17:32 +0100)]
Revert "Update NEWS for 7.4.0RC3"

This reverts commit 803dc6b8f2ea1f9314d19eb242365f32a364437e.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 15:34:31 +0000 (17:34 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 15:34:24 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoIncrease timeout in test
Nikita Popov [Tue, 17 Sep 2019 15:33:46 +0000 (17:33 +0200)]
Increase timeout in test

5 years agoImplement NUL byte checks for dbnames
Christoph M. Becker [Tue, 10 Sep 2019 11:02:59 +0000 (13:02 +0200)]
Implement NUL byte checks for dbnames

Since we're passing these parameter to C functions accepting `char*`
without any further checking, we should reject strings with NUL bytes
in the first place.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 14:18:03 +0000 (16:18 +0200)]
Merge branch 'PHP-7.4'

5 years agoEnable --with-mhash on CI
Nikita Popov [Tue, 17 Sep 2019 14:16:31 +0000 (16:16 +0200)]
Enable --with-mhash on CI

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 13:43:57 +0000 (15:43 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 17 Sep 2019 13:43:35 +0000 (15:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 17 Sep 2019 13:42:42 +0000 (15:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix #76342: file_get_contents waits twice specified timeout
fancyweb [Mon, 29 Jul 2019 22:33:13 +0000 (00:33 +0200)]
Fix #76342: file_get_contents waits twice specified timeout

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 17 Sep 2019 12:44:40 +0000 (15:44 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI

5 years agoFixed CLI/CGI/FPM build, when they are built together with Apache SAPI
Dmitry Stogov [Tue, 17 Sep 2019 12:43:00 +0000 (15:43 +0300)]
Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 17 Sep 2019 11:15:01 +0000 (13:15 +0200)]
Merge branch 'PHP-7.4'

5 years agoCheck for exception after calling count_values()
Nikita Popov [Tue, 17 Sep 2019 11:13:44 +0000 (13:13 +0200)]
Check for exception after calling count_values()

To avoid a duplicate error if count_values() throws.