]>
granicus.if.org Git - php/log
Peter Kokot [Sun, 5 May 2019 21:55:23 +0000 (23:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove duplicate getimagesize_variation_003 test
peter279k [Sun, 5 May 2019 19:00:14 +0000 (03:00 +0800)]
Remove duplicate getimagesize_variation_003 test
Jakub Zelenka [Sun, 5 May 2019 20:06:58 +0000 (21:06 +0100)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 5 May 2019 20:06:30 +0000 (21:06 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 5 May 2019 20:05:55 +0000 (21:05 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 5 May 2019 20:04:28 +0000 (21:04 +0100)]
Fix OpenSSL online test for ca context
The php.net is redirected to https so use nginx.org
Christoph M. Becker [Sun, 5 May 2019 15:50:15 +0000 (17:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Properly initialize variable
Christoph M. Becker [Sun, 5 May 2019 15:45:16 +0000 (17:45 +0200)]
Properly initialize variable
Not all code paths assign to `handle`, even though it may be used, so
we make sure that it is initialized to a sane value in the first place.
Christoph M. Becker [Sun, 5 May 2019 13:41:05 +0000 (15:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Christoph M. Becker [Sun, 5 May 2019 13:40:33 +0000 (15:40 +0200)]
Fix typo
Christoph M. Becker [Sat, 4 May 2019 12:25:06 +0000 (14:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Re-add common PDO tests to Firebird test suite
Christoph M. Becker [Sat, 4 May 2019 08:46:08 +0000 (10:46 +0200)]
Re-add common PDO tests to Firebird test suite
These have been inadvertently dropped when changing the test suite to
not require ext/interbase anymore, so we add them back.
We also change the required environment variable names to match the
usual PDO names. Particularly, we replace `PDO_FIREBIRD_TEST_HOSTNAME`
and `_DATABASE` with the more flexible `PDO_FIREBIRD_TEST_DSN`.
Christoph M. Becker [Sat, 4 May 2019 12:20:59 +0000 (14:20 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix memory leak exhibited by bug_aaa.phpt
Christoph M. Becker [Sat, 4 May 2019 07:42:07 +0000 (09:42 +0200)]
Fix memory leak exhibited by bug_aaa.phpt
Since a statement may be executed multiple times, we need to free
already allocated storage for output data before allocating new
storage.
Peter Kokot [Fri, 3 May 2019 16:14:53 +0000 (18:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix undefined variable, and remove unused test-pdo
peter279k [Fri, 3 May 2019 08:22:57 +0000 (16:22 +0800)]
Fix undefined variable, and remove unused test-pdo
Peter Kokot [Fri, 3 May 2019 15:34:22 +0000 (17:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update `NEWS` with changes made at #4093
Peter Kokot [Fri, 3 May 2019 15:33:05 +0000 (17:33 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update `NEWS` with changes made at #4093
Javier Spagnoletti [Fri, 3 May 2019 01:32:37 +0000 (22:32 -0300)]
Update `NEWS` with changes made at #4093
Christoph M. Becker [Fri, 3 May 2019 14:51:14 +0000 (16:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix comment
Christoph M. Becker [Fri, 3 May 2019 14:43:53 +0000 (16:43 +0200)]
Fix comment
0x2d == 45, not 46. However, `CURLMOPT_PUSHFUNCTION` is actually
available as of cURL 7.44.0[1], while we make the respective PHP
constants available only as of cURL 7.46.0[2].
[1] <https://curl.haxx.se/libcurl/c/CURLMOPT_PUSHFUNCTION.html>
[2] <http://git.php.net/?p=php-src.git;a=blob;f=ext/curl/interface.c;h=
fdf855278eef6f32f26c49b54f56aca9bd7007c3 ;hb=HEAD#l1289>
Christoph M. Becker [Fri, 3 May 2019 14:49:27 +0000 (16:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Kalle Sommer Nielsen [Thu, 2 May 2019 20:34:46 +0000 (23:34 +0300)]
NEWS
Kalle Sommer Nielsen [Thu, 2 May 2019 20:32:43 +0000 (23:32 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Include the request method in CLI server logs
Simon Welsh [Thu, 2 May 2019 09:58:24 +0000 (19:58 +1000)]
Include the request method in CLI server logs
Kalle Sommer Nielsen [Thu, 2 May 2019 20:26:03 +0000 (23:26 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove test-pcntl script
peter279k [Thu, 2 May 2019 20:11:44 +0000 (04:11 +0800)]
Remove test-pcntl script
Kalle Sommer Nielsen [Thu, 2 May 2019 20:20:20 +0000 (23:20 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
PDO_Firebird test update, round 2
Kalle Sommer Nielsen [Thu, 2 May 2019 20:19:27 +0000 (23:19 +0300)]
PDO_Firebird test update, round 2
- This renames the environment variables to: PDO_FIREBIRD_TEST_XXX to be in line with other PDO test suites
- Adds an skipif.inc file that skips the tests if no database is set
- The test suite can now be run without PDO_FIREBIRD_TEST_HOSTNAME
$ set PDO_FIREBIRD_TEST_HOSTNAME=localhost
$ set PDO_FIREBIRD_TEST_DATABASE=C:\dev\php.fdb
$ nmake test TESTS=ext/pdo_firebird/tests
Kalle Sommer Nielsen [Thu, 2 May 2019 18:48:41 +0000 (21:48 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Rewrite PDO_Firebird tests to not depend on ext/interbase
Kalle Sommer Nielsen [Thu, 2 May 2019 18:48:24 +0000 (21:48 +0300)]
Rewrite PDO_Firebird tests to not depend on ext/interbase
I have no idea how I managed to get this to work, but there is 4 new environment variables that
can be specified for the connection:
- PDO_FIREBIRD_USERNAME
- PDO_FIREBIRD_PASSWORD
- PDO_FIREBIRD_HOSTNAME
- PDO_FIREBIRD_DATABASE
(See testdb.inc for more info)
The only way I could get this to work on my local machine was with a DSN like:
- firebird:dbname=localhost:C:\php.fdb
Hence why the 'hostname' can be specified.
There is also a bit mess in regards to cleanup of this extension tests, but I really do not want to dwell down there, if someone dares to do so, then please be my guest.
Nikita Popov [Thu, 2 May 2019 13:13:30 +0000 (15:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 2 May 2019 13:13:24 +0000 (15:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Javier Spagnoletti [Tue, 30 Apr 2019 17:12:39 +0000 (14:12 -0300)]
Add more missing CURL_VERSION_* constants
And also check for CURL_VERSION_* constants in the sync-constants.php
script.
Related to request #72189: Add missing `CURL_VERSION_*` constants.
Nikita Popov [Thu, 2 May 2019 13:07:04 +0000 (15:07 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 2 May 2019 12:57:16 +0000 (14:57 +0200)]
Implement arrow functions
Per RFC: https://wiki.php.net/rfc/arrow_functions_v2
Co-authored-by: Levi Morrison <levim@php.net>
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
Christoph M. Becker [Wed, 1 May 2019 21:56:48 +0000 (23:56 +0200)]
Don't try to disable the already removed ext/interbase
Otherwise we break the build.
Kalle Sommer Nielsen [Wed, 1 May 2019 20:48:05 +0000 (23:48 +0300)]
Okay, too quick to merge, these are only relevant to 7.4
Kalle Sommer Nielsen [Wed, 1 May 2019 20:45:24 +0000 (23:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove some more interbase leftovers
Fix typo
NEWS for ext/interbase unbundling
Kalle Sommer Nielsen [Wed, 1 May 2019 20:45:06 +0000 (23:45 +0300)]
Remove some more interbase leftovers
Kalle Sommer Nielsen [Wed, 1 May 2019 20:38:17 +0000 (23:38 +0300)]
Fix typo
Kalle Sommer Nielsen [Wed, 1 May 2019 20:35:30 +0000 (23:35 +0300)]
NEWS for ext/interbase unbundling
Kalle Sommer Nielsen [Wed, 1 May 2019 20:30:25 +0000 (23:30 +0300)]
Remove this leftover
Kalle Sommer Nielsen [Wed, 1 May 2019 20:28:25 +0000 (23:28 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Move ext/interbase to pecl/database/interbase
Kalle Sommer Nielsen [Wed, 1 May 2019 20:27:04 +0000 (23:27 +0300)]
Move ext/interbase to pecl/database/interbase
https://wiki.php.net/rfc/deprecate-and-remove-ext-interbase
Dmitry Stogov [Tue, 30 Apr 2019 11:50:38 +0000 (14:50 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use ZEND_HASH_FOREACH with direct callback, instead of callbacks
Dmitry Stogov [Tue, 30 Apr 2019 11:50:01 +0000 (14:50 +0300)]
Use ZEND_HASH_FOREACH with direct callback, instead of callbacks
Christoph M. Becker [Tue, 30 Apr 2019 07:37:22 +0000 (09:37 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS wrt. sec fixes
Christoph M. Becker [Tue, 30 Apr 2019 07:36:31 +0000 (09:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS wrt. sec fixes
Christoph M. Becker [Tue, 30 Apr 2019 07:35:12 +0000 (09:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS wrt. sec fixes
Christoph M. Becker [Tue, 30 Apr 2019 07:34:53 +0000 (09:34 +0200)]
Update NEWS wrt. sec fixes
Christoph M. Becker [Tue, 30 Apr 2019 07:18:48 +0000 (09:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix typo
蝦米 [Tue, 30 Apr 2019 06:40:51 +0000 (14:40 +0800)]
fix typo
Stanislav Malyshev [Tue, 30 Apr 2019 07:06:15 +0000 (00:06 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
Stanislav Malyshev [Tue, 30 Apr 2019 07:06:10 +0000 (00:06 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
Stanislav Malyshev [Tue, 30 Apr 2019 07:05:43 +0000 (00:05 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
Stanislav Malyshev [Tue, 30 Apr 2019 07:05:32 +0000 (00:05 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
Stanislav Malyshev [Tue, 30 Apr 2019 06:38:12 +0000 (23:38 -0700)]
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
Stanislav Malyshev [Tue, 30 Apr 2019 05:10:21 +0000 (22:10 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77821: Potential heap corruption in TSendMail()
Stanislav Malyshev [Tue, 30 Apr 2019 05:09:15 +0000 (22:09 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77821: Potential heap corruption in TSendMail()
Stanislav Malyshev [Tue, 30 Apr 2019 05:09:10 +0000 (22:09 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77821: Potential heap corruption in TSendMail()
Stanislav Malyshev [Tue, 30 Apr 2019 05:09:04 +0000 (22:09 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77821: Potential heap corruption in TSendMail()
Christoph M. Becker [Fri, 29 Mar 2019 10:12:09 +0000 (11:12 +0100)]
Fix #77821: Potential heap corruption in TSendMail()
`zend_string_tolower()` returns a copy (not a duplicate) of the given
string, if it is already in lower case. In this case we must not not
`zend_string_free()` both strings. The cleanest solution is to call
` zend_string_release()` on both strings, which properly handles the
refcount.
Dmitry Stogov [Mon, 29 Apr 2019 23:22:58 +0000 (02:22 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Also, use ZEND_ACC_PRELOADED for classes
Dmitry Stogov [Mon, 29 Apr 2019 23:07:02 +0000 (02:07 +0300)]
Also, use ZEND_ACC_PRELOADED for classes
Dmitry Stogov [Mon, 29 Apr 2019 21:23:57 +0000 (00:23 +0300)]
Fixed JIT for preloaded functions and classes
Peter Kokot [Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove TSRM configuration header
Peter Kokot [Mon, 29 Apr 2019 20:34:43 +0000 (22:34 +0200)]
Remove TSRM configuration header
TSRM configuration header file was once created by separate autoconf
build system for TSRM and is with the current code not directly needed
like this anymore.
Christoph M. Becker [Mon, 29 Apr 2019 15:24:48 +0000 (17:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 15:24:18 +0000 (17:24 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 15:23:45 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 15:23:16 +0000 (17:23 +0200)]
Fix #77943: imageantialias($image, false); does not work
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
Christoph M. Becker [Mon, 29 Apr 2019 14:30:22 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:29:49 +0000 (16:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:29:29 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:29:08 +0000 (16:29 +0200)]
Add tests for bug77943
Christoph M. Becker [Mon, 29 Apr 2019 14:19:21 +0000 (16:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 14:18:54 +0000 (16:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 14:17:58 +0000 (16:17 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77943: imageantialias($image, false); does not work
Christoph M. Becker [Mon, 29 Apr 2019 14:14:26 +0000 (16:14 +0200)]
Fix #77943: imageantialias($image, false); does not work
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
Nikita Popov [Mon, 29 Apr 2019 12:18:07 +0000 (14:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 12:17:44 +0000 (14:17 +0200)]
Add UPGRADING entries
Hugh McMaster [Sat, 27 Apr 2019 08:47:10 +0000 (18:47 +1000)]
Use PKG_CHECK_MODULES to detect the zip library
Hugh McMaster [Wed, 24 Apr 2019 13:27:50 +0000 (23:27 +1000)]
Use PKG_CHECK_MODULES to detect the libsodium library
Hugh McMaster [Wed, 24 Apr 2019 11:39:17 +0000 (21:39 +1000)]
Always use pkg-config from the host architecture
Nikita Popov [Mon, 29 Apr 2019 11:54:04 +0000 (13:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 11:53:57 +0000 (13:53 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Apr 2019 11:53:21 +0000 (13:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Apr 2019 11:51:26 +0000 (13:51 +0200)]
Fixed bug #77945
Make sure that we proper distinguish between empty string key and
no key during SDL serialization.
Christoph M. Becker [Mon, 29 Apr 2019 10:18:11 +0000 (12:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Properly initialize out parameter
Christoph M. Becker [Mon, 29 Apr 2019 10:17:38 +0000 (12:17 +0200)]
Properly initialize out parameter
The MS docs on `SQLColAttribute()`[1] state regarding the
`NumericAttributePtr` parameter:
| Please note that some drivers may only write the lower 32-bit or
| 16-bit of a buffer and leave the higher-order bit unchanged.
| Therefore, applications should initialize the value to 0 before
| calling this function.
[1] <https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/sqlcolattribute-function?view=sql-server-2017>
Markus Staab [Mon, 29 Apr 2019 09:03:58 +0000 (11:03 +0200)]
fixed typo
Nikita Popov [Mon, 29 Apr 2019 08:23:46 +0000 (10:23 +0200)]
Merge branch 'PHP-7.4'
Jury [Mon, 29 Apr 2019 02:58:11 +0000 (22:58 -0400)]
Adds json_encode test for unpacked arrays
Christoph M. Becker [Mon, 29 Apr 2019 08:21:44 +0000 (10:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Extend CURLFile to support streams
Christoph M. Becker [Mon, 29 Apr 2019 08:21:07 +0000 (10:21 +0200)]
Extend CURLFile to support streams
Due to former restrictions of the libcurl API, curl multipart/formdata
file uploads supported only proper files. However, as of curl 7.56.0
the new `curl_mime_*()` API is available (and already supported by
PHP[1]), which allows us to support arbitrary *seekable* streams, which
is generally desirable, and particularly resolves issues with the
transparent Unicode and long part support on Windows (see bug #77711).
Note that older curl versions are still supported, but CURLFile is
still restricted to proper files in this case.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
a83b68ba56714bfa06737a61af795460caa4a105 >
Nikita Popov [Mon, 29 Apr 2019 07:58:56 +0000 (09:58 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Apr 2019 07:58:45 +0000 (09:58 +0200)]
Fix typo in TRY_ASSIGN macro name
Christoph M. Becker [Mon, 29 Apr 2019 07:07:45 +0000 (09:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tests
Christoph M. Becker [Mon, 29 Apr 2019 07:07:13 +0000 (09:07 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix tests