]>
granicus.if.org Git - php/log
Adam Baratz [Mon, 26 Nov 2018 15:37:42 +0000 (10:37 -0500)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Check column number before trying to fetch the value
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:35:30 +0000 (15:35 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Use zend_empty_array
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 >.
Nikita Popov [Mon, 26 Nov 2018 13:00:42 +0000 (14:00 +0100)]
Remove redundant __clone() methods from Reflection
Reflection classes already use NULLed clone_obj to signal that they
cannot be cloned, so it's not necessary to additionally declare a
throwing __clone() method.
Nikita Popov [Mon, 26 Nov 2018 12:53:48 +0000 (13:53 +0100)]
Remove redundant Exception::__clone() method
Exceptions already prohibit cloning by setting clone_obj to NULL
(which is integrated with reflection). No need to additionally
define a dummy __clone() method.
Nikita Popov [Mon, 26 Nov 2018 12:30:57 +0000 (13:30 +0100)]
User serialize_deny for PDOStatement as well
Nikita Popov [Mon, 26 Nov 2018 12:28:14 +0000 (13:28 +0100)]
Switch PDO to use serialize_deny
And remove dummy __sleep/__wakeup. This switches the thrown
exception type from PDOException to Exception.
Nikita Popov [Mon, 26 Nov 2018 12:20:51 +0000 (13:20 +0100)]
Use serialize_deny for CURLFile
Instead of a throwing __wakeup() method.
Nikita Popov [Mon, 26 Nov 2018 12:12:30 +0000 (13:12 +0100)]
Remove redundant Generator::__wakeup() method
Generators already make use of (un)serialize_deny, so there's no
need to additionally have a throwing __wakeup() implementation.
Peter Kokot [Thu, 22 Nov 2018 23:40:34 +0000 (00:40 +0100)]
Add re2c checking with error exit code
To make installation experience better instead of only outputting
warning when re2c is not present this patch also exits if the PHP lexer
file(s) were not generated yet and re2c is not present on the system.
Christoph M. Becker [Sun, 25 Nov 2018 18:04:03 +0000 (19:04 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
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:57:25 +0000 (15:57 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #77198: auto cropping has insufficient precision
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:57:23 +0000 (17:57 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
ext/sodium: remove redundant code
ext/sodium: Correct base64 decoding with unpadded variants
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:41:40 +0000 (13:41 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix test case
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:58:57 +0000 (12:58 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #77195: Incorrect error handling of imagecreatefromjpeg()
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.
Peter Kokot [Fri, 23 Nov 2018 15:45:32 +0000 (16:45 +0100)]
[ci skip] PHP 7.1 is now security-only branch
Refs:
- http://news.php.net/php.internals/103486
Christoph M. Becker [Fri, 23 Nov 2018 17:42:53 +0000 (18:42 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Preliminary fix for NEWS
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:36:48 +0000 (16:36 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #77177: Serializing or unserializing COM objects crashes
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.
Christoph M. Becker [Wed, 21 Nov 2018 22:58:00 +0000 (23:58 +0100)]
Clean up server-tests.php remains
sapi/tests/ has been introduced as a generic means to test different
SAPIs[1]. run-tests2.php has later be renamed to server-tests.php and
recently been dropped[2]. However, the sapi/tests/test00?.php test
cases remained, even though they make no sense for run-tests.php,
since they use an unsupported format for the `--ENV--` section and the
completely unsupported `--HEADERS--` section, respectively. While
these tests ran successfully under run-tests.php, that was only by
accident, and they did not really test something useful. Therefore, we
remove these tests altogether.
sapi/tests/bug69487.phpt is actually a CGI test (CGI is enforced due to
the `--POST--` section), so we move it to sapi/cgi/tests, which leaves
sapi/tests/ empty. Thus, we also remove the sapi/ directory from
run-tests.php.
Finally, we remove the `--HEADERS--` and `--REQUEST--` sections from
the list of allowed run-tests.php sections.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
b671380b6b5b6e1f4f235e810afa4199e989d2ba >
[2] <http://git.php.net/?p=php-src.git;a=commit;h=
4f36acb9e65935aa657f1f22e2320a401bdbdad3 >
Nikita Popov [Fri, 23 Nov 2018 15:15:11 +0000 (16:15 +0100)]
Document --show-mem as a valid run-tests.php option
[ci skip]
Dmitry Stogov [Fri, 23 Nov 2018 00:59:47 +0000 (03:59 +0300)]
Don't preload functions and classes declared outside of preloaded scripts (e.g. by eval code).
Dmitry Stogov [Fri, 23 Nov 2018 00:19:16 +0000 (03:19 +0300)]
Refactored script creation and classes/functions copying.
Nikita Popov [Thu, 22 Nov 2018 15:23:03 +0000 (16:23 +0100)]
Remove unused do_free parameter from ADD_INTERNED_STRING
Sara Golemon [Wed, 21 Nov 2018 19:39:49 +0000 (14:39 -0500)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Prep for 7.1.26
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
Nikita Popov [Tue, 20 Nov 2018 19:54:24 +0000 (20:54 +0100)]
Re-commit MySQL 8 cached SHA auth support
With changes to (hopefully) correctly fall back if OpenSSL support
is missing. Furthermore the hard-coded dependency on ext/hash is
no longer an issue, as this extension is required in master.
This reverts commit
63072e9c0ebbb676cd39d0f867d873737c676add , reversing
changes made to
4cbabb6852d2a7d966fb78a53d9d4c1cac18f10b .
Gabriel Caruso [Thu, 15 Nov 2018 15:00:47 +0000 (13:00 -0200)]
Remove unecessaries SKIPIF sections for necessary extensions
Xinchen Hui [Wed, 21 Nov 2018 03:30:42 +0000 (11:30 +0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77088 (Segfault when using SoapClient with null options)
Fixed proto & folder mark
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
Sara Golemon [Mon, 15 Oct 2018 18:58:34 +0000 (14:58 -0400)]
Implement password mechanism registry
RFC: https://wiki.php.net/rfc/password_registry
Nikita Popov [Tue, 20 Nov 2018 20:30:58 +0000 (21:30 +0100)]
Merge branch 'PHP-7.3'
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.
Rijnard van Tonder [Wed, 14 Nov 2018 18:11:35 +0000 (13:11 -0500)]
Remove redundant continue in for loops
Nikita Popov [Tue, 20 Nov 2018 20:16:36 +0000 (21:16 +0100)]
Merge branch 'PHP-7.3'
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
Mizunashi Mana [Fri, 9 Nov 2018 01:14:09 +0000 (10:14 +0900)]
Fix opcache blacklist test on macOS
Sara Golemon [Tue, 20 Nov 2018 19:41:40 +0000 (14:41 -0500)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Bump for 7.2.14
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
Stanislav Malyshev [Tue, 20 Nov 2018 19:21:35 +0000 (11:21 -0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Disable rsh/ssh functionality in imap by default (bug #77153)
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Tue, 20 Nov 2018 19:19:51 +0000 (11:19 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Dmitry Stogov [Tue, 20 Nov 2018 14:50:22 +0000 (17:50 +0300)]
Improved error messages
Christoph M. Becker [Tue, 20 Nov 2018 12:36:41 +0000 (13:36 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS wrt. php-7.3.0RC6 tagging
Christoph M. Becker [Tue, 20 Nov 2018 12:36:10 +0000 (13:36 +0100)]
[ci skip] Update NEWS wrt. php-7.3.0RC6 tagging
Remi Collet [Tue, 20 Nov 2018 10:20:57 +0000 (11:20 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
NEWS
NEWS
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Tue, 20 Nov 2018 10:20:40 +0000 (11:20 +0100)]
NEWS
Remi Collet [Tue, 20 Nov 2018 10:20:26 +0000 (11:20 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
NEWS
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Tue, 20 Nov 2018 10:20:05 +0000 (11:20 +0100)]
NEWS
Remi Collet [Tue, 20 Nov 2018 10:19:52 +0000 (11:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Tue, 20 Nov 2018 10:19:29 +0000 (11:19 +0100)]
NEWS
Remi Collet [Thu, 15 Nov 2018 07:58:08 +0000 (08:58 +0100)]
Fix #77151 ftp_close(): SSL_read on shutdown
Regression introduced in fix for #76972
only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)
Dmitry Stogov [Tue, 20 Nov 2018 10:06:23 +0000 (13:06 +0300)]
Delay exceptional case check
Dmitry Stogov [Tue, 20 Nov 2018 09:53:05 +0000 (12:53 +0300)]
fixed typo
Dmitry Stogov [Tue, 20 Nov 2018 08:55:16 +0000 (11:55 +0300)]
Optimization
Fabien Villepinte [Mon, 19 Nov 2018 20:17:21 +0000 (21:17 +0100)]
Fix typo in tests
Anatol Belski [Sun, 18 Nov 2018 13:41:44 +0000 (14:41 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:41:14 +0000 (14:41 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:40:00 +0000 (14:40 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:38:35 +0000 (14:38 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:37:56 +0000 (14:37 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:37:04 +0000 (14:37 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 11:34:04 +0000 (12:34 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Anatol Belski [Sun, 18 Nov 2018 11:33:35 +0000 (12:33 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Anatol Belski [Sun, 18 Nov 2018 11:32:47 +0000 (12:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Anatol Belski [Sun, 18 Nov 2018 11:29:34 +0000 (12:29 +0100)]
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Backport
369c991d and
282a63da to 7.1, closes #3634
Anatol Belski [Sun, 18 Nov 2018 10:52:33 +0000 (11:52 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Add test for bug #77047
FIX #77047: fixes regex for "time" data type
Anatol Belski [Sun, 18 Nov 2018 10:52:00 +0000 (11:52 +0100)]
Add test for bug #77047
andy [Mon, 22 Oct 2018 14:57:28 +0000 (08:57 -0600)]
FIX #77047: fixes regex for "time" data type
Anatol Belski [Sat, 17 Nov 2018 22:03:14 +0000 (23:03 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:01:17 +0000 (23:01 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:00:50 +0000 (23:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:00:12 +0000 (23:00 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 21:57:16 +0000 (22:57 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Simplify assignment on 64-bit
Anatol Belski [Sat, 17 Nov 2018 21:56:39 +0000 (22:56 +0100)]
Simplify assignment on 64-bit