]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 13 May 2019 08:52:00 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4'
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',
],
]),
]);
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()
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>
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
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
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
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.
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
Peter Kokot [Mon, 13 May 2019 00:57:20 +0000 (02:57 +0200)]
[ci skip] Remove outdated fastcgi info in favor of the manual
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
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
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
Peter Kokot [Sun, 12 May 2019 21:24:03 +0000 (23:24 +0200)]
[ci skip] Migrate intl error conventions docs to Markdown
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
Peter Kokot [Sun, 12 May 2019 20:09:09 +0000 (22:09 +0200)]
[ci skip] Migrate oci8 README to Markdown
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
Peter Kokot [Sun, 12 May 2019 20:03:10 +0000 (22:03 +0200)]
[ci skip] Migrate tests READMEs to Markdown
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
Peter Kokot [Sun, 12 May 2019 19:08:06 +0000 (21:08 +0200)]
[ci skip] Migrate libxmlrpc README to Markdown
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
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
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
Theodore Brown [Sun, 12 May 2019 15:19:54 +0000 (10:19 -0500)]
Fix typos in upgrade notes
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
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.
Peter Kokot [Sun, 12 May 2019 01:24:43 +0000 (03:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused variable
Peter Kokot [Sun, 12 May 2019 01:23:37 +0000 (03:23 +0200)]
Remove unused variable
Peter Kokot [Sun, 12 May 2019 01:06:19 +0000 (03:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove duplicate variables
Vinicius Dias [Sun, 12 May 2019 00:52:06 +0000 (21:52 -0300)]
Remove duplicate variables
Removing duplicate variables `$beginDtObj` and `$beginTimestamp`.
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
Hugh McMaster [Wed, 8 May 2019 12:32:56 +0000 (22:32 +1000)]
Use PKG_CHECK_MODULES to detect the iODBC library
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
Hugh McMaster [Fri, 10 May 2019 12:00:39 +0000 (22:00 +1000)]
Use PKG_CHECK_MODULES to detect the systemd library
Jakub Zelenka [Sat, 11 May 2019 19:10:43 +0000 (20:10 +0100)]
Merge branch '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
Jakub Zelenka [Sat, 11 May 2019 19:08:57 +0000 (20:08 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sat, 11 May 2019 19:07:39 +0000 (20:07 +0100)]
Fix bug #77934 (php-fpm kill -USR2 not working)
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
peter279k [Sat, 11 May 2019 18:19:07 +0000 (02:19 +0800)]
Using PDO instead because of consistency
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.
David Carlier [Sun, 27 Jan 2019 21:59:28 +0000 (21:59 +0000)]
list interfaces/adding just "binary" state status.
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
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
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
Peter Kokot [Sat, 11 May 2019 11:18:25 +0000 (13:18 +0200)]
Remove unused symbol definition
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.
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
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.
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
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.
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
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
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
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.
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
Peter Kokot [Sat, 11 May 2019 13:03:17 +0000 (15:03 +0200)]
Fix comment to match the future zts configuration option
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
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
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
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.
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
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.
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
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'
```
Peter Kokot [Fri, 10 May 2019 20:58:29 +0000 (22:58 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused variables
Peter Kokot [Fri, 10 May 2019 02:02:14 +0000 (04:02 +0200)]
Remove unused variables
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
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
Christoph M. Becker [Fri, 10 May 2019 16:44:47 +0000 (18:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix typo
Christoph M. Becker [Fri, 10 May 2019 16:43:40 +0000 (18:43 +0200)]
Fix typo
Since opcache.enable defaults to 1 anyway, this change is only
cosmetic.
Kalle Sommer Nielsen [Thu, 9 May 2019 23:38:38 +0000 (02:38 +0300)]
Merge branch 'master' of git.php.net:/php-src
Kalle Sommer Nielsen [Thu, 9 May 2019 23:38:12 +0000 (02:38 +0300)]
Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4
Kalle Sommer Nielsen [Thu, 9 May 2019 23:37:02 +0000 (02:37 +0300)]
NEWS and UPGRADING for the scatter filter
Kalle Sommer Nielsen [Thu, 9 May 2019 23:24:01 +0000 (02:24 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Implemented the gdScatter filter I wrote almost 10 years ago
Kalle Sommer Nielsen [Thu, 9 May 2019 23:23:40 +0000 (02:23 +0300)]
Implemented the gdScatter filter I wrote almost 10 years ago
This filter is available as of libgd 2.1.0 which is our bare minimum for
external compilation of ext/gd.
The scatter filter works by iterating over all pixels in the image and
shifting them randomly based on two modifier (`plus` and `sub`) values:
dest_x = (int)(x + ((rand() % (plus - sub)) + sub));
dest_y = (int)(y + ((rand() % (plus - sub)) + sub));
Additionally the scatter filter also supports by only shifting pixels where
the current pixel being iterated is one or more colors, allowing the scatter
filter to only effect solid colors in part of an image.
Note, due to the nature of randomness and implementation, pixels who were
shifted ahead of iteration will be shifted once more and therefore the
bottom right of an image may contain a slight scatter effect due to this.
Peter Kokot [Thu, 9 May 2019 23:05:24 +0000 (01:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused variable
Peter Kokot [Thu, 9 May 2019 23:05:19 +0000 (01:05 +0200)]
Remove unused variable
Peter Kokot [Thu, 9 May 2019 22:44:51 +0000 (00:44 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove dead code from configure.ac
Peter Kokot [Tue, 7 May 2019 02:05:14 +0000 (04:05 +0200)]
Remove dead code from configure.ac
SAPI apache has been removed and now there is apache2handler so this
warning hasn't been used for a while.
Peter Kokot [Thu, 9 May 2019 22:21:39 +0000 (00:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Disable checking for library in ext skeleton
Peter Kokot [Thu, 9 May 2019 22:21:09 +0000 (00:21 +0200)]
Disable checking for library in ext skeleton
Peter Kokot [Thu, 9 May 2019 22:16:55 +0000 (00:16 +0200)]
Disable checking for library in the ext skeleton
George Wang [Thu, 9 May 2019 22:16:09 +0000 (18:16 -0400)]
Merge branch 'PHP-7.4'
George Wang [Thu, 9 May 2019 22:15:48 +0000 (18:15 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
George Wang [Thu, 9 May 2019 22:14:11 +0000 (18:14 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Thu, 9 May 2019 22:13:25 +0000 (18:13 -0400)]
Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K.
Peter Kokot [Thu, 9 May 2019 17:07:39 +0000 (19:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused functions
Peter Kokot [Thu, 9 May 2019 02:33:13 +0000 (04:33 +0200)]
Remove unused functions
- _get_zval_ptr_cv_deref_BP_VAR_UNSET
- _get_zval_ptr_cv_deref_BP_VAR_IS
- _get_zval_ptr_cv_deref_BP_VAR_RW
- _get_zval_ptr_cv_deref_BP_VAR_W
Christoph M. Becker [Thu, 9 May 2019 14:57:23 +0000 (16:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix erroneous assertions
Christoph M. Becker [Thu, 9 May 2019 14:56:57 +0000 (16:56 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix erroneous assertions
Christoph M. Becker [Thu, 9 May 2019 14:55:35 +0000 (16:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix erroneous assertions
Christoph M. Becker [Thu, 9 May 2019 14:54:11 +0000 (16:54 +0200)]
Fix erroneous assertions
Since PHP strings are binary safe (i.e. they may contain NUL bytes), we
must not assume that strlen()/wcslen() actually return the length of
the string. Only if the given in_len is zero, it is safe to assert
this.
Nikita Popov [Thu, 9 May 2019 14:05:58 +0000 (16:05 +0200)]
Merge branch 'PHP-7.4'
Hugh McMaster [Sun, 5 May 2019 13:25:40 +0000 (23:25 +1000)]
Update the extension template file to use PKG_CHECK_MODULES
Nikita Popov [Thu, 9 May 2019 12:35:25 +0000 (14:35 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 9 May 2019 12:19:53 +0000 (14:19 +0200)]
Fixed bug #71030
Make sure to always fetch the RHS of a list assignment first, instead
of special casing known self-assignments, which will not detect cases
using references correctly.
As a side-effect, it is no longer possible to do something like
byRef(list($x) = $y). This worked by accident previously, but only
if $y was a CV and the self-assignment case did not trigger.
However it shouldn't work for the same reason that byRef($x = $y)
doesn't. Conversely byRef(list(&$x) = $y) and byRef($x =& $y)
continue to be legal.
Nikita Popov [Thu, 9 May 2019 10:36:33 +0000 (12:36 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 9 May 2019 10:36:20 +0000 (12:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 9 May 2019 10:34:46 +0000 (12:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3