]>
granicus.if.org Git - php/log
Scott [Fri, 14 Dec 2018 21:35:49 +0000 (22:35 +0100)]
Fix #77297: SodiumException segfaults on PHP 7.3
Instead of trying to clean the argument arrays from the backtrace, we
overwrite them with empty arrays.
Christoph M. Becker [Sun, 16 Dec 2018 12:30:11 +0000 (13:30 +0100)]
Fix #77291: magic methods inherited from a trait may be ignored
When adding methods from a trait, we must not assume that a method name
with the same length as the name of the using class is either a PHP 4
style constructor, or not a magic method at all – it may well be
another magic method.
We mostly preserve the spirit of the optimization which caused this
regression, and avoid string comparisons for all method names which can
never be magic methods.
Xinchen Hui [Tue, 11 Dec 2018 07:25:19 +0000 (15:25 +0800)]
Update NEWS
Xinchen Hui [Tue, 11 Dec 2018 07:22:50 +0000 (15:22 +0800)]
Merge branch 'i386-PIC' of https://github.com/ryandesign/php-src into PHP-7.3
* 'i386-PIC' of https://github.com/ryandesign/php-src:
Fix __zend_cpuid on i386 PIC without __cpuid_count
Anatol Belski [Mon, 10 Dec 2018 23:34:57 +0000 (00:34 +0100)]
Remove BOM
Christoph M. Becker [Mon, 10 Dec 2018 13:27:11 +0000 (14:27 +0100)]
Update/fix UPGRADING
Nikita Popov [Mon, 10 Dec 2018 12:33:48 +0000 (13:33 +0100)]
Fixed bug #77275
Instead of juggling with this problem during literal compaction,
make sure that we always initialize Z_EXTRA for literals, which
seems like the more robust solution.
Nikita Popov [Mon, 10 Dec 2018 11:50:00 +0000 (12:50 +0100)]
Fix typos in compact literals debugging code
Christopher Jones [Mon, 10 Dec 2018 10:54:23 +0000 (21:54 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 10 Dec 2018 10:54:13 +0000 (21:54 +1100)]
LOL I had 2.10 on my mind
Christopher Jones [Mon, 10 Dec 2018 00:00:32 +0000 (11:00 +1100)]
Merge branch 'PHP-7.3' of https://git.php.net/repository/php-src into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 23:57:10 +0000 (10:57 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 23:45:43 +0000 (10:45 +1100)]
Bundle the new test
Christopher Jones [Sun, 9 Dec 2018 23:16:27 +0000 (10:16 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 9 Dec 2018 23:16:23 +0000 (00:16 +0100)]
Fix version numbers in main branch
This should have already happened, when `PHP-7.3.0` was branched.
Christopher Jones [Sun, 9 Dec 2018 23:16:15 +0000 (10:16 +1100)]
Improve test portability
Christopher Jones [Sun, 9 Dec 2018 23:15:53 +0000 (10:15 +1100)]
Update for newer Oracle versions
Anatol Belski [Sun, 9 Dec 2018 18:15:11 +0000 (19:15 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix syntax error
Anatol Belski [Sun, 9 Dec 2018 18:13:09 +0000 (19:13 +0100)]
Fix syntax error
Anatol Belski [Sun, 9 Dec 2018 18:01:17 +0000 (19:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix libtidy exports when ext/tidy compiled static
Anatol Belski [Sun, 9 Dec 2018 17:59:05 +0000 (18:59 +0100)]
Fix libtidy exports when ext/tidy compiled static
Derick Rethans [Sun, 9 Dec 2018 16:23:29 +0000 (16:23 +0000)]
Back to -dev
This should have been done as soon as PHP-7.3.0 was branched.
Christopher Jones [Sun, 9 Dec 2018 09:56:25 +0000 (20:56 +1100)]
Add OCI8 changes
Christopher Jones [Sun, 9 Dec 2018 09:55:21 +0000 (20:55 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 09:55:04 +0000 (20:55 +1100)]
Add oci_set_call_timeout() and bump version to 2.10.0
Christopher Jones [Sun, 9 Dec 2018 01:38:53 +0000 (12:38 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 01:38:35 +0000 (12:38 +1100)]
Upgrade internal OCI call
Christopher Jones [Sun, 9 Dec 2018 01:17:04 +0000 (12:17 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 01:16:47 +0000 (12:16 +1100)]
Enable Oracle Database DBOP tracing attribute
Christopher Jones [Sun, 9 Dec 2018 00:30:15 +0000 (11:30 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 9 Dec 2018 00:28:52 +0000 (11:28 +1100)]
Update OCI8 README
Christopher Jones [Sun, 9 Dec 2018 00:28:04 +0000 (11:28 +1100)]
Convert some parameter parsing to the Fast Parameter Parsing API
Pierrick Charron [Sat, 8 Dec 2018 20:09:43 +0000 (15:09 -0500)]
Fix 77264: curl_getinfo returning microseconds, not seconds
Since curl 7.55.0, libcurl introduced new constants to return
more sensible variable types with curl_getinfo.
When curl_getinfo with no option was called, and curl >= 7.55.0, some
of the result were returned as int when they where returned as float
in previous versions. This commit remove this BC Break.
If someone still want to use more sensible variable types, it's always
possible to call curl_getinfo with newer constants.
CURLINFO_CONTENT_LENGTH_DOWNLOAD => CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
CURLINFO_CONTENT_LENGTH_UPLOAD => CURLINFO_CONTENT_LENGTH_UPLOAD_T
CURLINFO_SIZE_DOWNLOAD => CURLINFO_SIZE_DOWNLOAD_T
CURLINFO_SIZE_UPLOAD => CURLINFO_SIZE_UPLOAD_T
CURLINFO_SPEED_DOWNLOAD => CURLINFO_SPEED_DOWNLOAD_T
CURLINFO_SPEED_UPLOAD => CURLINFO_SPEED_UPLOAD_T
CURLINFO_APPCONNECT_TIME => CURLINFO_APPCONNECT_TIME_T
CURLINFO_CONNECT_TIME => CURLINFO_CONNECT_TIME_T
CURLINFO_NAMELOOKUP_TIME => CURLINFO_NAMELOOKUP_TIME_T
CURLINFO_PRETRANSFER_TIME => CURLINFO_PRETRANSFER_TIME_T
CURLINFO_REDIRECT_TIME => CURLINFO_REDIRECT_TIME_T
CURLINFO_STARTTRANSFER_TIME => CURLINFO_STARTTRANSFER_TIME_T
CURLINFO_TOTAL_TIME => CURLINFO_TOTAL_TIME_T
Ryan Schmidt [Sat, 8 Dec 2018 15:52:52 +0000 (09:52 -0600)]
Fix __zend_cpuid on i386 PIC without __cpuid_count
Closes https://bugs.php.net/bug.php?id=76654
Remi Collet [Sat, 8 Dec 2018 09:25:20 +0000 (10:25 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add imap.enable_insecure_rsh in php.ini
Remi Collet [Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
add imap.enable_insecure_rsh in php.ini
Remi Collet [Sat, 8 Dec 2018 09:24:36 +0000 (10:24 +0100)]
add imap.enable_insecure_rsh in php.ini
Christopher Jones [Sat, 8 Dec 2018 09:20:04 +0000 (20:20 +1100)]
Merge branch 'PHP-7.3' of https://git.php.net/repository/php-src into PHP-7.3
Christopher Jones [Sat, 8 Dec 2018 09:19:59 +0000 (20:19 +1100)]
Merge branch 'PHP-7.2' of https://git.php.net/repository/php-src into PHP-7.2
Christopher Jones [Sat, 8 Dec 2018 09:13:57 +0000 (20:13 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Note that PECL install now works on PHP 7.3
Don't skip with 18c DB
Christopher Jones [Sat, 8 Dec 2018 09:13:40 +0000 (20:13 +1100)]
Note that PECL install now works on PHP 7.3
Christopher Jones [Sat, 8 Dec 2018 09:12:43 +0000 (20:12 +1100)]
Don't skip with 18c DB
Remi Collet [Sat, 8 Dec 2018 09:07:20 +0000 (10:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
missing entry for #77020
missing entry for #77020
Remi Collet [Sat, 8 Dec 2018 09:07:01 +0000 (10:07 +0100)]
missing entry for #77020
Remi Collet [Sat, 8 Dec 2018 09:06:34 +0000 (10:06 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
missing entry for #77020
Remi Collet [Sat, 8 Dec 2018 09:06:19 +0000 (10:06 +0100)]
missing entry for #77020
Christopher Jones [Sat, 8 Dec 2018 08:24:59 +0000 (19:24 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sat, 8 Dec 2018 08:24:32 +0000 (19:24 +1100)]
Fix resource warning value
Christopher Jones [Sat, 8 Dec 2018 08:23:22 +0000 (19:23 +1100)]
Bump OCI8 version
Christopher Jones [Sat, 8 Dec 2018 08:14:16 +0000 (19:14 +1100)]
Update NEWS
Christopher Jones [Sat, 8 Dec 2018 08:13:12 +0000 (19:13 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Christopher Jones [Sat, 8 Dec 2018 08:12:04 +0000 (19:12 +1100)]
Update NEWS
Christopher Jones [Sat, 8 Dec 2018 07:51:13 +0000 (18:51 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
When releasing an oci8 connection always set the resource to null.
KoenigsKind [Tue, 4 Sep 2018 12:19:04 +0000 (14:19 +0200)]
When releasing an oci8 connection always set the resource to null.
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