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
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
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
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
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
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
Nikita Popov
7be0e06b48
Remove mysqli embedded server support
...
This code is not compatible with PHP 7.0. The fact that nobody
complained that the mysqli embedded server functionality doesn't
build anymore seems like a strong signal that we can drop it...
2019-02-28 12:55:16 +01:00
Anatol Belski
9abb47155f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Sync with behavior change in OpenSSL 1.1.1b
2019-02-28 12:53:31 +01:00
Anatol Belski
a5e986181a
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Sync with behavior change in OpenSSL 1.1.1b
2019-02-28 12:53:05 +01:00
Anatol Belski
58d3dd466f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Sync with behavior change in OpenSSL 1.1.1b
2019-02-28 12:52:28 +01:00
Anatol Belski
19a44ffb7b
Sync with behavior change in OpenSSL 1.1.1b
...
A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.
2019-02-28 12:48:47 +01:00
Nikita Popov
4be8208ef7
Use zpp string argument in imagecreatefromstring()
...
Instead of accepting a zval and casting it.
2019-02-28 12:07:34 +01:00
Nikita Popov
23d8d93aad
Merge branch 'PHP-7.4'
2019-02-28 10:58:19 +01:00
Nikita Popov
a18e5c61cd
Mark ext/xmlreader/tests/bug70309.phpt as online test
...
The relax NG schema is fetched from a remote server. We could
include it in the repo, but it's 500KB. A minimized test case would
be better.
Also, apparently this bug has never been reported upstream and just
patched in the libxml we build on Windows?
2019-02-28 10:12:40 +01:00
Nikita Popov
f198ae1558
Merge branch 'PHP-7.4'
2019-02-28 09:59:19 +01:00
Nikita Popov
5e6846cad7
Merge branch 'PHP-7.3' into PHP-7.4
2019-02-28 09:59:07 +01:00
Nikita Popov
019fd1d9ba
Merge branch 'PHP-7.2' into PHP-7.3
2019-02-28 09:58:47 +01:00
Nikita Popov
9ad9cc71ff
Fixed bug #77669
2019-02-28 09:58:01 +01:00
Peter Kokot
0517d203b3
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove unused package2.xml file
Remove not needed PHP_PDO_PEAR_CHECK m4 macro
2019-02-28 01:09:30 +01:00
Peter Kokot
6d487ee177
Remove unused package2.xml file
2019-02-28 01:09:19 +01:00
Peter Kokot
6ee82a2a48
Remove not needed PHP_PDO_PEAR_CHECK m4 macro
2019-02-28 01:08:48 +01:00
Joe Watkins
0e391d14bf
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #77673 ReflectionClass::getDefaultProperties returns spooky array
2019-02-27 09:18:20 +01:00
Joe Watkins
1ca9d818b8
Fix #77673 ReflectionClass::getDefaultProperties returns spooky array
2019-02-27 09:17:09 +01:00
Nikita Popov
b4cbf6faca
Fix tests bareword fallback with error suppression
...
Re-merge commit a369326003 into PHP-7.4
(cherry picked from commit aad39879f2 )
(cherry picked from commit 76f8a908bb )
2019-02-25 17:43:07 +01:00
Nikita Popov
a8daef51e1
Merge branch 'PHP-7.3' into PHP-7.4
2019-02-25 13:02:58 +01:00
Nikita Popov
9489a7bfdb
Merge branch 'PHP-7.4'
2019-02-25 09:36:20 +01:00
Nikita Popov
251e948946
Fix some directory collisions in dir tests
2019-02-25 09:34:20 +01:00