]>
granicus.if.org Git - php/log
Máté Kocsis [Thu, 27 Feb 2020 18:59:32 +0000 (19:59 +0100)]
Add stubs for UConverter
Closes GH-5218
Máté Kocsis [Wed, 26 Feb 2020 19:30:40 +0000 (20:30 +0100)]
Update MySQLi function info
Closes GH-5214
Nikita Popov [Fri, 28 Feb 2020 12:19:53 +0000 (13:19 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to fix intermittent FPM failures
Nikita Popov [Fri, 28 Feb 2020 12:19:10 +0000 (13:19 +0100)]
Try to fix intermittent FPM failures
Terminate only after expecting the log lines to avoid race
condition.
Nikita Popov [Fri, 28 Feb 2020 11:49:45 +0000 (12:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79252
Nikita Popov [Fri, 28 Feb 2020 11:47:56 +0000 (12:47 +0100)]
Fixed bug #79252
Nikita Popov [Fri, 28 Feb 2020 11:16:41 +0000 (12:16 +0100)]
Avoid duplicate calls to interface implementation handler
Remi Collet [Fri, 28 Feb 2020 09:39:43 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix test
Remi Collet [Fri, 28 Feb 2020 09:39:08 +0000 (10:39 +0100)]
fix test
Remi Collet [Fri, 28 Feb 2020 09:36:34 +0000 (10:36 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:36:12 +0000 (10:36 +0100)]
NEWS
Remi Collet [Fri, 28 Feb 2020 09:35:39 +0000 (10:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:29:30 +0000 (10:29 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:24:52 +0000 (10:24 +0100)]
NEWS
Remi Collet [Fri, 28 Feb 2020 09:23:19 +0000 (10:23 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Nikita Popov [Fri, 28 Feb 2020 09:22:11 +0000 (10:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use type-checked ref assignment in UConverter
Nikita Popov [Fri, 28 Feb 2020 09:21:50 +0000 (10:21 +0100)]
Use type-checked ref assignment in UConverter
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
George Peter Banyard [Thu, 27 Feb 2020 22:32:36 +0000 (23:32 +0100)]
Use {0} to initialize instead of {NULL}
Clang emits a [-Wmissing-field-initializers] when using {NULL} instead of {0}
Dmitry Stogov [Thu, 27 Feb 2020 20:38:19 +0000 (23:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect overflow detection
Dmitry Stogov [Thu, 27 Feb 2020 20:38:09 +0000 (23:38 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect overflow detection
Dmitry Stogov [Thu, 27 Feb 2020 20:37:41 +0000 (23:37 +0300)]
Fixed incorrect overflow detection
Nikita Popov [Thu, 27 Feb 2020 13:48:43 +0000 (14:48 +0100)]
Avoid more null arithmetic
Nikita Popov [Thu, 27 Feb 2020 12:13:01 +0000 (13:13 +0100)]
Use EX_NUM_TO_VAR() in more places
Not sure why I missed these before.
Nikita Popov [Thu, 27 Feb 2020 11:53:55 +0000 (12:53 +0100)]
Remove more null arithmetic UB
Introduce an EX_NUM_TO_VAR macro to mirror EX_VAR_TO_NUM and
replace usages of the ZEND_CALL_VAR_NUM(NULL) pattern.
Christoph M. Becker [Thu, 27 Feb 2020 09:39:07 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add upgrading node regarding fix for bug #79271
Christoph M. Becker [Thu, 27 Feb 2020 09:36:59 +0000 (10:36 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add upgrading node regarding fix for bug #79271
Nikita Popov [Thu, 27 Feb 2020 09:33:35 +0000 (10:33 +0100)]
Remove mergesort implementation
php_mergesort() isn't being used for anything, and hasn't been for
a long time. Even if we wanted to use a stable sort, this isn't
the implementation we'd use...
Christoph M. Becker [Thu, 27 Feb 2020 09:32:24 +0000 (10:32 +0100)]
Add upgrading node regarding fix for bug #79271
Cf. <https://github.com/php/php-src/pull/5180#issuecomment-
590259750 >ff.
Nikita Popov [Thu, 27 Feb 2020 09:29:44 +0000 (10:29 +0100)]
Avoid null arithmetic UB in EX_VAR_TO_NUM
Dmitry Stogov [Thu, 27 Feb 2020 09:28:09 +0000 (12:28 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect behavior of internal memory debugger
Dmitry Stogov [Thu, 27 Feb 2020 09:27:58 +0000 (12:27 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect behavior of internal memory debugger
Dmitry Stogov [Thu, 27 Feb 2020 09:27:22 +0000 (12:27 +0300)]
Fixed incorrect behavior of internal memory debugger
Christoph M. Becker [Thu, 27 Feb 2020 08:40:31 +0000 (09:40 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #64032: mysqli reports different client_version
Christoph M. Becker [Thu, 27 Feb 2020 08:38:55 +0000 (09:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #64032: mysqli reports different client_version
Christoph M. Becker [Wed, 26 Feb 2020 17:33:25 +0000 (18:33 +0100)]
Fix #64032: mysqli reports different client_version
While `mysqli_get_client_version()` calls `mysql_get_client_version()`
to retrieve the client version, `mysql::$client_version` is initialized
to `MYSQL_VERSION_ID`. Both should match though, and since the former
is the more useful information, we fix `mysql::$client_version`.
We do not add a regression test, because it would usually succeed
anyway, and we already have several tests with respective `assert()`s.
Nikita Popov [Wed, 26 Feb 2020 15:48:41 +0000 (16:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #60161
Nikita Popov [Wed, 26 Feb 2020 15:48:03 +0000 (16:48 +0100)]
Add test for bug #60161
This has been fixed in PHP 7.4, let's make sure it stays fixed.
Máté Kocsis [Tue, 25 Feb 2020 19:58:33 +0000 (20:58 +0100)]
Change argument error message format
Closes GH-5211
George Peter Banyard [Sat, 22 Feb 2020 01:16:38 +0000 (02:16 +0100)]
Fix mbstring regex variable types to correspond to Oniguruma
The beginning and ending of a Oniguruma Regex are stored in a OnigRegion (which is a typedef to the Oniguruma re_registers struct) as as int* therefore change the type from size_t to int
Closes GH-5196
Nikita Popov [Thu, 13 Feb 2020 15:38:51 +0000 (16:38 +0100)]
Require all internal functions to have arginfo
Nikita Popov [Tue, 25 Feb 2020 11:31:51 +0000 (12:31 +0100)]
Add stubs for COMPersistHelper
George Peter Banyard [Sun, 23 Feb 2020 23:04:12 +0000 (00:04 +0100)]
Remove deprecated capture_session_meta OpenSSL stream context
Closes GH-5200
Máté Kocsis [Tue, 25 Feb 2020 18:57:23 +0000 (19:57 +0100)]
Get rid of method mapping of BreakIterator classes
Máté Kocsis [Mon, 24 Feb 2020 22:54:49 +0000 (23:54 +0100)]
Add stubs for Intl BreakIterator
Closes GH-5207
Nikita Popov [Tue, 25 Feb 2020 16:23:46 +0000 (17:23 +0100)]
Reorder checks in object ref assignment
First check for IS_INDIRECT and de-indirect it directly there.
Handle the error cases later.
Nikita Popov [Tue, 25 Feb 2020 11:44:26 +0000 (12:44 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler
Nikita Popov [Tue, 25 Feb 2020 11:44:01 +0000 (12:44 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler
Mark Plomer [Mon, 24 Feb 2020 20:32:02 +0000 (21:32 +0100)]
Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler
Always push the current user_error/exception_handler to the stack,
even when it is empty, so restore_error_handler() always works as
expected.
The user_error_handler is especially temporarily empty when we are inside
the error handler, which caused inconsistent behaviour before.
Nikita Popov [Thu, 13 Feb 2020 15:45:20 +0000 (16:45 +0100)]
Give arginfo to SplFileInfo::_bad_state_ex()
We should really get rid of this hack though... Wow!
Nikita Popov [Tue, 25 Feb 2020 10:17:34 +0000 (11:17 +0100)]
Add missing zend_test stubs
Tom Van Looy [Fri, 15 Nov 2019 14:39:56 +0000 (15:39 +0100)]
Add ext/mysqli stubs
Closes GH-4913.
Nicolas Oelgart [Mon, 17 Feb 2020 13:29:12 +0000 (14:29 +0100)]
Add preg_last_error_msg() function
Provides the last PCRE error as a human-readable message, similar
to functionality existing in other extensions, such as
json_last_error_msg().
Closes GH-5185.
Nikita Popov [Fri, 21 Feb 2020 14:33:58 +0000 (15:33 +0100)]
Avoid used of "named fn" in ext/standard
Nikita Popov [Fri, 21 Feb 2020 14:23:10 +0000 (15:23 +0100)]
Fix macro-expansion issues in ZEND_FE and friends
I noticed that we have various places where we work around macros
conflicting with PHP function names. Rather than require this,
fix our ZEND_FE etc macros to avoid pre-scan macro expansion.
This requires duplicating the ZEND_FN/ZEND_MN macros in places,
but that seems like a reasonable tradeoff.
Nikita Popov [Tue, 25 Feb 2020 09:06:13 +0000 (10:06 +0100)]
Remove unnecessary checks in breakpoint iterator
The result of Z_INTL_BREAKITERATOR_P() cannot be NULL. This type
of macro in general can never be NULL.
Nikita Popov [Wed, 12 Feb 2020 09:27:28 +0000 (10:27 +0100)]
Use serialize_precision for var_dump()
var_dump() is debugging functionality, so it should print
floating-point numbers accurately. We do this by switching
to serialize_precision, which (by default) will print with
as much precision as necessary to preserve the exact value
of the float.
This also affects debug_zval_dump().
Closes GH-5172.
Nikita Popov [Mon, 24 Feb 2020 20:34:37 +0000 (21:34 +0100)]
Fix argon2 test if provided by sodium
Nikita Popov [Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable ext/sodium in CI
Add skipif for argon2id in test
Nikita Popov [Mon, 24 Feb 2020 10:00:58 +0000 (11:00 +0100)]
Enable ext/sodium in CI
Nikita Popov [Mon, 24 Feb 2020 10:59:46 +0000 (11:59 +0100)]
Add skipif for argon2id in test
If argon2i is provided by libargon, then argon2id may not be
available here.
Nikita Popov [Mon, 24 Feb 2020 09:20:49 +0000 (10:20 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't treat any WS as start of header
Nikita Popov [Mon, 24 Feb 2020 09:20:43 +0000 (10:20 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't treat any WS as start of header
Nikita Popov [Mon, 24 Feb 2020 09:19:58 +0000 (10:19 +0100)]
Don't treat any WS as start of header
Check that the header occurs after \n, not other whitespace
characters.
Nikita Popov [Mon, 24 Feb 2020 09:07:28 +0000 (10:07 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reduce code duplication in HTTP header checks
Nikita Popov [Mon, 24 Feb 2020 09:03:30 +0000 (10:03 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Reduce code duplication in HTTP header checks
Nikita Popov [Mon, 24 Feb 2020 08:58:29 +0000 (09:58 +0100)]
Reduce code duplication in HTTP header checks
Nikita Popov [Mon, 24 Feb 2020 08:58:29 +0000 (09:58 +0100)]
Reduce code duplication in HTTP header checks
Nikita Popov [Mon, 24 Feb 2020 08:51:55 +0000 (09:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixes #79265: Improper injection of Host header when using fopen for http requests
Nikita Popov [Mon, 24 Feb 2020 08:50:57 +0000 (09:50 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixes #79265: Improper injection of Host header when using fopen for http requests
Miguel Xavier Penha Neto [Mon, 24 Feb 2020 05:04:37 +0000 (02:04 -0300)]
Fixes #79265: Improper injection of Host header when using fopen for http requests
Check all occurrences of the string "host:" (and other headers),
not just the first one.
Christoph M. Becker [Sun, 23 Feb 2020 22:35:33 +0000 (23:35 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79299: com_print_typeinfo prints duplicate variables
Christoph M. Becker [Sun, 23 Feb 2020 22:33:28 +0000 (23:33 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79299: com_print_typeinfo prints duplicate variables
Christoph M. Becker [Sun, 23 Feb 2020 22:23:12 +0000 (23:23 +0100)]
Fix #79299: com_print_typeinfo prints duplicate variables
`lastid` has to retain its value during the traversal, so we move it to
an outer scope.
Patch contributed by Litiano Moura.
Jakub Zelenka [Sun, 23 Feb 2020 19:15:05 +0000 (19:15 +0000)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 23 Feb 2020 19:14:05 +0000 (19:14 +0000)]
Fix bug #79014 (PHP-FPM & Primary script unknown)
Jakub Zelenka [Sun, 23 Feb 2020 18:32:20 +0000 (18:32 +0000)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 9 Feb 2020 19:40:25 +0000 (19:40 +0000)]
Fix bug #77653 (operator displayed instead of the real error message)
George Peter Banyard [Sun, 23 Feb 2020 02:27:05 +0000 (03:27 +0100)]
Update Travis build config
The sudo key is deprecated and doesn't do anything anymore.
Adding the "os" key with default value "linux" which was assumed to the build config.
George Peter Banyard [Sat, 22 Feb 2020 00:01:07 +0000 (01:01 +0100)]
Second go at fixing [-Wmissing-field-initializers] compiler warning in PDO
By 0 initializing the sub structs
Nikita Popov [Fri, 21 Feb 2020 15:26:57 +0000 (16:26 +0100)]
Add rand() to ext/standard stub
Christoph M. Becker [Fri, 21 Feb 2020 12:38:29 +0000 (13:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79294: ::columnType() may fail after SQLite3Stmt::reset()
Christoph M. Becker [Fri, 21 Feb 2020 12:37:14 +0000 (13:37 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79294: ::columnType() may fail after SQLite3Stmt::reset()
Christoph M. Becker [Fri, 21 Feb 2020 12:24:37 +0000 (13:24 +0100)]
Fix #79294: ::columnType() may fail after SQLite3Stmt::reset()
The fix for feature request #53466 did not properly handle resetting of
the corresponding statement; the problem with this is that the
statement does not know about its result sets. But even if we could
fix this, the `complete` handling still appears to be brittle, since
the `sqlite3_column_type()`docs[1] state:
| If the SQL statement does not currently point to a valid row, or if
| the column index is out of range, the result is undefined.
Fortunately, we can use `sqlite3_data_count()` instead, since[2]:
| If prepared statement P does not have results ready to return (via
| calls to the sqlite3_column() family of interfaces) then
| sqlite3_data_count(P) returns 0.
Thus, we guard `SQLite3::columnType()` with `sqlite3_data_count()`, and
completely drop updating the `php_sqlite3_result_object.complete`
field, but keep it for ABI BC purposes.
[1] <https://www.sqlite.org/c3ref/column_blob.html>
[2] <https://www.sqlite.org/c3ref/data_count.html>
George Peter Banyard [Fri, 21 Feb 2020 12:19:09 +0000 (13:19 +0100)]
Fix [-Wmissing-field-initializers] compiler warning in mbstring
Add missing NULL pointer for mbfl_convert_vtbl struct.
Nikita Popov [Fri, 21 Feb 2020 10:58:59 +0000 (11:58 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use asm arithmetic under msan
Nikita Popov [Sun, 29 Sep 2019 09:33:45 +0000 (11:33 +0200)]
Don't use asm arithmetic under msan
Clang 9 supports asm goto, so these no longer get automatically
skipped.
(cherry picked from commit
33bf1495b215d555d45ec638376bd434d8a038b3 )
Christoph M. Becker [Fri, 21 Feb 2020 09:33:53 +0000 (10:33 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #78569
Christoph M. Becker [Fri, 21 Feb 2020 09:32:45 +0000 (10:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add test for bug #78569
Christoph M. Becker [Fri, 21 Feb 2020 09:30:51 +0000 (10:30 +0100)]
Add test for bug #78569
Nikita Popov [Fri, 21 Feb 2020 09:12:45 +0000 (10:12 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update Ubuntu version on Azure
Nikita Popov [Thu, 20 Feb 2020 14:05:04 +0000 (15:05 +0100)]
Update Ubuntu version on Azure
The i386 and community jobs were still on 16.04, update them to
18.04.
Nikita Popov [Fri, 21 Feb 2020 08:53:17 +0000 (09:53 +0100)]
Make SPL doubly linked list smaller
Store rc in data u2. This drops element size from 40 to 32 bytes.
Máté Kocsis [Thu, 20 Feb 2020 10:13:20 +0000 (11:13 +0100)]
Update UPGRADING
[skip ci]
Christoph M. Becker [Thu, 20 Feb 2020 09:59:05 +0000 (10:59 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix NEWS [ci skip]
Christoph M. Becker [Thu, 20 Feb 2020 09:56:29 +0000 (10:56 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix NEWS [ci skip]
Christoph M. Becker [Thu, 20 Feb 2020 09:55:17 +0000 (10:55 +0100)]
Fix NEWS [ci skip]
Cosmetics.
Máté Kocsis [Wed, 19 Feb 2020 19:36:45 +0000 (20:36 +0100)]
Remove restore_include_path()
Closes GH-5189
Bishop Bettini [Wed, 19 Feb 2020 16:30:32 +0000 (11:30 -0500)]
Improve comment on RFC 1867 filename handling
It was pointed out on the internals ML[1] that the basename comment
around RFC 1867 file handling was confusing. The comment seemed to
say that the basename handling was only necessary because of some
esoteric bug in Windows IE. In fact that comment applied to earlier
versions of the code and was, therefore, misleading. The comment
needs to clear that basename is required per RFC 7578[2].
[1]:https://externals.io/message/108624
[2]:https://tools.ietf.org/html/rfc7578