]>
granicus.if.org Git - php/log
Nikita Popov [Fri, 17 Jul 2020 10:40:05 +0000 (12:40 +0200)]
Fix IntlGregorianCalendar constructor signature
Give these conversative UNKNOWN defaults and no types, as the
overload is something of a mess.
Dmitry Stogov [Fri, 17 Jul 2020 10:03:35 +0000 (13:03 +0300)]
Side exit on overflow
Nikita Popov [Fri, 17 Jul 2020 08:34:49 +0000 (10:34 +0200)]
Throw correct exception from ArrayObject sort methods
Let normal zpp throw ArgumentCountErrors.
Nikita Popov [Fri, 17 Jul 2020 08:28:48 +0000 (10:28 +0200)]
Add missing param to DatePeriod::__construct()
The signature is very overloaded, but takes at most four params,
not three.
Dmitry Stogov [Fri, 17 Jul 2020 08:07:22 +0000 (11:07 +0300)]
JMP optimization
Dmitry Stogov [Fri, 17 Jul 2020 07:13:23 +0000 (10:13 +0300)]
Eliminate useless exception checks
Dmitry Stogov [Thu, 16 Jul 2020 21:40:10 +0000 (00:40 +0300)]
Eliminate some reference-counting
Nikita Popov [Thu, 16 Jul 2020 20:41:28 +0000 (22:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Drop freetype from i386"
Nikita Popov [Thu, 16 Jul 2020 19:17:21 +0000 (21:17 +0200)]
Revert "Drop freetype from i386"
This reverts commit
8641d76f62273f3a73449fd720c93c63992f3b5a .
This appears to work again now...
Nikita Popov [Thu, 16 Jul 2020 19:16:30 +0000 (21:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix azure i386 build
Nikita Popov [Thu, 16 Jul 2020 14:09:41 +0000 (16:09 +0200)]
Fix azure i386 build
Purge libsqlite3-0 to make sure we get the i386 library lateron.
Nikita Popov [Thu, 16 Jul 2020 18:46:45 +0000 (20:46 +0200)]
Fix WeakReference::create() stub
Dmitry Stogov [Thu, 16 Jul 2020 17:07:51 +0000 (20:07 +0300)]
cleanup
Christoph M. Becker [Thu, 16 Jul 2020 07:09:12 +0000 (09:09 +0200)]
Fix #79805: sapi_windows_vt100_support throws TypeError
It does not make sense to throw a `TypeError` when the stream can't be
analyzed. If `sapi_windows_vt100_support()` is used as getter, we just
return `false` in that case; if the function is used as setter, we
additionally trigger a warning.
We also fix the test cases for this function, which have been broken
before. Note that these tests are still whitespace sensitive.
Christoph M. Becker [Wed, 15 Jul 2020 16:45:55 +0000 (18:45 +0200)]
Fix #79846:
8c67c166996 broke simple regexp
We backport the respective upstream fix[1].
[1] <https://vcs.pcre.org/pcre2?view=revision&revision=1267>
Dmitry Stogov [Thu, 16 Jul 2020 14:09:14 +0000 (17:09 +0300)]
cleanup
Christoph M. Becker [Thu, 16 Jul 2020 14:08:07 +0000 (16:08 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable further tests on Windows
Christoph M. Becker [Thu, 16 Jul 2020 11:09:50 +0000 (13:09 +0200)]
Enable further tests on Windows
Dmitry Stogov [Thu, 16 Jul 2020 12:14:11 +0000 (15:14 +0300)]
Check type guard on result of FETCH_OBJ_R/IS instructions
Remi Collet [Thu, 16 Jul 2020 10:05:58 +0000 (12:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
#79657 was cherry-picked in 7.4.7
Remi Collet [Thu, 16 Jul 2020 10:05:45 +0000 (12:05 +0200)]
#79657 was cherry-picked in 7.4.7
Christoph M. Becker [Thu, 16 Jul 2020 07:18:45 +0000 (09:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix readlink related memory leak
Christoph M. Becker [Wed, 15 Jul 2020 15:28:24 +0000 (17:28 +0200)]
Fix readlink related memory leak
Dmitry Stogov [Wed, 15 Jul 2020 21:19:00 +0000 (00:19 +0300)]
Fixed tracing JIT for ASSIGN to typed reference
Pedro Magalhães [Thu, 16 Apr 2020 17:53:13 +0000 (18:53 +0100)]
Ignore inheritance rules on private methods
Closes GH-5401
Christoph M. Becker [Wed, 15 Jul 2020 14:39:54 +0000 (16:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tests regarding negative fileinode()
Christoph M. Becker [Wed, 15 Jul 2020 11:19:27 +0000 (13:19 +0200)]
Fix tests regarding negative fileinode()
The results of `fileinode()` may be negative due to wrap-around
behavior (at least on Windows as of PHP 7.4.0).
Dmitry Stogov [Wed, 15 Jul 2020 14:28:46 +0000 (17:28 +0300)]
Check type guard on result of FETCH_DIM_R/IS instructions
Nikita Popov [Wed, 15 Jul 2020 13:10:50 +0000 (15:10 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78008: dns_check_record() always return true on Alpine
Nikita Popov [Wed, 15 Jul 2020 13:10:28 +0000 (15:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78008: dns_check_record() always return true on Alpine
Andy Postnikov [Tue, 14 Jul 2020 01:14:05 +0000 (04:14 +0300)]
Fix bug #78008: dns_check_record() always return true on Alpine
- free handle before return result
- cleaned up remaining usage of MAXPACKET
- update dns_get_mx() to use the same approach
Closes GH-5854.
Nikita Popov [Wed, 15 Jul 2020 13:00:45 +0000 (15:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79862
Nikita Popov [Wed, 15 Jul 2020 12:59:55 +0000 (14:59 +0200)]
Fixed bug #79862
While normally a private property in the active scope would take
priority, we should not use this if it has the wrong "staticness".
Nikita Popov [Wed, 15 Jul 2020 08:59:32 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79820
Christopher Broadbent [Wed, 15 Jul 2020 04:47:21 +0000 (14:47 +1000)]
Fixed bug #79820
Similar to what is done for ReflectionType itself, copy the
type name stored inside ReflectionProperty. Also make sure the
type field is always initialized for dynamic properties.
This is a non-issue in PHP 8, because we store a pointer to the
property_info there, rather than a copy.
Nikita Popov [Wed, 15 Jul 2020 07:51:14 +0000 (09:51 +0200)]
Remove type argument from zend_get_zval_ptr
As pointed out by Levi, this is unused, and we already changed
the signature of this function for PHP 8.
Christopher Jones [Wed, 15 Jul 2020 03:43:04 +0000 (13:43 +1000)]
Retrofit description of recent PR changes
Nikita Popov [Tue, 14 Jul 2020 14:10:04 +0000 (16:10 +0200)]
Reduce scope of preload compiler_options
Only set preloading compiler_options while executing the preload
file, not when performing linking afterwards. Otherwise options
like IGNORE_INTERNAL_CLASSES will hide classes from inheritance
verification.
Nikita Popov [Tue, 14 Jul 2020 13:24:58 +0000 (15:24 +0200)]
Fix preloading of union typed property inherited from internal class
Tricky edge case: We inherit a property from an internal class,
in which case no property duplication takes place. We should not
try to persist the property info in that case. This didn't really
matter previously, but now that the property has some non-interned
owned data (the type), we need to make sure we don't try to free
that.
Nikita Popov [Tue, 14 Jul 2020 12:44:35 +0000 (14:44 +0200)]
Check for name vs ce in a few more places
The type lists may contain CEs, we should not assume they only
contain names.
Dmitry Stogov [Tue, 14 Jul 2020 12:15:08 +0000 (15:15 +0300)]
Tracing JIT for SWITCH instructions
Dmitry Stogov [Tue, 14 Jul 2020 12:14:21 +0000 (15:14 +0300)]
Better support for 64-bit .aword constants
Nikita Popov [Tue, 14 Jul 2020 10:59:04 +0000 (12:59 +0200)]
Fix preloading property type resolution
This was causing many failures under --preload...
Nikita Popov [Tue, 14 Jul 2020 10:44:06 +0000 (12:44 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Nikita Popov [Tue, 14 Jul 2020 10:43:58 +0000 (12:43 +0200)]
Merge remote-tracking branch 'upstream/PHP-7.4' into PHP-7.4
* upstream/PHP-7.4:
Fix test for x86 Windows
Nikita Popov [Tue, 14 Jul 2020 10:43:03 +0000 (12:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79849
Nikita Popov [Tue, 14 Jul 2020 10:42:46 +0000 (12:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79849
Evgeny Stepanischev [Mon, 13 Jul 2020 12:16:39 +0000 (15:16 +0300)]
Fixed bug #79849
Closes GH-5853.
Nikita Popov [Tue, 14 Jul 2020 10:30:50 +0000 (12:30 +0200)]
Fixed bug #79852
Nikita Popov [Tue, 14 Jul 2020 08:52:15 +0000 (10:52 +0200)]
Use different scratch register
r1 clashes with FCARG1a on Windows, so use a different scratch
register. FCARG2a should be free here. Hopefully fixes the
AppVeyor build.
Martin Schröder [Sun, 12 Jul 2020 18:56:47 +0000 (20:56 +0200)]
Support socketpairs in proc_open()
Closes GH-5777.
Christoph M. Becker [Mon, 13 Jul 2020 17:14:59 +0000 (19:14 +0200)]
Remove out-dated comment
ZTS support has been added around ~7.2.
Christoph M. Becker [Mon, 13 Jul 2020 17:13:44 +0000 (19:13 +0200)]
Fix typos
Nikita Popov [Mon, 13 Jul 2020 15:24:31 +0000 (17:24 +0200)]
Put debug function behind ifdef
Nikita Popov [Mon, 13 Jul 2020 12:50:25 +0000 (14:50 +0200)]
Add user upgrading note for no_separation change
I added this to UPGRADING.INTERNALS, but it should also be
mentioned in UPGRADING, as it affects user-visible behavior.
[ci skip]
Nikita Popov [Mon, 13 Jul 2020 12:44:17 +0000 (14:44 +0200)]
Add upgrading note for crypt change
[ci skip]
Nikita Popov [Mon, 13 Jul 2020 12:40:19 +0000 (14:40 +0200)]
Restore warning
George Peter Banyard [Sat, 11 Jul 2020 22:16:29 +0000 (00:16 +0200)]
Use consistent types
uint32_t type for argument count
size_t for length of char*
zend_bool for a zval bool arg
Closes GH-5845
Dmitry Stogov [Mon, 13 Jul 2020 10:08:32 +0000 (13:08 +0300)]
Improved reference-counting inference
Nikita Popov [Mon, 13 Jul 2020 09:31:18 +0000 (11:31 +0200)]
Add upgrading note
[ci skip]
Remi Collet [Fri, 10 Jul 2020 09:49:22 +0000 (11:49 +0200)]
define COMPILER and ARCHITECTURE from environment
Rowan Tommins [Thu, 11 Jun 2020 19:56:22 +0000 (20:56 +0100)]
Improve output of tokens in Parse Errors
Currently, unexpected tokens in the parser are shown as the text
found, plus the internal token name, including the notorious
"unexpected '::' (T_PAAMAYIM_NEKUDOTAYIM)".
This commit replaces that with a more user-friendly format, with
two main types of token:
* Tokens which always represent the same text are shown like
'unexpected token "::"' and 'expected "::"'
* Tokens which have variable text are given a user-friendly
name, and show like 'unexpected identifier "foo"', and
'expected identifer'.
A few tokens have special cases:
* unexpected token """ -> unexpected double-quote mark
* unexpected quoted string "'foo'" -> unexpected single-quoted
string "foo"
* unexpected quoted string ""foo"" -> unexpected double-quoted
string "foo"
* unexpected illegal character "_" -> unexpected character 0xNN
(where _ is almost certainly a control character, and NN is the
hexadecimal value of the byte)
The \ token has a special case in the implementation just to stop
bison making a mess of escaping it and it coming out as \\
Dmitry Stogov [Mon, 13 Jul 2020 09:04:08 +0000 (12:04 +0300)]
JIT for array merging
Nat Wyatt [Fri, 10 Jul 2020 21:56:54 +0000 (14:56 -0700)]
Fix compilation errors when EXIF_DEBUG is defined
Fix warnings and error when compiling with EXIF_DEBUG defined.
Closes GH-5838.
Christoph M. Becker [Mon, 13 Jul 2020 08:53:55 +0000 (10:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test for x86 Windows
Christoph M. Becker [Mon, 13 Jul 2020 08:45:47 +0000 (10:45 +0200)]
Fix test for x86 Windows
`st_dev` deliberately overflows on such systems, cf.
<http://svn.php.net/viewvc?view=revision&revision=350100>.
Nikita Popov [Mon, 13 Jul 2020 08:26:10 +0000 (10:26 +0200)]
Add another doctrine workaround
This has been fixed a few months ago, but apparently Doctrine
doesn't do releases.
Nikita Popov [Mon, 13 Jul 2020 08:05:39 +0000 (10:05 +0200)]
Check for undef var in verify return jit
Nikita Popov [Mon, 13 Jul 2020 07:55:13 +0000 (09:55 +0200)]
Fixed bug #79828
Nikita Popov [Mon, 13 Jul 2020 07:40:19 +0000 (09:40 +0200)]
Fixed bug #79841
Christoph M. Becker [Sun, 12 Jul 2020 21:52:22 +0000 (23:52 +0200)]
Fix PDO_Firebird numeric to string conversion on Windows
Commit
aaa1f90 [1] dropped support for the `snprinf()` `I` modifier, so
we use the standard `ll` modifier which is suitable for 32bit and 64bit
Windows. We also replace the deprecated `I64` suffix[2] with the `LL`
suffix.
This fixes ext/pdo_firebird/tests/bug_64037.phpt.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
aaa1f90e3f90c24098fa55a7b868fdca0b89ee25 >
[2] <https://docs.microsoft.com/en-us/cpp/cpp/numeric-boolean-and-pointer-literals-cpp?view=vs-2019#integer-literals>
Christoph M. Becker [Sun, 12 Jul 2020 16:14:35 +0000 (18:14 +0200)]
Fix PDO_Firebird tests which assume ERRMODE_SILENT
These have apparently been missed when PR 5388[1] had been merged.
[1] <https://github.com/php/php-src/pull/5388>
Christoph M. Becker [Sun, 12 Jul 2020 15:49:36 +0000 (17:49 +0200)]
Unbork tests for PDO_Firebird
PDO_Firebird raises a warning regarding the unknown SQL syntax, which
we have to silence to avoid run-tests.php to mark the test as borked.
Ilija Tovilo [Sat, 11 Jul 2020 16:46:51 +0000 (18:46 +0200)]
Fix free of uninitialized memory in MATCH_ERROR
As suggested by Tyson Andre:
https://github.com/php/php-src/pull/5371#issuecomment-
657081464
Also fix line number of unhandled match error
Closes GH-5841.
twosee [Sat, 11 Jul 2020 19:08:42 +0000 (03:08 +0800)]
debug_zval_dump(): Don't skip recursion detection on first level
A complement to
ae6f45ad45e072260d93f828d81fee9548123044
Closes GH-5843.
Máté Kocsis [Sat, 11 Jul 2020 18:04:40 +0000 (20:04 +0200)]
Addd upgrading notes about OCI8
Jens de Nies [Sun, 5 Jul 2020 07:35:44 +0000 (09:35 +0200)]
Removed the "oci_internal_debug" function and its alias. Also deprecated the "ocifetchinto" function.
Closes GH-5810
Chuck Adams [Sat, 11 Jul 2020 15:47:33 +0000 (09:47 -0600)]
(ffi) fix ifdefs for non-windows systems without long double
Closes GH-5840
Christoph M. Becker [Sat, 11 Jul 2020 13:41:15 +0000 (15:41 +0200)]
Export php_gd_libgdimageptr_from_zval_p()
Some extension may need to retrieve the `gdImagePtr` from an `GdImage`
object; thus, we export the respective function. To not being forced
to include gd.h in php_gd.h, we use the opaque `struct gdImageStruct *`
as return type.
We also rename php_gd2.dll to php_gd.dll, since there's not really much
point in giving the DLL a version number, since there is no php_gd.dll
for years (if there ever has been). Renaming, on the other hand,
matches the name on other systems (gd.so), and allows to actually use
`ADD_EXTENSION_DEP()`.
Ilija Tovilo [Sat, 11 Jul 2020 14:43:56 +0000 (16:43 +0200)]
[skip ci] Consistent match test closing tags
twosee [Sat, 11 Jul 2020 10:32:18 +0000 (18:32 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed BC break of php_debug_zval_dump
twosee [Sat, 11 Jul 2020 10:31:30 +0000 (18:31 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed BC break of php_debug_zval_dump
twosee [Sat, 11 Jul 2020 10:30:28 +0000 (18:30 +0800)]
Fixed BC break of php_debug_zval_dump
It introduced by fixing bug #79830
twosee [Sat, 11 Jul 2020 06:40:17 +0000 (14:40 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79830 introduced by fixing bug #79821
# Conflicts:
# ext/standard/var.c
twosee [Sat, 11 Jul 2020 06:38:27 +0000 (14:38 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79830 introduced by fixing bug #79821
twosee [Sat, 11 Jul 2020 06:37:25 +0000 (14:37 +0800)]
Fixed bug #79830 introduced by fixing bug #79821
This also fixes memory error in debug_zval_dump and var_export.
twosee [Fri, 10 Jul 2020 22:19:41 +0000 (06:19 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79821
twosee [Fri, 10 Jul 2020 22:15:28 +0000 (06:15 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79821
twosee [Fri, 10 Jul 2020 22:14:22 +0000 (06:14 +0800)]
Fixed bug #79821
HashTable was reallocated (zend_hash_packed_grow) during php_var_dump, so we should call GC_ADDREF to make SEPARATE_ARRAY work.
Closes GH-5837.
codinghuang [Fri, 10 Jul 2020 09:13:16 +0000 (11:13 +0200)]
Don't generate JSON scanner and parser during configure
Máté Kocsis [Fri, 10 Jul 2020 21:15:08 +0000 (23:15 +0200)]
Retain the original formatting character in test
Máté Kocsis [Tue, 26 May 2020 12:10:57 +0000 (14:10 +0200)]
Review the usage of apostrophes in error messages
Closes GH-5590
Christoph M. Becker [Fri, 10 Jul 2020 16:14:42 +0000 (18:14 +0200)]
Fix test cases
These tests are not supposed to check the result of `fclose(false)`.
George Peter Banyard [Thu, 2 Jul 2020 00:29:47 +0000 (02:29 +0200)]
Use dedicated function for illegal offset type error
Nikita Popov [Fri, 10 Jul 2020 13:58:04 +0000 (15:58 +0200)]
Add missing addref for MATCH_ERROR operand
George Peter Banyard [Wed, 8 Jul 2020 16:13:23 +0000 (18:13 +0200)]
Promote Notice to Warning in libmagic
The current behaviour makes little to no sense, having a notice which starts with 'Warning:' should just be a warning
Closes GH-5824
Nikita Popov [Fri, 10 Jul 2020 12:36:50 +0000 (14:36 +0200)]
Fixed bug #79818
Only destroy the variable directly before reassigning it. The
value could be read in the meantime.
Máté Kocsis [Wed, 25 Mar 2020 10:53:06 +0000 (11:53 +0100)]
Add stubs for SAPIs
Closes GH-5295.
Nikita Popov [Fri, 10 Jul 2020 12:10:02 +0000 (14:10 +0200)]
Fix warning in embed sapi
Nikita Popov [Fri, 10 Jul 2020 12:07:59 +0000 (14:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79817