1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

111113 Commits

Author SHA1 Message Date
Nikita Popov 472f577679 Merge branch 'PHP-7.4'
[ci skip]
2019-03-01 16:14:20 +01:00
c9s 7c351ba65c Fix out-dated docs and typo
[ci skip]
2019-03-01 16:14:11 +01:00
Nikita Popov 57561bd129 Merge branch 'PHP-7.4' 2019-03-01 15:35:18 +01:00
Nikita Popov 51dacafc64 Use separate files for SplFileObject::setCsvControl() tests 2019-03-01 15:32:02 +01:00
Nikita Popov 5fb93bad71 Merge branch 'PHP-7.4' 2019-03-01 14:56:36 +01:00
Nikita Popov 6878d1026b Merge branch 'PHP-7.3' into PHP-7.4 2019-03-01 14:55:24 +01:00
Nikita Popov 8be12e770f Merge branch 'PHP-7.2' into PHP-7.3 2019-03-01 14:55:15 +01:00
Jay Satiro 5025eb05bd curl_error: return an empty string if no error occurred
CURLOPT_ERRORBUFFER doc says "Do not rely on the contents of the
buffer unless an error code was returned." [1]

Prior to this change the error buffer was returned even if no error had
occurred, and that buffer may contain incorrect information in such a
case. [2]

[1]: https://curl.haxx.se/libcurl/c/CURLOPT_ERRORBUFFER.html
[2]: https://github.com/curl/curl/issues/3629
2019-03-01 14:54:37 +01:00
Nikita Popov ac2bce9337 Merge branch 'PHP-7.4' 2019-03-01 14:52:09 +01:00
Nikita Popov 2e31786627 Merge branch 'PHP-7.3' into PHP-7.4 2019-03-01 14:52:02 +01:00
Nikita Popov 16cda039b5 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-01 14:51:55 +01:00
Kevin Adler 006355c9fa Fix bug #77677: WCOREDUMP not available on all systems
Add #ifdef WCOREDUMP around all uses.

Also Change core dump message to yes/no/unknown in lsapilib.
2019-03-01 14:51:15 +01:00
Nikita Popov 388ad58f57 Merge branch 'PHP-7.4' 2019-03-01 14:35:41 +01:00
Nikita Popov df93506f56 Merge branch 'PHP-7.3' into PHP-7.4 2019-03-01 14:35:26 +01:00
Nikita Popov 4dc0662eca Check for NULL GC type in objects_store_del
This might happen if OBJ_RELEASE is used on an object that was already
released by GC. Specific cases of this issue were previously fixed in
ffaee27478 and
72104d2b6e, however the issue still
affects 3rd-party extensions using OBJ_RELEASE.

The whole GC type NULL + OBJ_IS_VALID + IS_FREE_CALLED system seems
overly complicated and can probably be simplified in 7.4.
2019-03-01 14:32:11 +01:00
Dmitry Stogov 66ec79ee63 Merge branch 'PHP-7.4'
* PHP-7.4:
  Unused parameter
2019-03-01 14:34:58 +03:00
Dmitry Stogov c896b3ea48 Unused parameter 2019-03-01 14:34:17 +03:00
Dmitry Stogov 20e8b01437 Merge branch 'PHP-7.4'
* PHP-7.4:
  Keep original debug info
2019-03-01 14:12:16 +03:00
Dmitry Stogov a1109b28f4 Keep original debug info 2019-03-01 14:11:37 +03:00
Dmitry Stogov 3a119912ad Merge branch 'PHP-7.4'
* PHP-7.4:
  Enable Posix Shared Memory on Linux
2019-03-01 12:16:30 +03:00
Dmitry Stogov 7d5e2e532c Enable Posix Shared Memory on Linux 2019-03-01 12:15:56 +03:00
Nikita Popov 7f262edaf3 Convert extract() prefix to string zpp arg 2019-03-01 10:11:28 +01:00
Peter Kokot 615ec3998e Merge branch 'PHP-7.4'
* PHP-7.4:
  Test for function posix_getpwnam() basic functionality
2019-03-01 02:02:32 +01:00
Rodrigo Prado 54ef8d13d8 Test for function posix_getpwnam() basic functionality
The coverage for the function posix_getpwnam() that was not covered yet.
http://gcov.php.net/PHP_HEAD/lcov_html/ext/posix/posix.c.gcov.php#1182
Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
User Group: PHPSP #PHPTestFestBrasil
2019-03-01 02:01:52 +01:00
Kalle Sommer Nielsen 5e8ed0a0f5 NEWS 2019-03-01 01:41:19 +02:00
Kalle Sommer Nielsen fddc751024 Removed pdo_odbc.db2_instance_name 2019-03-01 01:24:53 +02:00
Peter Kokot e7f766742b Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix file permissions
2019-02-28 22:08:42 +01:00
Peter Kokot e763cc7425 Fix file permissions
Git can track executable (0755) and non-executable (0644) file modes.

This patch fixes file permissions in the php-src repository according to
the predefined executable files with 0755 permissions (shell scripts)
and all others with 0644 permissions.
2019-02-28 22:07:16 +01:00
Peter Kokot f1b8c30174 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove PHP_DECLARED_TIMEZONE and HAVE_DECLARED_TIMEZONE
2019-02-28 21:18:06 +01:00
Peter Kokot f64ae64f52 Remove PHP_DECLARED_TIMEZONE and HAVE_DECLARED_TIMEZONE
The HAVE_DECLARED_TIMEZONE symbol usage has been introduced in
2fd8cbff2a
and then removed via
667a9b9bce.
2019-02-28 21:17:49 +01:00
Nikita Popov 6130e56356 Merge branch 'PHP-7.4' 2019-02-28 17:24:13 +01:00
Nikita Popov ff315098f4 Free map_base_ptr during post_startup 2019-02-28 17:23:18 +01:00
Nikita Popov 25859315b1 Merge branch 'PHP-7.4' 2019-02-28 16:43:24 +01:00
Nikita Popov 105a04aaac Don't remove CONST CAST in CONCAT operand
CONCAT assumes that CONST operands are strings, so we cannot
blindly remove CAST operands.
2019-02-28 16:42:30 +01:00
Nikita Popov 1b998bb9cb Remove unnecessary convert_to_string_safe macro
I'm assuming that the reason this existed was to avoid modifying
an interned string. However, the current code handles this case
fine already.
2019-02-28 16:30:05 +01:00
Nikita Popov 13b94dbb60 Merge branch 'PHP-7.4' 2019-02-28 16:15:13 +01:00
Nikita Popov 89a7b7cc96 Fix leak in resolve_property_types
We need to free the original string as well, not just the lowercased
one.
2019-02-28 16:14:56 +01:00
Nikita Popov c5d9a44798 Merge branch 'PHP-7.4' 2019-02-28 15:46:58 +01:00
Nikita Popov f4ded492c9 Don't return inside _DO_THROW macro
Returning inside _DO_THROW() is kind of pointless if we are going
to comment most uses with "this is gonna return".
2019-02-28 15:45:47 +01:00
Nikita Popov 248f9cf33f Remove more leftovers of mysqli embedded server 2019-02-28 15:43:29 +01:00
Derick Rethans 29f15a1333 Merge branch 'PHP-7.4' 2019-02-28 13:52:46 +00:00
Derick Rethans 9624e87a8f Merge branch 'PHP-7.3' into PHP-7.4 2019-02-28 13:52:33 +00:00
Derick Rethans d63a7aa6cf Merge branch 'PHP-7.2' into PHP-7.3 2019-02-28 13:51:10 +00:00
Derick Rethans 7d001aff03 Merge branch 'DateIntervalBogusData' into PHP-7.2 2019-02-28 13:50:58 +00:00
Derick Rethans a890c5beb8 Fixed bug #50020 (DateInterval:createDateFromString() silently fails) 2019-02-28 13:50:35 +00:00
Anatol Belski 0c1470f9b7 Merge branch 'PHP-7.4'
* PHP-7.4:
  Sync with 7be0e06b48
2019-02-28 14:04:29 +01:00
Anatol Belski 9d356bab50 Sync with 7be0e06b48 2019-02-28 14:03:49 +01:00
Christoph M. Becker ebefb95fda Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove dead code
2019-02-28 13:18:49 +01:00
Christoph M. Becker 345a75f541 Remove dead code
`_php_image_output()` is only ever called for `PHP_GDIMG_CONVERT_WBM`,
`PHP_GDIMG_TYPE_GD` and `PHP_GDIMG_TYPE_GD2`.  All other image types
solely use the more flexible `_php_image_output_ctx()`.
2019-02-28 13:11:41 +01:00
Nikita Popov ca8e2abb8e Merge branch 'PHP-7.4' 2019-02-28 12:56:00 +01:00