]>
granicus.if.org Git - php/log
Christopher Jones [Fri, 7 Dec 2018 12:22:30 +0000 (23:22 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 11 Oct 2018 10:33:26 +0000 (12:33 +0200)]
Drop unnecessary HASH_OF uses in ext/oci8
These only operate on arrays.
Christopher Jones [Fri, 7 Dec 2018 12:20:27 +0000 (23:20 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Fri, 7 Dec 2018 12:07:37 +0000 (23:07 +1100)]
Simplify based on feedback from nikic
Christopher Jones [Fri, 7 Dec 2018 10:41:34 +0000 (21:41 +1100)]
Sync with test files
Christoph M. Becker [Thu, 6 Dec 2018 16:15:43 +0000 (17:15 +0100)]
[ci skip] Fix NEWS wrt. ChangeLog conversion
We have to be rather picky in this regard; otherwise we need to
manually post process the ChangeLog.
Christoph M. Becker [Wed, 5 Dec 2018 23:24:25 +0000 (00:24 +0100)]
[ci skip] Fix typo
Ferenc Kovacs [Wed, 5 Dec 2018 08:44:22 +0000 (09:44 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Ferenc Kovacs [Wed, 5 Dec 2018 08:36:31 +0000 (09:36 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 5 Dec 2018 08:30:20 +0000 (09:30 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 5 Dec 2018 08:25:53 +0000 (09:25 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 5 Dec 2018 08:13:30 +0000 (09:13 +0100)]
5.6.40 will be next. probably not
Côme Chilliet [Tue, 4 Dec 2018 16:15:55 +0000 (17:15 +0100)]
Add LDAP information in UPGRADING
Anatol Belski [Tue, 4 Dec 2018 11:50:40 +0000 (12:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync NEWS [ci skip]
Anatol Belski [Tue, 4 Dec 2018 11:50:04 +0000 (12:50 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync NEWS [ci skip]
Anatol Belski [Tue, 4 Dec 2018 11:49:42 +0000 (12:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync NEWS [ci skip]
Anatol Belski [Tue, 4 Dec 2018 11:49:10 +0000 (12:49 +0100)]
Sync NEWS [ci skip]
Jakub Zelenka [Mon, 3 Dec 2018 18:30:41 +0000 (18:30 +0000)]
Update UPGRADING with info about FPM logging changes
Stanislav Malyshev [Mon, 3 Dec 2018 18:20:07 +0000 (10:20 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix null pointer deref in qprint-encode filter (bug #77231)
Stanislav Malyshev [Mon, 3 Dec 2018 18:20:02 +0000 (10:20 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix null pointer deref in qprint-encode filter (bug #77231)
Stanislav Malyshev [Mon, 3 Dec 2018 18:19:57 +0000 (10:19 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix null pointer deref in qprint-encode filter (bug #77231)
Stanislav Malyshev [Mon, 3 Dec 2018 18:19:49 +0000 (10:19 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix null pointer deref in qprint-encode filter (bug #77231)
Stanislav Malyshev [Mon, 3 Dec 2018 10:12:11 +0000 (02:12 -0800)]
Fix null pointer deref in qprint-encode filter (bug #77231)
Christoph M. Becker [Mon, 3 Dec 2018 12:56:14 +0000 (13:56 +0100)]
[ci skip] Prepare NEWS for 7.3 GA
Stanislav Malyshev [Mon, 3 Dec 2018 08:42:55 +0000 (00:42 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77143 - add more checks to buffer reads
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Don't need interactive progress on git clones in Travis
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
Stanislav Malyshev [Mon, 3 Dec 2018 08:42:50 +0000 (00:42 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77143 - add more checks to buffer reads
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Stanislav Malyshev [Mon, 3 Dec 2018 08:42:45 +0000 (00:42 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #77143 - add more checks to buffer reads
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Stanislav Malyshev [Mon, 3 Dec 2018 08:42:35 +0000 (00:42 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #77143 - add more checks to buffer reads
Stanislav Malyshev [Mon, 12 Nov 2018 22:02:26 +0000 (14:02 -0800)]
Fix bug #77143 - add more checks to buffer reads
Stanislav Malyshev [Mon, 3 Dec 2018 08:39:03 +0000 (00:39 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #77143 - add more checks to buffer reads
Fix #77020: null pointer dereference in imap_mail
Stanislav Malyshev [Mon, 12 Nov 2018 22:02:26 +0000 (14:02 -0800)]
Fix bug #77143 - add more checks to buffer reads
Stanislav Malyshev [Sun, 11 Nov 2018 18:04:01 +0000 (10:04 -0800)]
Fix #77020: null pointer dereference in imap_mail
If an empty $message is passed to imap_mail(), we must not set message
to NULL, since _php_imap_mail() is not supposed to handle NULL pointers
(opposed to pointers to NUL).
Stanislav Malyshev [Mon, 3 Dec 2018 00:04:33 +0000 (16:04 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Don't need interactive progress on git clones in Travis
Philip Prindeville [Sun, 8 Jul 2018 16:55:54 +0000 (10:55 -0600)]
Don't need interactive progress on git clones in Travis
Travis logs are usually inspected after the build completes, by which time
progress info is useless.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Stanislav Malyshev [Sun, 2 Dec 2018 23:12:15 +0000 (15:12 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
Stanislav Malyshev [Sun, 2 Dec 2018 21:38:59 +0000 (13:38 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
Stanislav Malyshev [Sun, 2 Dec 2018 21:18:07 +0000 (13:18 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
Stanislav Malyshev [Sun, 2 Dec 2018 20:54:19 +0000 (12:54 -0800)]
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Alexander Kurilo [Sun, 2 Dec 2018 07:53:45 +0000 (10:53 +0300)]
Regenerate certificates for openssl tests
Stanislav Malyshev [Sun, 2 Dec 2018 20:06:13 +0000 (12:06 -0800)]
Improve test for bug77022
Jakub Zelenka [Sun, 2 Dec 2018 19:38:38 +0000 (19:38 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Alexander Kurilo [Sun, 2 Dec 2018 07:53:45 +0000 (10:53 +0300)]
Regenerate certificates for openssl tests
Stanislav Malyshev [Sun, 2 Dec 2018 05:48:44 +0000 (21:48 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Stanislav Malyshev [Sun, 2 Dec 2018 05:48:40 +0000 (21:48 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Stanislav Malyshev [Sun, 2 Dec 2018 05:48:35 +0000 (21:48 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Stanislav Malyshev [Sun, 2 Dec 2018 05:07:05 +0000 (21:07 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #77022 - use file mode or umask for new files
Stanislav Malyshev [Sun, 2 Dec 2018 05:47:49 +0000 (21:47 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77022 - use file mode or umask for new files
Stanislav Malyshev [Sun, 2 Dec 2018 05:47:44 +0000 (21:47 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77022 - use file mode or umask for new files
Stanislav Malyshev [Sun, 2 Dec 2018 05:47:37 +0000 (21:47 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #77022 - use file mode or umask for new files
Stanislav Malyshev [Sun, 2 Dec 2018 05:07:05 +0000 (21:07 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #77022 - use file mode or umask for new files
Stanislav Malyshev [Sun, 2 Dec 2018 05:04:56 +0000 (21:04 -0800)]
Fix bug #77022 - use file mode or umask for new files
Anatol Belski [Sat, 1 Dec 2018 16:10:43 +0000 (17:10 +0100)]
Update NEWS [ci skip]
Anatol Belski [Sat, 1 Dec 2018 09:24:06 +0000 (10:24 +0100)]
Fixed bug #77193 Infinite loop in preg_replace_callback
Don't return preallocated match data more than once in nested calls.
Christoph M. Becker [Thu, 29 Nov 2018 01:18:16 +0000 (02:18 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77051: Issue with re-binding on SQLite3
BohwaZ [Thu, 22 Nov 2018 15:57:55 +0000 (16:57 +0100)]
Fix #77051: Issue with re-binding on SQLite3
We have to call `sqlite3_reset()` before re-binding the parameters.
Stanislav Malyshev [Wed, 28 Nov 2018 23:47:07 +0000 (15:47 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add DISPLAY_INI_ENTRIES for imap
Disable rsh/ssh functionality in imap by default (bug #77153)
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Wed, 28 Nov 2018 23:47:00 +0000 (15:47 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add DISPLAY_INI_ENTRIES for imap
Disable rsh/ssh functionality in imap by default (bug #77153)
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Wed, 28 Nov 2018 23:46:53 +0000 (15:46 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add DISPLAY_INI_ENTRIES for imap
Disable rsh/ssh functionality in imap by default (bug #77153)
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Wed, 28 Nov 2018 23:46:39 +0000 (15:46 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add DISPLAY_INI_ENTRIES for imap
Stanislav Malyshev [Wed, 28 Nov 2018 23:45:51 +0000 (15:45 -0800)]
Add DISPLAY_INI_ENTRIES for imap
Derick Rethans [Wed, 28 Nov 2018 20:35:16 +0000 (20:35 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Wed, 28 Nov 2018 20:29:24 +0000 (20:29 +0000)]
Fixed bug #77097 (DateTime::diff gives wrong diff when the actual diff is less than 1 second) by upgrading to timelib 2017.09
Nikita Popov [Wed, 28 Nov 2018 19:10:06 +0000 (20:10 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 28 Nov 2018 19:08:39 +0000 (20:08 +0100)]
Fixed bug #77215
Remove invalid assertion: A block can have multiple switch frees,
so if we don't do live range block splitting, it is not necessarily
true that the free is located at the start of a block.
Nikita Popov [Tue, 27 Nov 2018 18:44:45 +0000 (19:44 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 27 Nov 2018 18:43:25 +0000 (19:43 +0100)]
Improve fix for #76046
Also locate the JMP at the start of the foreach.
Patch suggested by Derick.
Nikita Popov [Tue, 27 Nov 2018 15:39:07 +0000 (16:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 27 Nov 2018 15:37:55 +0000 (16:37 +0100)]
Fixed bug #76046
Place FE_FREE on start line of foreach, instead of whatever random
line number might be in CG(zend_lineno) at the time.
Nikita Popov [Mon, 26 Nov 2018 21:49:09 +0000 (22:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Colin Basnett [Wed, 21 Nov 2018 21:40:43 +0000 (13:40 -0800)]
Fixed bug #77184
The U in URATIONAL is for unsigned, so the values should be printed
as unsigned.
Adam Baratz [Mon, 26 Nov 2018 15:39:24 +0000 (10:39 -0500)]
update NEWS
Adam Baratz [Mon, 26 Nov 2018 15:36:18 +0000 (10:36 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Check column number before trying to fetch the value
Sergei Morozov [Wed, 7 Nov 2018 20:34:50 +0000 (12:34 -0800)]
Check column number before trying to fetch the value
Christoph M. Becker [Mon, 26 Nov 2018 14:26:48 +0000 (15:26 +0100)]
Use zend_empty_array
No need to define our own `com_dotnet_object_properties` as empty hash,
since we can use `zend_empty_array` instead as of PHP 7.3.0.
Cf. <https://github.com/php/php-src/pull/3672#issuecomment-
440467704 >.
Christoph M. Becker [Sun, 25 Nov 2018 18:02:33 +0000 (19:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
Christoph M. Becker [Sun, 25 Nov 2018 18:00:50 +0000 (19:00 +0100)]
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
We apply the upstream patch[1].
[1] <https://github.com/libgd/libgd/commit/
6613094e5d218dc4d4372757aef5e58c6462a9f7 >
Christoph M. Becker [Sun, 25 Nov 2018 14:53:10 +0000 (15:53 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77198: auto cropping has insufficient precision
Christoph M. Becker [Sun, 25 Nov 2018 14:41:27 +0000 (15:41 +0100)]
Fix #77198: auto cropping has insufficient precision
We apply the upstream patch[1], and also fix the erroneous bailout at
the end of `gdImageAutoCrop()`, since `crop.x` and `crop.y` may very
well be zero.
[1] <https://github.com/libgd/libgd/commit/
bda85aaeeb1d7467d92c892ba4c30eaa53d7a6d4 >
Frank Denis [Sat, 24 Nov 2018 16:56:33 +0000 (17:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ext/sodium: remove redundant code
ext/sodium: Correct base64 decoding with unpadded variants
Frank Denis [Sat, 24 Nov 2018 16:55:36 +0000 (17:55 +0100)]
ext/sodium: remove redundant code
Frank Denis [Sat, 24 Nov 2018 16:53:08 +0000 (17:53 +0100)]
ext/sodium: Correct base64 decoding with unpadded variants
Backports
0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension
Christoph M. Becker [Sat, 24 Nov 2018 12:38:09 +0000 (13:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case
Christoph M. Becker [Sat, 24 Nov 2018 12:36:42 +0000 (13:36 +0100)]
Fix test case
Christoph M. Becker [Sat, 24 Nov 2018 11:56:43 +0000 (12:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77195: Incorrect error handling of imagecreatefromjpeg()
Christoph M. Becker [Sat, 24 Nov 2018 11:52:08 +0000 (12:52 +0100)]
Fix #77195: Incorrect error handling of imagecreatefromjpeg()
The broken JPEG image triggers a notice, two warnings and outputs a
message to stderr directly. The additional notice is pretty useless,
and the direct output to stderr is bad. Therefore, we port the
relevant differences from upstream to our bundled libgd. This leaves
us with two warnings; the first one is triggered by libjpeg and shows
the actual problem, the second one is triggered by our libgd wrapper
whenever an image can't be read, what may not have necessarily
triggered a warning before.
Christoph M. Becker [Fri, 23 Nov 2018 17:37:12 +0000 (18:37 +0100)]
[ci skip] Preliminary fix for NEWS
No more regular bug fixes for PHP 7.3.0.
We'll clean up the rest later.
Christoph M. Becker [Fri, 23 Nov 2018 15:34:11 +0000 (16:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77177: Serializing or unserializing COM objects crashes
Christoph M. Becker [Fri, 23 Nov 2018 15:32:33 +0000 (16:32 +0100)]
Fix #77177: Serializing or unserializing COM objects crashes
Firstly, we avoid returning NULL from the get_property handler, but
instead return an empty HashTable, which already prevents the crashes.
Secondly, since (de-)serialization obviously makes no sense for COM,
DOTNET and VARIANT objects (at least with the current implementation),
we prohibit it right away.
Sara Golemon [Wed, 21 Nov 2018 19:39:40 +0000 (14:39 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prep for 7.1.26
Sara Golemon [Wed, 21 Nov 2018 19:39:25 +0000 (14:39 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Prep for 7.1.26
Sara Golemon [Wed, 21 Nov 2018 19:37:37 +0000 (14:37 -0500)]
Prep for 7.1.26
Xinchen Hui [Wed, 21 Nov 2018 03:23:47 +0000 (11:23 +0800)]
Fixed bug #77088 (Segfault when using SoapClient with null options)
SoapClient constructor has its own error handler
Xinchen Hui [Wed, 21 Nov 2018 03:18:48 +0000 (11:18 +0800)]
Fixed proto & folder mark
Nikita Popov [Tue, 20 Nov 2018 20:30:44 +0000 (21:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 20 Nov 2018 20:30:27 +0000 (21:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Valentin V. Bartenev [Tue, 20 Nov 2018 15:48:06 +0000 (18:48 +0300)]
Fix bug #71041 dynamic embed SAPI load error
If the library is built with ZEND_SIGNALS defined, it's unusable with an
external SAPI module because the zend_signal_startup() call is mandatory
in this case.
This bug is similar to #74149, but related to dynamic loading of PHP library.
Nikita Popov [Tue, 20 Nov 2018 20:16:19 +0000 (21:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Mizunashi Mana [Sat, 10 Nov 2018 18:17:11 +0000 (03:17 +0900)]
Define __APPLE_USE_RFC_3542 for new ipv6 constants
Sara Golemon [Tue, 20 Nov 2018 19:41:31 +0000 (14:41 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.14
Sara Golemon [Tue, 20 Nov 2018 19:40:21 +0000 (14:40 -0500)]
Bump for 7.2.14