]> granicus.if.org Git - php/log
php
5 years agoSome more string conversion handling, fixing bug #77958
Côme Chilliet [Thu, 13 Jun 2019 20:12:34 +0000 (22:12 +0200)]
Some more string conversion handling, fixing bug #77958

5 years agoAvoid converting zval when not needed
Côme Chilliet [Thu, 13 Jun 2019 18:58:45 +0000 (20:58 +0200)]
Avoid converting zval when not needed

Also added exception checks so that exception from __toString are
 correctly handled in the future

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:52:22 +0000 (12:52 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #78106
Nikita Popov [Thu, 13 Jun 2019 10:51:35 +0000 (12:51 +0200)]
Fixed bug #78106

When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:38:57 +0000 (12:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd test for bug #78106
Nikita Popov [Thu, 13 Jun 2019 10:35:29 +0000 (12:35 +0200)]
Add test for bug #78106

Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.

5 years agoBe more precise about possible types for mysqli methods
Tyson Andre [Sun, 9 Jun 2019 21:37:38 +0000 (17:37 -0400)]
Be more precise about possible types for mysqli methods

mysqli has an uncommon approach to 64-bit compatibility:
it will convert numbers that can't be represented on 32-bit
platforms to a string.
This is documented at
https://www.php.net/manual/en/mysqli-stmt.affected-rows.php#refsect1-mysqli-stmt.affected-rows-returnvalues

So if there's a query to a remote mysqli server that affects
more than 2.2 billion rows, then the opcache inference might be
incorrect.

(It's possible to add a MAY_BE_STRING_ON_32_BIT_PLATFORM bitflag macro to
account for this, but I don't think there's a need or want to?)

Patches 3162285b86871fb22a85a50ce9bc30823da64b6a

This is based on the list of php 7.4 functions using
MYSQLI_RETURN_LONG_INT in mysqli_api.c

5 years agoFix opcache signatures for mysqli_stat
Tyson Andre [Sun, 9 Jun 2019 21:32:04 +0000 (17:32 -0400)]
Fix opcache signatures for mysqli_stat

See mysqli_api.c and https://www.php.net/manual/en/mysqli.stat.php

5 years agoFix bug in opcache flags for mysqli_get_charset
Tyson Andre [Sun, 9 Jun 2019 20:35:34 +0000 (16:35 -0400)]
Fix bug in opcache flags for mysqli_get_charset

https://www.php.net/manual/en/mysqli.get-charset.php
tests/mysqli_field_seek.phpt has a test of this returning an object.

Looking at the source in ext/mysqli/mysqli_nonapi.c,
this should be object|null, not array|null

This might actually cause bugs in opcache's inferences,
(no proof of this)
so it might make sense to pull this patch into an earlier minor version.

5 years agoNext is 7.3.8
Christoph M. Becker [Tue, 11 Jun 2019 11:31:30 +0000 (13:31 +0200)]
Next is 7.3.8

5 years agonext is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:18:43 +0000 (12:18 +0200)]
next is 7.2.21

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 11 Jun 2019 10:19:17 +0000 (12:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  next is 7.2.21

5 years agonext is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:18:43 +0000 (12:18 +0200)]
next is 7.2.21

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Tue, 11 Jun 2019 06:43:20 +0000 (08:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77937: preg_match failed

5 years agoFix #77937: preg_match failed
Christoph M. Becker [Tue, 30 Apr 2019 14:10:04 +0000 (16:10 +0200)]
Fix #77937: preg_match failed

On some recent Windows systems, ext\pcre\tests\locales.phpt fails,
because 'pt_PT' is accepted by `setlocale()`, but not properly
supported by the ctype functions, which are used internally by PCRE2 to
build the localized character tables.

Since there appears to be no way to properly check whether a given
locale is fully supported, but we want to minimize BC impact, we filter
out typical Unix locale names, except for a few cases which have
already been properly supported on Windows.  This way code like

  setlocale(LC_ALL, 'de_DE.UTF-8', 'de_DE', 'German_Germany.1252');

should work like on older Windows systems.

It should be noted that the locale names causing trouble are not (yet)
documented as valid names anyway, see
<https://docs.microsoft.com/en-us/cpp/c-runtime-library/locale-names-languages-and-country-region-strings?view=vs-2019>.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Mon, 10 Jun 2019 09:52:50 +0000 (12:52 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed possible misalignment in 32-bit build.

5 years agoFixed possible misalignment in 32-bit build.
Dmitry Stogov [Mon, 10 Jun 2019 09:51:59 +0000 (12:51 +0300)]
Fixed possible misalignment in 32-bit build.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sun, 9 Jun 2019 20:54:59 +0000 (22:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Extend wildcard files section in EditorConfig [ci skip]

5 years agoExtend wildcard files section in EditorConfig [ci skip]
Peter Kokot [Sun, 9 Jun 2019 20:53:58 +0000 (22:53 +0200)]
Extend wildcard files section in EditorConfig [ci skip]

Changes:
- Trim trailing whitespace for all files except patches. There isn't
  really any practical reason to not trim the trailing whitespace in all
  other files. Binary files or phpt files that include trailing
  whitespace as part of the test should be manually set in editors/IDEs
  or by disabling the editorconfig for particular editing.
- Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml,
  *.xsd, *.xsl, buildconf, and Makefile* files settings.

Closes #4156

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 7 Jun 2019 09:38:37 +0000 (12:38 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Restored NEWS entry

5 years agoRestored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:37:49 +0000 (12:37 +0300)]
Restored NEWS entry

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Jun 2019 08:57:43 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoEnable STRICT_TRANS_TABLES in new test
Nikita Popov [Fri, 7 Jun 2019 08:26:37 +0000 (10:26 +0200)]
Enable STRICT_TRANS_TABLES in new test

The part testing error cases relies on this.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Fri, 7 Jun 2019 08:48:57 +0000 (11:48 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)

5 years agoFixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:36:39 +0000 (11:36 +0300)]
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Jun 2019 07:49:01 +0000 (09:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #38546
Cameron Porter [Wed, 6 Mar 2019 06:33:40 +0000 (00:33 -0600)]
Fixed bug #38546

Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 6 Jun 2019 13:00:35 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test regarding Unix Domain Sockets on Windows

5 years agoFix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 12:56:47 +0000 (14:56 +0200)]
Fix test regarding Unix Domain Sockets on Windows

Recent Windows versions actually support Unix Domain Sockets.  Cf.
<https://github.com/curl/curl/pull/3939>.

5 years agoFix #78114: segfault when calling sodium_* functions from eval
Christoph M. Becker [Thu, 6 Jun 2019 07:29:44 +0000 (09:29 +0200)]
Fix #78114: segfault when calling sodium_* functions from eval

We must not follow the NULL pointer.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Wed, 5 Jun 2019 14:35:43 +0000 (16:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix flaky posix test

5 years agofix flaky posix test
Joe Watkins [Wed, 5 Jun 2019 14:34:50 +0000 (16:34 +0200)]
fix flaky posix test

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Jun 2019 14:27:45 +0000 (16:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #78050
Nikita Popov [Tue, 4 Jun 2019 13:08:16 +0000 (15:08 +0200)]
Fixed bug #78050

This is a backport of a9821255612a99f9773c3601ff1914de4e7a7e32.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Jun 2019 14:14:14 +0000 (16:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoReload tsrmls_id in release builds as well
Nikita Popov [Tue, 4 Jun 2019 13:23:10 +0000 (15:23 +0200)]
Reload tsrmls_id in release builds as well

If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.

5 years agothis was in 7.3.5, not 7.3.6
Remi Collet [Tue, 4 Jun 2019 05:19:29 +0000 (07:19 +0200)]
this was in 7.3.5, not 7.3.6

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 3 Jun 2019 13:15:07 +0000 (15:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoClear errors after SSL_CTX_load_verify_locations()
Nikita Popov [Mon, 3 Jun 2019 13:14:01 +0000 (15:14 +0200)]
Clear errors after SSL_CTX_load_verify_locations()

We report our own errors here. Make sure these don't clog up the
error queue.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 2 Jun 2019 18:13:18 +0000 (19:13 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)
Jakub Zelenka [Sun, 2 Jun 2019 18:10:56 +0000 (19:10 +0100)]
Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)

It also fixes invalid setting of tag length

5 years agoFix expect section
Anatol Belski [Sat, 1 Jun 2019 12:49:57 +0000 (14:49 +0200)]
Fix expect section

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Sat, 1 Jun 2019 11:44:10 +0000 (13:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update SDK version for AppVeyor

5 years agoUpdate SDK version for AppVeyor
Anatol Belski [Sat, 1 Jun 2019 11:43:31 +0000 (13:43 +0200)]
Update SDK version for AppVeyor

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Sat, 1 Jun 2019 00:26:07 +0000 (02:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Change ZPP only if compiled with ICU >= 64
  Update tests for ICU 64

5 years agoChange ZPP only if compiled with ICU >= 64
Anatol Belski [Sat, 1 Jun 2019 00:18:56 +0000 (02:18 +0200)]
Change ZPP only if compiled with ICU >= 64

5 years agoUpdate tests for ICU 64
Nikita Popov [Fri, 31 May 2019 13:39:03 +0000 (15:39 +0200)]
Update tests for ICU 64

(cherry picked from commit 8a8bc5c4529223ecf4f421b1bed03618f7394335)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Fri, 31 May 2019 18:50:17 +0000 (20:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix var name

5 years agoFix var name
Anatol Belski [Fri, 31 May 2019 18:49:42 +0000 (20:49 +0200)]
Fix var name

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Craig Duncan [Thu, 30 May 2019 17:55:55 +0000 (18:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Add a test for bug #65672
  Ensure the internal properties cannot be overwritten

5 years agoAdd a test for bug #65672
Craig Duncan [Tue, 20 Feb 2018 21:12:43 +0000 (21:12 +0000)]
Add a test for bug #65672

5 years agoEnsure the internal properties cannot be overwritten
Craig Duncan [Tue, 20 Feb 2018 21:11:03 +0000 (21:11 +0000)]
Ensure the internal properties cannot be overwritten

5 years agoSCCP: Fix leak when determining TYPE_CHECK from type info
Nikita Popov [Wed, 29 May 2019 14:47:19 +0000 (16:47 +0200)]
SCCP: Fix leak when determining TYPE_CHECK from type info

As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 29 May 2019 07:47:43 +0000 (09:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd tests for DatePeriod properties
Craig Duncan [Tue, 28 May 2019 19:49:14 +0000 (20:49 +0100)]
Add tests for DatePeriod properties

5 years agoUpdate NEWS for 7.3.6
Christoph M. Becker [Wed, 29 May 2019 07:27:23 +0000 (09:27 +0200)]
Update NEWS for 7.3.6

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Wed, 29 May 2019 06:53:42 +0000 (08:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  add NEWS entries for sec fix

5 years agoadd NEWS entries for sec fix
Remi Collet [Wed, 29 May 2019 06:53:23 +0000 (08:53 +0200)]
add NEWS entries for sec fix

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Wed, 29 May 2019 06:30:41 +0000 (08:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  disabled functions must not have return type

5 years agodisabled functions must not have return type
Joe Watkins [Wed, 29 May 2019 06:30:08 +0000 (08:30 +0200)]
disabled functions must not have return type

5 years agoRestore the execute bit for run-tests.php
Craig Duncan [Tue, 28 May 2019 20:51:26 +0000 (21:51 +0100)]
Restore the execute bit for run-tests.php

It looks like this was accidentally removed in 03f15f705ad30ce2dde7f7b2ab087a132b859ba0

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 28 May 2019 14:41:08 +0000 (16:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix type inference of SEND_UNPACK with empty array
Nikita Popov [Tue, 28 May 2019 14:39:49 +0000 (16:39 +0200)]
Fix type inference of SEND_UNPACK with empty array

An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Tue, 28 May 2019 07:54:15 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump version after release

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 28 May 2019 07:53:32 +0000 (09:53 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  bump version after release

5 years agobump version after release
Joe Watkins [Tue, 28 May 2019 07:52:52 +0000 (09:52 +0200)]
bump version after release

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 04:36:05 +0000 (21:36 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Tue, 28 May 2019 04:36:00 +0000 (21:36 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoFix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 01:04:00 +0000 (18:04 -0700)]
Fix bug #77967 - Bypassing open_basedir restrictions via file uris

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 00:28:25 +0000 (17:28 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Tue, 28 May 2019 00:28:20 +0000 (17:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoFix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:16:29 +0000 (17:16 -0700)]
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Tue, 28 May 2019 00:21:23 +0000 (17:21 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix function name

5 years agoFix function name
Stanislav Malyshev [Tue, 28 May 2019 00:20:56 +0000 (17:20 -0700)]
Fix function name

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Stanislav Malyshev [Mon, 27 May 2019 23:49:25 +0000 (16:49 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Mon, 27 May 2019 23:49:19 +0000 (16:49 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm

5 years agoUpdate NEWS
Stanislav Malyshev [Mon, 27 May 2019 23:48:32 +0000 (16:48 -0700)]
Update NEWS

5 years agoFix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to intege...
Stanislav Malyshev [Mon, 27 May 2019 23:32:42 +0000 (16:32 -0700)]
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow

5 years agoFix #77973: Uninitialized read in gdImageCreateFromXbm
Christoph M. Becker [Mon, 6 May 2019 08:18:51 +0000 (10:18 +0200)]
Fix #77973: Uninitialized read in gdImageCreateFromXbm

We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 27 May 2019 15:42:50 +0000 (17:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #76345
Michael Maroszek [Mon, 27 May 2019 15:42:20 +0000 (17:42 +0200)]
Fixed bug #76345

5 years agoFunc info: Fix calls to zero-arg varargs
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs

The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 26 May 2019 17:49:52 +0000 (18:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd fpmi to the opcache supported sapis
Jakub Zelenka [Sun, 26 May 2019 17:47:22 +0000 (18:47 +0100)]
Add fpmi to the opcache supported sapis

5 years agoFix bug #77955
Nikita Popov [Thu, 23 May 2019 10:29:08 +0000 (12:29 +0200)]
Fix bug #77955

Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 23 May 2019 09:12:34 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #78038 socket_select with references
Nikita Popov [Thu, 23 May 2019 09:11:54 +0000 (11:11 +0200)]
Fixed bug #78038 socket_select with references

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Wed, 22 May 2019 21:21:04 +0000 (00:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed race condition in opcache restart

5 years agoFixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:20:35 +0000 (00:20 +0300)]
Fixed race condition in opcache restart

5 years agoFixed dump of constant flags
Dmitry Stogov [Wed, 22 May 2019 19:59:40 +0000 (22:59 +0300)]
Fixed dump of constant flags

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 May 2019 10:45:05 +0000 (12:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix #77956 - When mysqli.allow_local_infile = Off, return a client error
Sjon Hortensius [Sat, 18 May 2019 15:14:21 +0000 (17:14 +0200)]
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 May 2019 10:02:03 +0000 (12:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix test case for cURL 7.65.0

5 years agoFix test case for cURL 7.65.0
Christoph M. Becker [Wed, 22 May 2019 10:00:06 +0000 (12:00 +0200)]
Fix test case for cURL 7.65.0

Reported and patch provided by @Jan-E.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 May 2019 09:43:26 +0000 (11:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoUse a different URL in bug44811.phpt
Nikita Popov [Wed, 22 May 2019 09:41:51 +0000 (11:41 +0200)]
Use a different URL in bug44811.phpt

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Rasmus Lerdorf [Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select

5 years agoFix precedence issue causing sub-second timeouts to be 0 in
Rasmus Lerdorf [Tue, 21 May 2019 21:44:11 +0000 (14:44 -0700)]
Fix precedence issue causing sub-second timeouts to be 0 in
curl_multi_select

5 years agoDon't evaluate functions with partial array arguments
Nikita Popov [Tue, 21 May 2019 15:35:03 +0000 (17:35 +0200)]
Don't evaluate functions with partial array arguments

5 years agoFix null check in sccp add_array_elem chain handling
Nikita Popov [Tue, 21 May 2019 15:15:07 +0000 (17:15 +0200)]
Fix null check in sccp add_array_elem chain handling

We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.