]> granicus.if.org Git - php/log
php
5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 12 Jul 2019 16:56:09 +0000 (18:56 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  No more need to cater to pre-PHP-5.3 or PHP-6 versions

5 years agoNo more need to cater to pre-PHP-5.3 or PHP-6 versions
Christoph M. Becker [Fri, 12 Jul 2019 16:50:54 +0000 (18:50 +0200)]
No more need to cater to pre-PHP-5.3 or PHP-6 versions

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 15:22:58 +0000 (17:22 +0200)]
Merge branch 'PHP-7.4'

5 years agoDon't split T_INLINE_HTML at partial PHP tag
Nikita Popov [Fri, 12 Jul 2019 15:22:11 +0000 (17:22 +0200)]
Don't split T_INLINE_HTML at partial PHP tag

If <?php occurs without required trailing whitespace, we should keep
it as part of a single T_INLINE_HTML region.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 14:52:00 +0000 (16:52 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 12 Jul 2019 14:51:52 +0000 (16:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Jul 2019 14:51:47 +0000 (16:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoUse TRY_ADDREF/TRY_DELREF in soap
Nikita Popov [Fri, 12 Jul 2019 14:50:43 +0000 (16:50 +0200)]
Use TRY_ADDREF/TRY_DELREF in soap

The DELREF part is a possible fix for bug #78278, the ADDREF part
is a drive-by fix.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 14:30:54 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 12 Jul 2019 14:30:47 +0000 (16:30 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Jul 2019 14:29:55 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #78279
Nikita Popov [Fri, 12 Jul 2019 14:29:18 +0000 (16:29 +0200)]
Fixed bug #78279

Even if we don't initialize the callback on every request, we
should still reset our globals to default values...

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 12 Jul 2019 12:36:10 +0000 (14:36 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Update NEWS and UPGRADING wrt. ext/recode unbundling

5 years agoUpdate NEWS and UPGRADING wrt. ext/recode unbundling
Christoph M. Becker [Fri, 12 Jul 2019 12:35:44 +0000 (14:35 +0200)]
Update NEWS and UPGRADING wrt. ext/recode unbundling

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 12 Jul 2019 11:58:42 +0000 (13:58 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Removed ext/recode

5 years agoRemoved ext/recode
Christoph M. Becker [Fri, 12 Jul 2019 11:58:17 +0000 (13:58 +0200)]
Removed ext/recode

Cf. <https://wiki.php.net/rfc/unbundle_recode>.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 12 Jul 2019 11:28:39 +0000 (13:28 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Swap implode() argument order in the test helper

5 years agoSwap implode() argument order in the test helper
Christoph M. Becker [Fri, 12 Jul 2019 11:26:54 +0000 (13:26 +0200)]
Swap implode() argument order in the test helper

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 11:18:53 +0000 (13:18 +0200)]
Merge branch 'PHP-7.4'

5 years agoRemove duplicate XtOffsetOf() definitions in php.h
Nikita Popov [Fri, 12 Jul 2019 11:18:18 +0000 (13:18 +0200)]
Remove duplicate XtOffsetOf() definitions in php.h

These are already defined in zend_portability.h.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 11:14:38 +0000 (13:14 +0200)]
Merge branch 'PHP-7.4'

5 years agoRemove unused tsrm_strtok_r() function
Nikita Popov [Fri, 12 Jul 2019 11:12:56 +0000 (13:12 +0200)]
Remove unused tsrm_strtok_r() function

There is also a php_strtok_r() function, which is actually used,
but nothing uses the tsrm_strtok_r() variant...

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 10:55:21 +0000 (12:55 +0200)]
Merge branch 'PHP-7.4'

5 years agoRemove unnecessary uses of allow_url_include in tests
Nikita Popov [Fri, 12 Jul 2019 10:43:41 +0000 (12:43 +0200)]
Remove unnecessary uses of allow_url_include in tests

5 years agoRemove unnecessary uses of restore_include_path() in tests
Nikita Popov [Fri, 12 Jul 2019 10:17:24 +0000 (12:17 +0200)]
Remove unnecessary uses of restore_include_path() in tests

5 years agoSwap implode() argument order in some tests
Nikita Popov [Fri, 12 Jul 2019 08:43:32 +0000 (10:43 +0200)]
Swap implode() argument order in some tests

5 years agoImprove bless_tests
Nikita Popov [Fri, 12 Jul 2019 08:34:49 +0000 (10:34 +0200)]
Improve bless_tests

If a string var_dump contains a wildcard, also make the length a
wildcard.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Fri, 12 Jul 2019 08:42:11 +0000 (11:42 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use common code for double math

5 years agoUse common code for double math
Dmitry Stogov [Fri, 12 Jul 2019 08:40:56 +0000 (11:40 +0300)]
Use common code for double math

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 11 Jul 2019 21:34:09 +0000 (23:34 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Temporarily skip test"

5 years agoRevert "Temporarily skip test"
Christoph M. Becker [Thu, 11 Jul 2019 21:33:34 +0000 (23:33 +0200)]
Revert "Temporarily skip test"

This reverts commit 4e5a717866ed18c5ee539e339e33cc71f0ac8a88.

As of commit 17f7fb76053cabe20225472debe4d1801221ef9f the test should
no longer hang.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 11 Jul 2019 21:01:31 +0000 (00:01 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Allow GOTO style helpers in HYBRID VM

5 years agoAllow GOTO style helpers in HYBRID VM
Dmitry Stogov [Thu, 11 Jul 2019 21:00:55 +0000 (00:00 +0300)]
Allow GOTO style helpers in HYBRID VM

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 11 Jul 2019 17:45:12 +0000 (20:45 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Separate "cold" parts of comparison instructions

5 years agoSeparate "cold" parts of comparison instructions
Dmitry Stogov [Thu, 11 Jul 2019 17:44:39 +0000 (20:44 +0300)]
Separate "cold" parts of comparison instructions

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 11 Jul 2019 15:23:48 +0000 (18:23 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Separate "cold" parts of binary op instructions

5 years agoSeparate "cold" parts of binary op instructions
Dmitry Stogov [Thu, 11 Jul 2019 15:23:08 +0000 (18:23 +0300)]
Separate "cold" parts of binary op instructions

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 15:09:23 +0000 (17:09 +0200)]
Merge branch 'PHP-7.4'

5 years agoRemove redundant 64-bit ezmlm_hash() test
Nikita Popov [Thu, 11 Jul 2019 15:03:48 +0000 (17:03 +0200)]
Remove redundant 64-bit ezmlm_hash() test

This test is the same as the as ezmlm_hash_basic.phpt. This function
does not behave differently on 32-bit and 64-bit.

5 years agoAdd ZEND_DEP_ME macro
Nikita Popov [Thu, 11 Jul 2019 11:40:20 +0000 (13:40 +0200)]
Add ZEND_DEP_ME macro

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 14:20:22 +0000 (16:20 +0200)]
Merge branch 'PHP-7.4'

5 years agoConvert short tag to standard tag in Zend test file
George Peter Banyard [Thu, 11 Jul 2019 14:06:41 +0000 (16:06 +0200)]
Convert short tag to standard tag in Zend test file

Closes GH-4389.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 13:49:02 +0000 (15:49 +0200)]
Merge branch 'PHP-7.4'

5 years agoSwitch to using shell-less proc_open() in various server tests
Nikita Popov [Mon, 1 Jul 2019 11:07:30 +0000 (13:07 +0200)]
Switch to using shell-less proc_open() in various server tests

5 years agoSupport redirect+null descriptors in proc_open
Nikita Popov [Fri, 5 Jul 2019 15:41:59 +0000 (17:41 +0200)]
Support redirect+null descriptors in proc_open

This adds support for doing something like:

    [1 => ['pipe', 'w'], 2 => ['redirect', 1]]

This will make descriptor 2 on the child end a dup'd descriptor 1.
This is mainly useful in conjunction with shell-less mode, because
we don't have an easy way to do "2>&1" there.

Additionally we support:

    [1 => ['pipe', 'w'], 2 => ['null']]

Which would be the same as a >/dev/null or >nul redirect, depending
on platform.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 12:15:02 +0000 (14:15 +0200)]
Merge branch 'PHP-7.4'

5 years agoDon't call Reflection::export() internally
Nikita Popov [Thu, 11 Jul 2019 12:13:05 +0000 (14:13 +0200)]
Don't call Reflection::export() internally

export() methods were implemented in a roundabout way, where they
would call Reflection::export(), which would then call __toString().
Cut out the middleman by directly calling __toString().

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Thu, 11 Jul 2019 11:11:40 +0000 (13:11 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78212: Segfault in built-in webserver

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Thu, 11 Jul 2019 11:10:41 +0000 (13:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78212: Segfault in built-in webserver

5 years agoFix #78212: Segfault in built-in webserver
Christoph M. Becker [Thu, 27 Jun 2019 09:34:51 +0000 (11:34 +0200)]
Fix #78212: Segfault in built-in webserver

Since syslog's ident and facility parameters have been added to
config[1], vsyslog() segfaults on Windows, if openlog() has not been
called before.  We bring back the removed lines to fix this.

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

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 11:00:06 +0000 (13:00 +0200)]
Merge branch 'PHP-7.4'

5 years agoInclude test name in JUnit testcase name
Nikita Popov [Thu, 11 Jul 2019 10:45:49 +0000 (12:45 +0200)]
Include test name in JUnit testcase name

Azure does not show the classname attribute in any convenient way,
and the file name is the part we usually care about.

5 years agoMake proc_open_bug64438.phpt more robust
Nikita Popov [Thu, 11 Jul 2019 10:32:57 +0000 (12:32 +0200)]
Make proc_open_bug64438.phpt more robust

The test currently assumes that we'll first read the data of
stdout and stderr and then see eof on stdout and stderr. However
we could also read stdout, see eof on stdout, read stderr and see
eof on stderr, depending on timing.

Avoid output ordering issues by collecting events into a per-pipe
array, so interleaving is not visible.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Thu, 11 Jul 2019 09:04:51 +0000 (12:04 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  neon vectorization for base64

5 years agoneon vectorization for base64
Sebastian Pop [Wed, 3 Jul 2019 20:10:38 +0000 (20:10 +0000)]
neon vectorization for base64

A similar algorithm is used to vectorize on x86_64, with a good description in
https://arxiv.org/abs/1704.00605 . On AArch64 the implementation differs in that
instead of using multiplies to shift bits around, it uses the vld3+vst4 and
vld4+vst3 combinations to load and store interleaved data.  This patch is based
on the NEON implementation of Wojciech Mula:
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
https://github.com/WojciechMula/base64simd/blob/master/encode/lookup.neon.cpp
and
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
adapted to php/ext/standard/base64.c and vectorized with factor 16 instead of 8.

On a Graviton A1 instance and on the synthetic benchmarks in
https://github.com/lemire/fastbase64 I see 175% speedup on base64 encoding and
60% speedup on base64 decode compared to the scalar implementation.

The patch passes `make test` regression testing on aarch64-linux.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 08:30:14 +0000 (10:30 +0200)]
Merge branch 'PHP-7.4'

5 years ago[AArch64] Use crc32 instructions when available
Sebastian Pop [Wed, 1 May 2019 16:05:11 +0000 (16:05 +0000)]
[AArch64] Use crc32 instructions when available

The time goes from 0.838s down to 0.029s (a 28x speedup) on a Graviton A1
instance and the following benchmark:

function simple_crc32() {
  $a = "foo";
  for ($i = 0; $i < 10000; $i++) {
      crc32($a);
      $a .= "o".$i;
  }
}

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 08:26:59 +0000 (10:26 +0200)]
Merge branch 'PHP-7.4'

5 years agoAdd server conflict to soap custom content type test
Nikita Popov [Thu, 11 Jul 2019 08:26:19 +0000 (10:26 +0200)]
Add server conflict to soap custom content type test

5 years agoMerge branch 'PHP-7.4'
Peter Kokot [Thu, 11 Jul 2019 00:02:01 +0000 (02:02 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Refactor undefining PACKAGE_* symbols

5 years agoRefactor undefining PACKAGE_* symbols
Peter Kokot [Thu, 11 Jul 2019 00:00:51 +0000 (02:00 +0200)]
Refactor undefining PACKAGE_* symbols

Instead of patching configuration headers template generated by
the given tools - autoheader, this moves patching these symbols to
the configure step before creating and invoking the config.status
and before the configuration header file is generated from the
patched template.

Closes GH-4374

5 years agoMerge branch 'PHP-7.4'
Peter Kokot [Wed, 10 Jul 2019 19:20:10 +0000 (21:20 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove TSRM/tsrm_config.w32.h

5 years agoRemove TSRM/tsrm_config.w32.h
Peter Kokot [Wed, 10 Jul 2019 19:19:44 +0000 (21:19 +0200)]
Remove TSRM/tsrm_config.w32.h

The tsrm_config.w32.h file is a simple wrapper for already defined
symbols and includes elsewhere.

Closes GH-4383

5 years agoDrop support for JIT without SSE
Nikita Popov [Wed, 10 Jul 2019 13:44:02 +0000 (15:44 +0200)]
Drop support for JIT without SSE

Closes GH-4388.

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 10 Jul 2019 15:29:56 +0000 (18:29 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Set expectation to reduce hot code fragmentation

5 years agoSet expectation to reduce hot code fragmentation
Dmitry Stogov [Wed, 10 Jul 2019 15:29:35 +0000 (18:29 +0300)]
Set expectation to reduce hot code fragmentation

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 15:28:52 +0000 (17:28 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 10 Jul 2019 15:28:37 +0000 (17:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFix bug #78271
Nikita Popov [Wed, 10 Jul 2019 15:25:04 +0000 (17:25 +0200)]
Fix bug #78271

When cleaning nops in the dfa pass, we were always keeping the
smart branch inhibiting nop that occurs directly before the jump
instruction. However, as we skip unreachable blocks entirely, it
may happen that we need to keep a nop that occurs further back,
prior to the unreachable blocks. Account for that case now.

We should really do something about the smart branch situation,
this is very fragile...

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 13:19:43 +0000 (15:19 +0200)]
Merge branch 'PHP-7.4'

5 years agoAlign segments on huge page boundary only for x86
Cyril Pascal [Wed, 10 Jul 2019 11:50:46 +0000 (12:50 +0100)]
Align segments on huge page boundary only for x86

Closes GH-4387.

5 years agoRead from original address
Nikita Popov [Wed, 10 Jul 2019 12:12:02 +0000 (14:12 +0200)]
Read from original address

References are derefed into FCARG1, which is later clobbered by the
undef handling code. Make sure we load from the original address
instead.

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

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 10 Jul 2019 11:10:07 +0000 (13:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoAdd CONFLICTS to recognized sections
Nikita Popov [Wed, 10 Jul 2019 11:09:06 +0000 (13:09 +0200)]
Add CONFLICTS to recognized sections

It does nothing on 7.3, but this makes it easier to write tests in
3rd party extensions.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 10:55:52 +0000 (12:55 +0200)]
Merge branch 'PHP-7.4'

5 years agoFix file collisions in phar tests
Nikita Popov [Wed, 10 Jul 2019 10:55:40 +0000 (12:55 +0200)]
Fix file collisions in phar tests

5 years agoAdditional fix for mysqli_fork test
Nikita Popov [Wed, 10 Jul 2019 10:42:17 +0000 (12:42 +0200)]
Additional fix for mysqli_fork test

5 years agoImplement array access notice in JIT
Nikita Popov [Wed, 10 Jul 2019 10:20:16 +0000 (12:20 +0200)]
Implement array access notice in JIT

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 10:05:24 +0000 (12:05 +0200)]
Merge branch 'PHP-7.4'

5 years agoThrow notice on array access on illegal type
Nikita Popov [Wed, 10 Jul 2019 08:28:58 +0000 (10:28 +0200)]
Throw notice on array access on illegal type

No notice is thrown for list() accesses, because we did not come
to an agreement regarding patterns like

    while ([$key, $value] = yield $it->next()) { ... }

where silent null access may be desirable.

No effort is made to suppress multiple notices in access chains
likes $x[0][0][0], because the technical complexity this causes
does not seem worthwhile.

RFC: https://wiki.php.net/rfc/notice-for-non-valid-array-container

5 years agoFix invalid array access in mysqli_fork test
Nikita Popov [Wed, 10 Jul 2019 09:39:30 +0000 (11:39 +0200)]
Fix invalid array access in mysqli_fork test

5 years agoReduce cost for GC references to strings and resources in JIT
Dmitry Stogov [Wed, 10 Jul 2019 09:41:19 +0000 (12:41 +0300)]
Reduce cost for GC references to strings and resources in JIT

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 10 Jul 2019 09:29:26 +0000 (12:29 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Reduce cost for references to strings and resources

5 years agoReduce cost for references to strings and resources
Dmitry Stogov [Wed, 10 Jul 2019 09:27:59 +0000 (12:27 +0300)]
Reduce cost for references to strings and resources

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 09:11:30 +0000 (11:11 +0200)]
Merge branch 'PHP-7.4'

5 years agoRename support_strings to !is_list
Nikita Popov [Wed, 10 Jul 2019 08:17:40 +0000 (10:17 +0200)]
Rename support_strings to !is_list

In preparation for more behavior that depends on whether it it is
a list() access. Using support_strings for that would be
confusing.

5 years agoSimplify two unserialize() tests
Nikita Popov [Wed, 10 Jul 2019 09:04:48 +0000 (11:04 +0200)]
Simplify two unserialize() tests

unserialize() returns false for these now, so it doesn't make sense
to try and do something with the result.

5 years agoFix iteration limits in SXE test
Nikita Popov [Wed, 10 Jul 2019 08:57:02 +0000 (10:57 +0200)]
Fix iteration limits in SXE test

Test doesn't look like it's specifically testing out of bounds
access, just two different iteration patterns, so make sure the
limits are correct.

5 years agoClean up DateTimeZone::getLocation() test
Nikita Popov [Wed, 10 Jul 2019 08:52:54 +0000 (10:52 +0200)]
Clean up DateTimeZone::getLocation() test

And avoid invalid array access.

5 years agoAvoid invalid array access in fcgi.inc
Nikita Popov [Wed, 10 Jul 2019 08:44:33 +0000 (10:44 +0200)]
Avoid invalid array access in fcgi.inc

5 years agoMerge branch 'PHP-7.4'
Remi Collet [Wed, 10 Jul 2019 07:00:54 +0000 (09:00 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  improve libargon2/libsodium compatibility

5 years agoimprove libargon2/libsodium compatibility
Remi Collet [Wed, 10 Jul 2019 07:00:41 +0000 (09:00 +0200)]
improve libargon2/libsodium compatibility

5 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 9 Jul 2019 15:53:57 +0000 (17:53 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use e.g. instead of less common f.e. [ci skip]

5 years agoUse e.g. instead of less common f.e. [ci skip]
Peter Kokot [Tue, 9 Jul 2019 15:53:46 +0000 (17:53 +0200)]
Use e.g. instead of less common f.e. [ci skip]

5 years agoMerge branch 'PHP-7.4'
Sara Golemon [Tue, 9 Jul 2019 15:37:08 +0000 (11:37 -0400)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Relax argon2 mem_cost down to 64k, bump time_cost to 4

5 years agoRelax argon2 mem_cost down to 64k, bump time_cost to 4
Sara Golemon [Tue, 9 Jul 2019 15:18:13 +0000 (11:18 -0400)]
Relax argon2 mem_cost down to 64k, bump time_cost to 4

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 9 Jul 2019 14:20:12 +0000 (16:20 +0200)]
Merge branch 'PHP-7.4'

5 years agoCGI: Fix memory leak on error paths
David Carlier [Mon, 8 Jul 2019 16:07:45 +0000 (16:07 +0000)]
CGI: Fix memory leak on error paths

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Tue, 9 Jul 2019 11:02:12 +0000 (14:02 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid unintended inlining