1
0
mirror of https://github.com/php/php-src.git synced 2026-03-31 12:42:29 +02:00
Commit Graph

112670 Commits

Author SHA1 Message Date
Dmitry Stogov
fd4e2e77dc Merge branch 'PHP-7.4'
* PHP-7.4:
  ARM64 may be big endian
2019-05-13 13:34:07 +03:00
Dmitry Stogov
3322ae2eb2 ARM64 may be big endian 2019-05-13 13:33:03 +03:00
Dmitry Stogov
8f4f5fc040 Merge branch 'PHP-7.4'
* PHP-7.4:
  Load 8 bytes at a time in hash_func. (Sebastian Pop)
2019-05-13 12:36:49 +03:00
Dmitry Stogov
071793a0bb Load 8 bytes at a time in hash_func. (Sebastian Pop) 2019-05-13 12:34:53 +03:00
Nikita Popov
451eb4464a Merge branch 'PHP-7.4' 2019-05-13 11:06:44 +02:00
Nikita Popov
bec6ff9021 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-13 11:06:35 +02:00
Nikita Popov
bec68d59a2 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-13 11:06:14 +02:00
Theodore Brown
b6b15fc65c 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`.
2019-05-13 11:04:56 +02:00
GITSRC
5d3337076b Require semicolon after SAVE_CURL_ERROR() 2019-05-13 11:01:37 +02:00
Nikita Popov
12b03a8750 Merge branch 'PHP-7.4' 2019-05-13 10:52:00 +02:00
Vincent JARDIN
c55af3c65a 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',
        ],
      ]),
    ]);
2019-05-13 10:51:03 +02:00
Christoph M. Becker
248a8987ea Merge branch 'PHP-7.4'
* PHP-7.4:
  Deprecate and ignore $version parameter of curl_version()
2019-05-13 08:54:22 +02:00
Christoph M. Becker
357da6bc59 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>
2019-05-13 08:53:41 +02:00
Peter Kokot
64923adccf Merge branch 'PHP-7.4'
* PHP-7.4:
  Convert CRLF to LF
2019-05-13 03:54:10 +02:00
Peter Kokot
addf2ad5fd Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Convert CRLF to LF
2019-05-13 03:53:49 +02:00
Peter Kokot
43e6fd1e2b Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Convert CRLF to LF
2019-05-13 03:53:31 +02:00
Peter Kokot
f95b27c6f6 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.
2019-05-13 03:51:00 +02:00
Peter Kokot
406437eadb Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Remove outdated fastcgi info in favor of the manual
2019-05-13 02:58:52 +02:00
Peter Kokot
ecb6a8db63 [ci skip] Remove outdated fastcgi info in favor of the manual 2019-05-13 02:57:20 +02:00
Peter Kokot
229c7ad6e4 Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Refactor libgd docs
2019-05-12 23:55:18 +02:00
Peter Kokot
812dbed0e9 [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
2019-05-12 23:51:39 +02:00
Peter Kokot
5827aca5f1 Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Migrate intl error conventions docs to Markdown
2019-05-12 23:24:08 +02:00
Peter Kokot
6abc6baa2a [ci skip] Migrate intl error conventions docs to Markdown 2019-05-12 23:24:03 +02:00
Peter Kokot
045e247ea2 Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Migrate oci8 README to Markdown
2019-05-12 22:09:20 +02:00
Peter Kokot
1c53afbe32 [ci skip] Migrate oci8 README to Markdown 2019-05-12 22:09:09 +02:00
Peter Kokot
87cfcb0b7c Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Migrate tests READMEs to Markdown
2019-05-12 22:03:35 +02:00
Peter Kokot
83e565e244 [ci skip] Migrate tests READMEs to Markdown 2019-05-12 22:03:10 +02:00
Peter Kokot
86825a43e3 Merge branch 'PHP-7.4'
* PHP-7.4:
  [ci skip] Migrate libxmlrpc README to Markdown
2019-05-12 21:08:38 +02:00
Peter Kokot
340da47167 [ci skip] Migrate libxmlrpc README to Markdown 2019-05-12 21:08:06 +02:00
Peter Kokot
2cf90bb2f0 Merge branch 'PHP-7.4'
* PHP-7.4:
  Normalize comments in *nix build system m4 files
2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d 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
2019-05-12 18:43:03 +02:00
Peter Kokot
3005d6c21d Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix typos in upgrade notes
2019-05-12 17:37:04 +02:00
Theodore Brown
e96c776bd5 Fix typos in upgrade notes 2019-05-12 17:36:48 +02:00
Christoph M. Becker
3d7f2fcdff Merge branch 'PHP-7.4'
* PHP-7.4:
  Prevent race conditions
2019-05-12 17:17:52 +02:00
Christoph M. Becker
b3085bd0d4 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.
2019-05-12 17:16:41 +02:00
Peter Kokot
ca22b24711 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove unused variable
2019-05-12 03:24:43 +02:00
Peter Kokot
f1552c864f Remove unused variable 2019-05-12 03:23:37 +02:00
Peter Kokot
b60173af0b Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove duplicate variables
2019-05-12 03:06:19 +02:00
Vinicius Dias
188ece856d Remove duplicate variables
Removing duplicate variables `$beginDtObj` and `$beginTimestamp`.
2019-05-12 03:02:38 +02:00
Peter Kokot
4dedf28380 Merge branch 'PHP-7.4'
* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the iODBC library
2019-05-12 01:37:00 +02:00
Hugh McMaster
3ece7df9cf Use PKG_CHECK_MODULES to detect the iODBC library 2019-05-12 01:36:46 +02:00
Peter Kokot
628806c382 Merge branch 'PHP-7.4'
* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the systemd library
2019-05-12 00:19:20 +02:00
Hugh McMaster
755f6f6ede Use PKG_CHECK_MODULES to detect the systemd library 2019-05-12 00:19:03 +02:00
Jakub Zelenka
4b2239b52b Merge branch 'PHP-7.4' 2019-05-11 20:10:43 +01:00
Jakub Zelenka
4bf37e467b Merge branch 'PHP-7.3' into PHP-7.4 2019-05-11 20:10:13 +01:00
Jakub Zelenka
0cad701374 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-11 20:08:57 +01:00
Jakub Zelenka
cc5c51e7f0 Fix bug #77934 (php-fpm kill -USR2 not working) 2019-05-11 20:07:39 +01:00
Peter Kokot
d40a3f4c28 Merge branch 'PHP-7.4'
* PHP-7.4:
  Using PDO instead because of consistency
2019-05-11 21:06:22 +02:00
peter279k
d0ac3a6a86 Using PDO instead because of consistency 2019-05-11 21:05:49 +02:00
Peter Kokot
f1d9605970 Merge branch 'PHP-7.4'
* PHP-7.4:
  list interfaces/adding just "binary" state status.
2019-05-11 20:29:36 +02:00