]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 14 May 2019 01:20:11 +0000 (03:20 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Update changelog
  Use pkg-config for sqlite3 and pdo_sqlite

6 years agoUpdate changelog
Peter Kokot [Tue, 14 May 2019 01:20:03 +0000 (03:20 +0200)]
Update changelog

6 years agoUse pkg-config for sqlite3 and pdo_sqlite
Peter Kokot [Thu, 9 May 2019 21:23:39 +0000 (23:23 +0200)]
Use pkg-config for sqlite3 and pdo_sqlite

Following other migrations to pkg-config usage for the *nix build system
this migrates also sqlite3 and pdo_sqlite extensions.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 14 May 2019 01:05:01 +0000 (03:05 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Add extensions naming conventions to ext_skel.php

6 years agoAdd extensions naming conventions to ext_skel.php
Peter Kokot [Sun, 12 May 2019 18:39:42 +0000 (20:39 +0200)]
Add extensions naming conventions to ext_skel.php

- first character is a letter
- followed by any number of letters, numbers, or underscores
- prefferred are lower case letters

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Tue, 14 May 2019 00:59:16 +0000 (02:59 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Convert CRLF to LF

6 years agoConvert CRLF to LF
Peter Kokot [Tue, 14 May 2019 00:59:06 +0000 (02:59 +0200)]
Convert CRLF to LF

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 13 May 2019 21:22:21 +0000 (00:22 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed test on platforms that don't support fastcall calling convention

6 years agoFixed test on platforms that don't support fastcall calling convention
Dmitry Stogov [Mon, 13 May 2019 21:21:00 +0000 (00:21 +0300)]
Fixed test on platforms that don't support fastcall calling convention

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Mon, 13 May 2019 20:15:52 +0000 (22:15 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove example file for pgsql extension

6 years agoRemove example file for pgsql extension
Peter Kokot [Mon, 13 May 2019 20:14:58 +0000 (22:14 +0200)]
Remove example file for pgsql extension

This removes the example script in favour of the manual:
https://www.php.net/manual/en/book.pgsql.php

Patch for integrating these functions as an example has been submitted
also to PHP manual via edit.php.net.

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Mon, 13 May 2019 17:52:17 +0000 (18:52 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Mon, 13 May 2019 17:51:41 +0000 (18:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Mon, 13 May 2019 17:51:05 +0000 (18:51 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoAdd ping to the fpm test for bug #77934
Jakub Zelenka [Mon, 13 May 2019 17:47:43 +0000 (18:47 +0100)]
Add ping to the fpm test for bug #77934

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 13 May 2019 12:43:10 +0000 (14:43 +0200)]
Merge branch 'PHP-7.4'

6 years agoImplement spread operator in arrays
CHU Zhaowei [Sat, 6 Oct 2018 14:04:41 +0000 (22:04 +0800)]
Implement spread operator in arrays

RFC: https://wiki.php.net/rfc/spread_operator_for_array

Closes GH-3640.

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 13 May 2019 12:16:28 +0000 (15:16 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Check for supported libffi ABI

6 years agoCheck for supported libffi ABI
Dmitry Stogov [Mon, 13 May 2019 12:15:51 +0000 (15:15 +0300)]
Check for supported libffi ABI

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

* PHP-7.4:
  Fix #78003: strip_tags output change since PHP 7.3

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 13 May 2019 11:11:07 +0000 (13:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78003: strip_tags output change since PHP 7.3

6 years agoFix #78003: strip_tags output change since PHP 7.3
Christoph M. Becker [Mon, 13 May 2019 11:10:24 +0000 (13:10 +0200)]
Fix #78003: strip_tags output change since PHP 7.3

A refactoring of the strip tags state machine[1] missed the special
treatment of `depth > 0` when a `>` is encountered in state 2 or 3.  We
re-add it for BC reasons.

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

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 13 May 2019 10:34:07 +0000 (13:34 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  ARM64 may be big endian

6 years agoARM64 may be big endian
Dmitry Stogov [Mon, 13 May 2019 10:33:03 +0000 (13:33 +0300)]
ARM64 may be big endian

6 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Mon, 13 May 2019 09:36:49 +0000 (12:36 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Load 8 bytes at a time in hash_func. (Sebastian Pop)

6 years agoLoad 8 bytes at a time in hash_func. (Sebastian Pop)
Dmitry Stogov [Mon, 13 May 2019 09:34:53 +0000 (12:34 +0300)]
Load 8 bytes at a time in hash_func. (Sebastian Pop)

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 13 May 2019 09:06:44 +0000 (11:06 +0200)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 13 May 2019 09:06:35 +0000 (11:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 13 May 2019 09:06:14 +0000 (11:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix #77993: Wrong parse error for invalid hex literal on Windows
Theodore Brown [Thu, 9 May 2019 19:19:52 +0000 (14:19 -0500)]
Fix #77993: Wrong parse error for invalid hex literal on Windows

If a PHP file contains an invalid hex literal such as `0x_10`, the expected error
is `Parse error: syntax error, unexpected 'x_10' (T_STRING) in %s on line %d`.

This already worked correctly on Linux, but on Windows prior to this patch a different
error was produced: `Parse error: Invalid numeric literal in %s on line %d`.

6 years agoRequire semicolon after SAVE_CURL_ERROR()
GITSRC [Mon, 13 May 2019 08:21:46 +0000 (16:21 +0800)]
Require semicolon after SAVE_CURL_ERROR()

6 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 13 May 2019 08:52:00 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4'

6 years agoSupport content_type stream context option in soap
Vincent JARDIN [Tue, 23 Apr 2019 21:10:38 +0000 (23:10 +0200)]
Support content_type stream context option in soap

Allows overriding the HTTP header using the HTTP context:

    $client = new SoapClient('http://url.wsdl&v=latest', [
      'stream_context' => stream_context_create([
        'http' => [
          'content_type' => 'foobarX',
        ],
      ]),
    ]);

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 13 May 2019 06:54:22 +0000 (08:54 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Deprecate and ignore $version parameter of curl_version()

6 years agoDeprecate and ignore $version parameter of curl_version()
Christoph M. Becker [Mon, 13 May 2019 06:53:41 +0000 (08:53 +0200)]
Deprecate and ignore $version parameter of curl_version()

`curl_version()`[1] (of ext/curl) makes `curl_version_info()`[2] (of
libcurl) available to PHP userland.  The latter requires to pass an
`age` argument which usually is `CURLVERSION_NOW`, so that the
information returned by the runtime matches the declarations used
during compile time.  For C programs it is simply necessary to pass
this information, and in rare occasions it might make sense to pass
something else than `CURLVERSION_NOW`.  curl.h notes:

| The 'CURLVERSION_NOW' is the symbolic name meant to be used by
| basically all programs ever that want to get version information.

For the PHP binding, using a newer `age` than available at compile time
will neither provide the PHP program more information, nor would using
an older `age` have tangible benefits.

We therefore deprecate the useless `$version` parameter, and if it is
passed nonetheless, we use `CURLVERSION_NOW` instead of the supplied
value, and raise a warning.

[1] <https://www.php.net/manual/en/function.curl-version.php>
[2] <https://curl.haxx.se/libcurl/c/curl_version_info.html>

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Mon, 13 May 2019 01:54:10 +0000 (03:54 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Convert CRLF to LF

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Peter Kokot [Mon, 13 May 2019 01:53:49 +0000 (03:53 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Convert CRLF to LF

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Mon, 13 May 2019 01:53:31 +0000 (03:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Convert CRLF to LF

6 years agoConvert CRLF to LF
Peter Kokot [Mon, 13 May 2019 01:51:00 +0000 (03:51 +0200)]
Convert CRLF to LF

These files are tracked with CRLF line endings in Git and can be
converted to LF. Neither are parts of tests or code itself.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Mon, 13 May 2019 00:58:52 +0000 (02:58 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Remove outdated fastcgi info in favor of the manual

6 years ago[ci skip] Remove outdated fastcgi info in favor of the manual
Peter Kokot [Mon, 13 May 2019 00:57:20 +0000 (02:57 +0200)]
[ci skip] Remove outdated fastcgi info in favor of the manual

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 21:55:18 +0000 (23:55 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Refactor libgd docs

6 years ago[ci skip] Refactor libgd docs
Peter Kokot [Sun, 12 May 2019 21:51:39 +0000 (23:51 +0200)]
[ci skip] Refactor libgd docs

Changes to simplify managing libgd docs a bit:
- Move copyright statement and licensing info to common redistributable
  bins file. All previous notices left intact and updated with the
  upstream info.
- Remove unsynced and difficult to track README file compared to
  upstream README.md file available at https://github.com/libgd/libgd

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 21:24:08 +0000 (23:24 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Migrate intl error conventions docs to Markdown

6 years ago[ci skip] Migrate intl error conventions docs to Markdown
Peter Kokot [Sun, 12 May 2019 21:24:03 +0000 (23:24 +0200)]
[ci skip] Migrate intl error conventions docs to Markdown

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 20:09:20 +0000 (22:09 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Migrate oci8 README to Markdown

6 years ago[ci skip] Migrate oci8 README to Markdown
Peter Kokot [Sun, 12 May 2019 20:09:09 +0000 (22:09 +0200)]
[ci skip] Migrate oci8 README to Markdown

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 20:03:35 +0000 (22:03 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Migrate tests READMEs to Markdown

6 years ago[ci skip] Migrate tests READMEs to Markdown
Peter Kokot [Sun, 12 May 2019 20:03:10 +0000 (22:03 +0200)]
[ci skip] Migrate tests READMEs to Markdown

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 19:08:38 +0000 (21:08 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Migrate libxmlrpc README to Markdown

6 years ago[ci skip] Migrate libxmlrpc README to Markdown
Peter Kokot [Sun, 12 May 2019 19:08:06 +0000 (21:08 +0200)]
[ci skip] Migrate libxmlrpc README to Markdown

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 16:51:50 +0000 (18:51 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Normalize comments in *nix build system m4 files

6 years agoNormalize comments in *nix build system m4 files
Peter Kokot [Sun, 12 May 2019 16:43:03 +0000 (18:43 +0200)]
Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 15:37:04 +0000 (17:37 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typos in upgrade notes

6 years agoFix typos in upgrade notes
Theodore Brown [Sun, 12 May 2019 15:19:54 +0000 (10:19 -0500)]
Fix typos in upgrade notes

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sun, 12 May 2019 15:17:52 +0000 (17:17 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent race conditions

6 years agoPrevent race conditions
Christoph M. Becker [Sun, 12 May 2019 15:16:41 +0000 (17:16 +0200)]
Prevent race conditions

Since all current ODBC test cases use the same DSN, there may be
conflicts when running tests in parallel.  We prevent this by adding a
CONFLICTS marker which might be unnecessarily general, but get's the
job done, and still can be refined later.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 01:24:43 +0000 (03:24 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused variable

6 years agoRemove unused variable
Peter Kokot [Sun, 12 May 2019 01:23:37 +0000 (03:23 +0200)]
Remove unused variable

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sun, 12 May 2019 01:06:19 +0000 (03:06 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove duplicate variables

6 years agoRemove duplicate variables
Vinicius Dias [Sun, 12 May 2019 00:52:06 +0000 (21:52 -0300)]
Remove duplicate variables

Removing duplicate variables `$beginDtObj` and `$beginTimestamp`.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 23:37:00 +0000 (01:37 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the iODBC library

6 years agoUse PKG_CHECK_MODULES to detect the iODBC library
Hugh McMaster [Wed, 8 May 2019 12:32:56 +0000 (22:32 +1000)]
Use PKG_CHECK_MODULES to detect the iODBC library

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 22:19:20 +0000 (00:19 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the systemd library

6 years agoUse PKG_CHECK_MODULES to detect the systemd library
Hugh McMaster [Fri, 10 May 2019 12:00:39 +0000 (22:00 +1000)]
Use PKG_CHECK_MODULES to detect the systemd library

6 years agoMerge branch 'PHP-7.4'
Jakub Zelenka [Sat, 11 May 2019 19:10:43 +0000 (20:10 +0100)]
Merge branch 'PHP-7.4'

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sat, 11 May 2019 19:10:13 +0000 (20:10 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sat, 11 May 2019 19:08:57 +0000 (20:08 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix bug #77934 (php-fpm kill -USR2 not working)
Jakub Zelenka [Sat, 11 May 2019 19:07:39 +0000 (20:07 +0100)]
Fix bug #77934 (php-fpm kill -USR2 not working)

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 19:06:22 +0000 (21:06 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Using PDO instead because of consistency

6 years agoUsing PDO instead because of consistency
peter279k [Sat, 11 May 2019 18:19:07 +0000 (02:19 +0800)]
Using PDO instead because of consistency

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 18:29:36 +0000 (20:29 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  list interfaces/adding just "binary" state status.

6 years agolist interfaces/adding just "binary" state status.
David Carlier [Sun, 27 Jan 2019 21:59:28 +0000 (21:59 +0000)]
list interfaces/adding just "binary" state status.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 17:53:20 +0000 (19:53 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove dead DEBUG_CFLAGS setting

6 years agoRemove dead DEBUG_CFLAGS setting
Peter Kokot [Sat, 11 May 2019 13:10:44 +0000 (15:10 +0200)]
Remove dead DEBUG_CFLAGS setting

The USE_MAINTAINER_MODE has been removed via
a4c484a4d85e01874653570b7829a248330eb9fb and
43ed9039494a7484c2e3997ceae191ed6b640a62

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 17:48:13 +0000 (19:48 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused symbol definition
  Remove redundant memory.h file

6 years agoRemove unused symbol definition
Peter Kokot [Sat, 11 May 2019 11:18:25 +0000 (13:18 +0200)]
Remove unused symbol definition

6 years agoRemove redundant memory.h file
Peter Kokot [Sat, 11 May 2019 00:31:01 +0000 (02:31 +0200)]
Remove redundant memory.h file

The memory.h file is part of the pre-C89 era and is on today's systems
only a simple wrapper for including the final string.h header file.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 17:45:00 +0000 (19:45 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Simplify ext/mbstring/libmbfl/config.h creation

6 years agoSimplify ext/mbstring/libmbfl/config.h creation
Peter Kokot [Sat, 11 May 2019 00:26:29 +0000 (02:26 +0200)]
Simplify ext/mbstring/libmbfl/config.h creation

- The config.h.in is part of the standalone libmbfl library and it is
  forked and bundled.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 16:35:38 +0000 (18:35 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Integrate libmbfl docs to README.md and LICENSE

6 years agoIntegrate libmbfl docs to README.md and LICENSE
Peter Kokot [Sat, 11 May 2019 16:29:30 +0000 (18:29 +0200)]
Integrate libmbfl docs to README.md and LICENSE

- All credits, license info preserved, only merged together to not have
  to many places to edit.
- Changelogs integrated in the readme since they are not used anymore.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 15:17:40 +0000 (17:17 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Convert CRLF to LF in *.wsdl files

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Peter Kokot [Sat, 11 May 2019 15:16:50 +0000 (17:16 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Convert CRLF to LF in *.wsdl files

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Sat, 11 May 2019 15:15:08 +0000 (17:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Convert CRLF to LF in *.wsdl files

6 years agoConvert CRLF to LF in *.wsdl files
Peter Kokot [Sat, 11 May 2019 15:12:28 +0000 (17:12 +0200)]
Convert CRLF to LF in *.wsdl files

These EOL types are part of different environments and not part of the
tests themselves.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 13:03:27 +0000 (15:03 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix comment to match the future zts configuration option

6 years agoFix comment to match the future zts configuration option
Peter Kokot [Sat, 11 May 2019 13:03:17 +0000 (15:03 +0200)]
Fix comment to match the future zts configuration option

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 12:51:40 +0000 (14:51 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove ffi README in favour of docs

6 years agoRemove ffi README in favour of docs
Peter Kokot [Wed, 8 May 2019 22:29:43 +0000 (00:29 +0200)]
Remove ffi README in favour of docs

- https://www.php.net/manual/en/book.ffi.php
- The FFI C parser is mentioned in the CONTRIBUTING.md file

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Sat, 11 May 2019 07:53:07 +0000 (09:53 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent race condition

6 years agoPrevent race condition
Christoph M. Becker [Sat, 11 May 2019 07:51:36 +0000 (09:51 +0200)]
Prevent race condition

This test may conflict with readdir_variation3.phpt otherwise.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Sat, 11 May 2019 01:28:11 +0000 (03:28 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Rename *.jpeg files to *.jpg

6 years agoRename *.jpeg files to *.jpg
Peter Kokot [Sat, 11 May 2019 01:22:19 +0000 (03:22 +0200)]
Rename *.jpeg files to *.jpg

These file extensions are not part of these tests and *.jpg is more
common.

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Fri, 10 May 2019 22:25:31 +0000 (00:25 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Bump config.guess and config.sub

6 years agoBump config.guess and config.sub
Peter Kokot [Fri, 10 May 2019 22:24:26 +0000 (00:24 +0200)]
Bump config.guess and config.sub

```
wget -O config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
wget -O config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
```

6 years agoMerge branch 'PHP-7.4'
Peter Kokot [Fri, 10 May 2019 20:58:29 +0000 (22:58 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove unused variables

6 years agoRemove unused variables
Peter Kokot [Fri, 10 May 2019 02:02:14 +0000 (04:02 +0200)]
Remove unused variables

6 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 10 May 2019 16:46:50 +0000 (18:46 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix typo
  NEWS and UPGRADING for the scatter filter

6 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 10 May 2019 16:46:18 +0000 (18:46 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix typo