]>
granicus.if.org Git - php/log
George Peter Banyard [Fri, 10 Jan 2020 01:53:05 +0000 (02:53 +0100)]
Remove unused delimiter parameter in php_fgetcsv_lookup_trailing_spaces subroutine.
Christoph M. Becker [Thu, 9 Jan 2020 18:03:43 +0000 (19:03 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Silence potential taskkill error messages
Christoph M. Becker [Thu, 9 Jan 2020 17:58:17 +0000 (18:58 +0100)]
Silence potential taskkill error messages
That test is still intermittently failing, because failure to kill the
child process is reported. Therefore we silence these error messages.
Nikita Popov [Thu, 9 Jan 2020 17:55:31 +0000 (18:55 +0100)]
Convert infallible mysqli checks to asserts
Nikita Popov [Thu, 9 Jan 2020 16:16:29 +0000 (17:16 +0100)]
Remove unused MYSQLI_STATUS_CLEARED
Christoph M. Becker [Thu, 9 Jan 2020 17:40:58 +0000 (18:40 +0100)]
Fix test
The typo in the echoed string had been fixed in master; fix the
expectation as well.
Christoph M. Becker [Thu, 9 Jan 2020 16:44:41 +0000 (17:44 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix useless tests
Christoph M. Becker [Thu, 9 Jan 2020 14:19:56 +0000 (15:19 +0100)]
Fix useless tests
These tests are certainly not supposed to fail due to a typo in the
class names, but expect this failure. We fix the typos and the
expectations.
Christoph M. Becker [Sun, 5 Jan 2020 19:26:35 +0000 (20:26 +0100)]
Allows further tests to run on Windows
Christoph M. Becker [Sun, 5 Jan 2020 18:28:34 +0000 (19:28 +0100)]
Use IS_WINDOWS
Christoph M. Becker [Sun, 5 Jan 2020 18:26:39 +0000 (19:26 +0100)]
Replace fakemail with minimal PHP script
Christoph M. Becker [Sun, 5 Jan 2020 15:46:27 +0000 (16:46 +0100)]
Unify mail related tests for *nix and Windows
Currently mail related tests are split for *nix and Windows (if there
are even Windows versions). The basic difference is that the *nix
variants set the INI directive sendmail_path to just write the email to
disk, while the Windows tests use ext/imap. The latter tests are way
more verbose, and such duplicated tests are generally a pain point.
Furthermore, the Windows tests are much slower, and could not be run
without ext/imap being available.
We therefore introduce a small fakemail application, which basically
works like `tee <path> >/dev/null`, and which will be shipped with the
Windows tests packs. fakemail.exe would also need to be added to the
PHP binary SDK, so these tests could be run during developments.
To cater to the remaining differences, we also introduce support for
`{MAIL:<path>}` placeholders in the INI sections to run-tests.php. How
to use this can be seen in mail_basic.phpt, which is currently the only
modified test case, because these tests are yet supposed to fail on
Windows, due to the missing fakemail.exe in the PHP SDK.
Nikita Popov [Thu, 9 Jan 2020 09:20:28 +0000 (10:20 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Increase select timeout in FPM tester
Nikita Popov [Thu, 9 Jan 2020 09:19:02 +0000 (10:19 +0100)]
Increase select timeout in FPM tester
Let's see if that helps with the recent failure spree on Azure.
Christoph M. Becker [Thu, 9 Jan 2020 08:26:58 +0000 (09:26 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79086: Bump version not applied
Christoph M. Becker [Thu, 9 Jan 2020 08:19:52 +0000 (09:19 +0100)]
Fix #79086: Bump version not applied
We must not forget to update the version in configure.ac as well.
George Peter Banyard [Sun, 8 Dec 2019 12:30:46 +0000 (13:30 +0100)]
Convert some warnings to Errors in BZip2
Closes GH-4984
George Peter Banyard [Sun, 8 Dec 2019 13:15:27 +0000 (14:15 +0100)]
Convert some warnings to Error in zlib extension
Closes GH-4985
George Peter Banyard [Wed, 8 Jan 2020 23:38:47 +0000 (00:38 +0100)]
[ci skip] Update UPGRADING
Christoph M. Becker [Wed, 8 Jan 2020 23:17:14 +0000 (00:17 +0100)]
Avoid superfluous assignments
These values are already set via the initializers.
Christoph M. Becker [Wed, 8 Jan 2020 17:43:35 +0000 (18:43 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79078: Hypothetical use-after-free in curl_multi_add_handle()
Christoph M. Becker [Wed, 8 Jan 2020 17:31:10 +0000 (18:31 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79078: Hypothetical use-after-free in curl_multi_add_handle()
Christoph M. Becker [Wed, 8 Jan 2020 10:52:24 +0000 (11:52 +0100)]
Fix #79078: Hypothetical use-after-free in curl_multi_add_handle()
To avoid this, we have to verify the handlers already in
`curl_multi_add_handle()`, not only in `curl_multi_exec()`.
Christoph M. Becker [Wed, 8 Jan 2020 17:27:53 +0000 (18:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump version
Christoph M. Becker [Wed, 8 Jan 2020 17:26:14 +0000 (18:26 +0100)]
Bump version
Christoph M. Becker [Wed, 8 Jan 2020 15:56:28 +0000 (16:56 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Extract function
Christoph M. Becker [Wed, 8 Jan 2020 15:54:31 +0000 (16:54 +0100)]
Extract function
As suggested by Nikita[1].
[1] <https://github.com/php/php-src/pull/5045#discussion_r364265013>
Nikita Popov [Wed, 8 Jan 2020 15:32:00 +0000 (16:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Display a message if select in FPM test timeouts"
Nikita Popov [Wed, 8 Jan 2020 15:31:33 +0000 (16:31 +0100)]
Revert "Display a message if select in FPM test timeouts"
This reverts commit
e2361498d519561e7eb5b73d138c1eaa80da2a20 .
Ooops, this occurs normally during some tests, but I didn't notice
because I have slow tests disabled...
Nikita Popov [Wed, 8 Jan 2020 14:57:21 +0000 (15:57 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Display a message if select in FPM test timeouts
Nikita Popov [Wed, 8 Jan 2020 14:56:37 +0000 (15:56 +0100)]
Display a message if select in FPM test timeouts
Nikita Popov [Wed, 8 Jan 2020 13:32:11 +0000 (14:32 +0100)]
Fix #49555: Improve "function must be a string" error message
Be more specific for the individual cases and provide relevant
type information.
Nikita Popov [Wed, 8 Jan 2020 13:26:27 +0000 (14:26 +0100)]
Refer to method rather than function name in error message
Nikita Popov [Wed, 8 Jan 2020 13:18:14 +0000 (14:18 +0100)]
Fix #65274: Add class name to undef class constant error
George Peter Banyard [Tue, 7 Jan 2020 21:55:43 +0000 (22:55 +0100)]
Add warning and convert to exception in string offset assignment:
Convert the empty string assignment to an Error as per RFC [1]
Add a warning that only the first byte will be assigned to the offset if provided
a needle that is longer than one byte.
[1] https://wiki.php.net/rfc/engine_warnings
Closes GH-5063
George Peter Banyard [Sat, 7 Dec 2019 01:44:34 +0000 (02:44 +0100)]
Allow empty needles in mb_strpos and mb_strstr function family.
MBstring analogous implementation to
6d578482a933be7597b686b59a935b316161d251
Closes GH-4977
George Peter Banyard [Tue, 7 Jan 2020 20:51:34 +0000 (21:51 +0100)]
Add warning and convert to exception in string offset assignment:
Convert the empty string assignment to an Error as per RFC [1]
Add a warning that only the first byte will be assigned to the offset if provided
a needle that is longer than one byte.
[1] https://wiki.php.net/rfc/engine_warnings
Christoph M. Becker [Tue, 7 Jan 2020 14:29:51 +0000 (15:29 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make test more resilient
Christoph M. Becker [Tue, 7 Jan 2020 14:28:48 +0000 (15:28 +0100)]
Make test more resilient
Depending on the libcurl version and perhaps configuration, it may show
additional info (due to `CURLOPT_VERBOSE` being activated), which we
have to ignore, to avoid spurious test failures.
Nikita Popov [Tue, 7 Jan 2020 13:53:25 +0000 (14:53 +0100)]
Renumber zval types, clarify allowed overlap
Make it clear that types used for type declarations can overlap
with the rest, and can also overlap in MAY_BE space.
This makes things more robust against the addition of new primitive
types.
Christoph M. Becker [Tue, 7 Jan 2020 13:27:34 +0000 (14:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Increase sleep() time in test case
Christoph M. Becker [Tue, 7 Jan 2020 13:24:55 +0000 (14:24 +0100)]
Increase sleep() time in test case
Apparently, the former increase to `sleep(2)` helped somewhat, but
still the test fails occassionally.
Christoph M. Becker [Tue, 7 Jan 2020 10:13:24 +0000 (11:13 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump version
Christoph M. Becker [Tue, 7 Jan 2020 10:10:55 +0000 (11:10 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump version
Christoph M. Becker [Tue, 7 Jan 2020 10:03:19 +0000 (11:03 +0100)]
Bump version
Nikita Popov [Mon, 6 Jan 2020 21:42:31 +0000 (22:42 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove support for preloading on Windows
Nikita Popov [Tue, 10 Dec 2019 13:29:58 +0000 (14:29 +0100)]
Remove support for preloading on Windows
Due to ASLR restrictions, preloading on Windows does not work with
any code that has preloading dependencies on internal classes.
This effectively makes it unusable for any non-trivial codebase.
Instead of pretending like preloading is going to work, only to
make people realize that it really doesn't once they get beyond
a dummy example, we disable support for preloading on Windows
entirely.
Closes GH-4999.
Nikita Popov [Mon, 6 Jan 2020 17:47:44 +0000 (18:47 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Throw Error when referencing uninit typed prop in __sleep
Nikita Popov [Fri, 3 Jan 2020 14:35:10 +0000 (15:35 +0100)]
Throw Error when referencing uninit typed prop in __sleep
Previously this generated a notice, but would likely generate an
Error when unserializing.
Now we treat it with the same distinction as direct property
accesses, i.e. referencing an unset/undefined normal property
stays a notice, while a typed property becomes an Error exception.
This fixed bug #79002.
Closes GH-5050.
Christoph M. Becker [Mon, 6 Jan 2020 14:34:22 +0000 (15:34 +0100)]
[ci skip] Merge branch 'PHP-7.4'
Empty merge.
Christoph M. Becker [Mon, 6 Jan 2020 14:32:40 +0000 (15:32 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
Empty merge.
Christoph M. Becker [Mon, 6 Jan 2020 14:19:34 +0000 (15:19 +0100)]
Revert "Extend CURLFile to support streams"
This reverts commit
17a9f1401aeb35fe1e3657b38102a410d151d42f , because
this commit would break ABI, and also due to bug #79013.
We keep the commit for PHP 7.4+, though.
Christoph M. Becker [Mon, 6 Jan 2020 13:51:14 +0000 (14:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #54298: Using empty additional_headers adding extraneous CRLF
Christoph M. Becker [Mon, 6 Jan 2020 13:48:22 +0000 (14:48 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #54298: Using empty additional_headers adding extraneous CRLF
Christoph M. Becker [Sun, 5 Jan 2020 14:15:09 +0000 (15:15 +0100)]
Fix #54298: Using empty additional_headers adding extraneous CRLF
If the header string is empty, we pass `NULL` to `php_mail()` to avoid
further checks on the string length.
Nikita Popov [Mon, 6 Jan 2020 13:43:05 +0000 (14:43 +0100)]
Rename skeleton stub file
Add the .php suffix
Christoph M. Becker [Mon, 6 Jan 2020 12:24:07 +0000 (13:24 +0100)]
Fix hypothetical segfault in gdTransformAffineCopy()
This has been reported to upstream[1], but since ext/gd never calls
`gdTransformAffineCopy()` for a palette image, it is not a bug for PHP.
Therefore we apply the fix to master only.
[1] <https://github.com/libgd/libgd/issues/586>
Nikita Popov [Mon, 6 Jan 2020 09:43:05 +0000 (10:43 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't link against openssl 1.1 in curl
Nikita Popov [Mon, 6 Jan 2020 09:40:43 +0000 (10:40 +0100)]
Don't link against openssl 1.1 in curl
OpenSSL 1.1 does not need crypto locking callbacks, so avoid
detecting and linking against it in the first place.
Christoph M. Becker [Mon, 6 Jan 2020 09:39:00 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79068: gdTransformAffineCopy() changes interpolation method
Christoph M. Becker [Mon, 6 Jan 2020 09:38:08 +0000 (10:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79068: gdTransformAffineCopy() changes interpolation method
Christoph M. Becker [Mon, 6 Jan 2020 09:33:47 +0000 (10:33 +0100)]
Fix #79068: gdTransformAffineCopy() changes interpolation method
We port
<https://github.com/libgd/libgd/commit/
9088591eae437358ee5b929adf82865e37e3001e >.
Nikita Popov [Mon, 6 Jan 2020 09:31:34 +0000 (10:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH
Clean up curl openssl check
Nikita Popov [Mon, 6 Jan 2020 09:29:41 +0000 (10:29 +0100)]
Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH
Nikita Popov [Mon, 6 Jan 2020 09:16:42 +0000 (10:16 +0100)]
Clean up curl openssl check
Only set HAVE_CURL_OPENSSL flag, and remove Windows specific code,
as all of this is only relevant for OpenSSL < 1.1, which is not
used on Windows.
Christoph M. Becker [Mon, 6 Jan 2020 08:38:19 +0000 (09:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79067: gdTransformAffineCopy() may use unitialized values
Christoph M. Becker [Mon, 6 Jan 2020 08:36:49 +0000 (09:36 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79067: gdTransformAffineCopy() may use unitialized values
Christoph M. Becker [Mon, 6 Jan 2020 08:35:13 +0000 (09:35 +0100)]
Fix #79067: gdTransformAffineCopy() may use unitialized values
We port
<https://github.com/libgd/libgd/commit/
7a06c1669c563917bc48c464521e3de962ddb4e8 >.
Christoph M. Becker [Mon, 6 Jan 2020 07:53:50 +0000 (08:53 +0100)]
Remove useless else branch
Passing `NULL` as `gdTransformAffineGetImage()`'s `src_area` is fine,
but in this case there's no need to calculate the `rect`, and since
`pRect` has already been initialized to `NULL`, we can remove the whole
else branch.
Máté Kocsis [Sat, 4 Jan 2020 10:01:59 +0000 (11:01 +0100)]
Throw exception for unconstructed intl objects
Closes GH-5052
Christoph M. Becker [Sun, 5 Jan 2020 19:08:39 +0000 (20:08 +0100)]
Remove duplicate test cases
These had originally used other exit codes as mail_basic5.phpt, but
that was changed later with commit
d1b12c9 [1].
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
d1b12c9a3031841302722d6f6706e4598a639d7a >
Gabriel Caruso [Sat, 2 Nov 2019 15:29:42 +0000 (16:29 +0100)]
Fix slowest tests
Matteo Beccati [Sat, 4 Jan 2020 09:27:43 +0000 (10:27 +0100)]
Fix build if SQLITE_RECURSIVE is not supported
Tyson Andre [Sat, 4 Jan 2020 00:04:20 +0000 (19:04 -0500)]
Merge branch 'identical-handler' into HEAD
Máté Kocsis [Fri, 3 Jan 2020 21:40:16 +0000 (22:40 +0100)]
Fix usage of RETURN_THROWS() in LDAP extension
Máté Kocsis [Fri, 3 Jan 2020 19:44:29 +0000 (20:44 +0100)]
Use RETURN_THROWS() in various places
Máté Kocsis [Fri, 3 Jan 2020 18:16:51 +0000 (19:16 +0100)]
Use RETURN_THROWS() after zend_fetch_resource*()
Máté Kocsis [Sat, 12 Oct 2019 19:53:15 +0000 (21:53 +0200)]
Add stubs for various intl functions
Closes GH-4819
- Add stubs for idn functions
- Add stubs for grapheme functions
- Add stubs for Spoofchecker
- Add stubs for Normalizer
- Add stubs for ResourceBundle
- Fix arginfos
- Add support for union return types
- Fix arginfo for resourcebundle_create()
Christoph M. Becker [Fri, 3 Jan 2020 17:51:25 +0000 (18:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
Christoph M. Becker [Fri, 3 Jan 2020 17:49:36 +0000 (18:49 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
Christoph M. Becker [Thu, 14 Nov 2019 10:21:41 +0000 (11:21 +0100)]
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
We implement support for a fifth parameter, which allows to specify the
mapsize. The parameter defaults to zero, in which case the compiled in
default mapsize (usually
1048576 ) will be used. The mapsize should be
a multiple of the page size of the OS.
Christoph M. Becker [Fri, 3 Jan 2020 17:13:44 +0000 (18:13 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78538: shmop memory leak
Christoph M. Becker [Fri, 3 Jan 2020 17:12:41 +0000 (18:12 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78538: shmop memory leak
Christoph M. Becker [Mon, 25 Nov 2019 13:05:15 +0000 (14:05 +0100)]
Fix #78538: shmop memory leak
If the descriptor's refcount drops to zero, we have to unmap the
respective file view, to avoid leaking memory.
Máté Kocsis [Fri, 3 Jan 2020 16:04:06 +0000 (17:04 +0100)]
Use RETURN_THROWS() after try_convert_to_string()
mike [Mon, 16 Dec 2019 13:31:14 +0000 (14:31 +0100)]
Adding DateTime(Immutable)::createFromInterface()
These are like
DateTime::createFromImmutable()
DateTimeImmutable::createFromMutable()
but accept any DateTimeInterface instead.
Closes GH-5016.
Nikita Popov [Fri, 3 Jan 2020 15:49:42 +0000 (16:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Slightly increase tolerance in time_sleep_until() test
Nikita Popov [Fri, 3 Jan 2020 15:48:06 +0000 (16:48 +0100)]
Slightly increase tolerance in time_sleep_until() test
With the 1ms tolerance this still occasionally fails on macos.
I love macos. It always works and causes no problems at all.
Christoph M. Becker [Fri, 3 Jan 2020 15:45:23 +0000 (16:45 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to fix intermittently failing test case
Christoph M. Becker [Fri, 3 Jan 2020 15:44:53 +0000 (16:44 +0100)]
Try to fix intermittently failing test case
This test fails intermittently due to taskill reporting failure to kill
the process (because it already has been terminated). We increase the
sleep time, to hopefully prevent that from happening again.
Christoph M. Becker [Fri, 3 Jan 2020 13:32:56 +0000 (14:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79015: undefined-behavior in php_date.c
Christoph M. Becker [Fri, 3 Jan 2020 13:32:04 +0000 (14:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79015: undefined-behavior in php_date.c
Christoph M. Becker [Mon, 23 Dec 2019 13:42:54 +0000 (14:42 +0100)]
Fix #79015: undefined-behavior in php_date.c
We check that the given microsecond fraction is in the valid range
[0,
1000000 [, and otherwise mark it as invalid. We also drop the
useless do loop; a plain block is sufficient here.
Christoph M. Becker [Fri, 27 Dec 2019 13:04:31 +0000 (14:04 +0100)]
Don't enable sanitizer by default for Windows snapshot builds
Snapshot builds are release builds, and therefore enabling sanitizers
is undesireable.
Máté Kocsis [Fri, 3 Jan 2020 11:11:45 +0000 (12:11 +0100)]
Convert zend_parse_parameters_none() to fast ZPP
I've done the conversion in those extensions where fast ZPP is predominant.
Máté Kocsis [Fri, 3 Jan 2020 12:22:16 +0000 (13:22 +0100)]
Use zend_parse_parameters_none() instead of zend_parse_parameters_none_throw()
Nikita Popov [Fri, 3 Jan 2020 11:03:31 +0000 (12:03 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unnecessary strncpy in zip
Nikita Popov [Fri, 3 Jan 2020 10:51:46 +0000 (11:51 +0100)]
Remove unnecessary strncpy in zip
This causes a warning on GCC 9 and is unnecessary to boot: We
only use "cwd" for the open_basedir check, so we can just as well
pass in the original string.
Nikita Popov [Fri, 3 Jan 2020 10:27:27 +0000 (11:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #73816
Nikita Popov [Fri, 3 Jan 2020 10:26:31 +0000 (11:26 +0100)]
Add test for bug #73816
This has been fixed by
0f2cdbf214efd98b4bdaf5ca41728faf00e7c037 ,
add the test case.