]>
granicus.if.org Git - php/log
Joe Watkins [Tue, 11 Jun 2019 13:15:31 +0000 (15:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
This reverts
0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
Joe Watkins [Tue, 11 Jun 2019 13:13:27 +0000 (15:13 +0200)]
This reverts
0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
On Mac thread_local and __thread are not ABI compatible, in addition, thread_local
comes with additional overhead, __thread seems to be the most suitable linkage to use
regardless of c++/c
Christoph M. Becker [Tue, 11 Jun 2019 11:32:42 +0000 (13:32 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Next is 7.3.8
Christoph M. Becker [Tue, 11 Jun 2019 11:32:14 +0000 (13:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Next is 7.3.8
Christoph M. Becker [Tue, 11 Jun 2019 11:31:30 +0000 (13:31 +0200)]
Next is 7.3.8
Nikita Popov [Tue, 11 Jun 2019 11:15:03 +0000 (13:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 09:39:56 +0000 (11:39 +0200)]
Support full variance if autoloading is used
Keep track of delayed variance obligations and check them after
linking a class is otherwise finished. Obligations may either be
unresolved method compatibility (because the necessecary classes
aren't available yet) or open parent/interface dependencies. The
latter occur because we allow the use of not fully linked classes
as parents/interfaces now.
An important aspect of the implementation is we do not require
classes involved in variance checks to be fully linked in order for
the class to be fully linked. Because the involved types do have to
exist in the class table (as partially linked classes) and we do
check these for correct variance, we have the guarantee that either
those classes will successfully link lateron or generate an error,
but there is no way to actually use them until that point and as
such no possibility of violating the variance contract. This is
important because it ensures that a class declaration always either
errors or will produce an immediately usable class afterwards --
there are no cases where the finalization of the class declaration
has to be delayed until a later time, as earlier variants of this
patch did.
Because variance checks deal with classes in various stages of
linking, we need to use a special instanceof implementation that
supports this, and also introduce finer-grained flags that tell us
which parts have been linked already and which haven't.
Class autoloading for variance checks is delayed into a separate
stage after the class is otherwise linked and before delayed
variance obligations are processed. This separation is needed to
handle cases like A extends B extends C, where B is the autoload
root, but C is required to check variance. This could end up
loading C while the class structure of B is in an inconsistent
state.
Nikita Popov [Fri, 24 May 2019 12:28:44 +0000 (14:28 +0200)]
Register class before fetching parent
We want the class declaration to be available while compiling the
parent class.
Joe Watkins [Tue, 11 Jun 2019 10:53:34 +0000 (12:53 +0200)]
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
Joe Watkins [Tue, 11 Jun 2019 10:53:34 +0000 (12:53 +0200)]
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
Nikita Popov [Tue, 11 Jun 2019 10:30:11 +0000 (12:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Mar 2019 09:09:49 +0000 (10:09 +0100)]
Add specialized pair construction API
Closes GH-3990.
Remi Collet [Tue, 11 Jun 2019 10:19:55 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:19:39 +0000 (12:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:19:17 +0000 (12:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:18:43 +0000 (12:18 +0200)]
next is 7.2.21
Joe Watkins [Tue, 11 Jun 2019 09:09:24 +0000 (11:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
drop docker until tested locally
Joe Watkins [Tue, 11 Jun 2019 09:09:06 +0000 (11:09 +0200)]
drop docker until tested locally
Joe Watkins [Tue, 11 Jun 2019 08:45:41 +0000 (10:45 +0200)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Tue, 11 Jun 2019 08:43:26 +0000 (10:43 +0200)]
Merge branch 'master' of git://github.com/php/php-src
Joe Watkins [Tue, 11 Jun 2019 08:42:54 +0000 (10:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
checkout depth of one doesn't always work with batched builds, it seems
Joe Watkins [Tue, 11 Jun 2019 08:42:25 +0000 (10:42 +0200)]
checkout depth of one doesn't always work with batched builds, it seems
Nikita Popov [Tue, 11 Jun 2019 08:29:20 +0000 (10:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 14 May 2019 12:27:10 +0000 (14:27 +0200)]
Add get_mangled_object_vars() function
Joe Watkins [Tue, 11 Jun 2019 08:25:39 +0000 (10:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
i386 build
Joe Watkins [Tue, 11 Jun 2019 08:23:59 +0000 (10:23 +0200)]
Merge branch 'i386-azure' into PHP-7.4
* i386-azure:
i386 build
Joe Watkins [Sun, 9 Jun 2019 13:31:19 +0000 (15:31 +0200)]
i386 build
Nikita Popov [Tue, 11 Jun 2019 08:07:19 +0000 (10:07 +0200)]
Remove ldap zpp tests
Missed these in the zpp test purge -- they've been failing on master
for a while, but nobody compiles with ldap.
Tyson Andre [Sun, 9 Jun 2019 20:55:56 +0000 (16:55 -0400)]
Fix php 8.0's opcache flags for pathinfo()
See https://php.net/pathinfo
This fixes a bug introduced in the cleanup for commit
0d79c70cf3c10f60a2e8fbfd68903d8716b7b43c
`pathinfo($str, PATHINFO_EXTENSION)` will always return a string
(if there is no extension, the function returns the empty string)
Joe Watkins [Tue, 11 Jun 2019 07:08:31 +0000 (09:08 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo in opcache function flag info (mage->image)
Tyson Andre [Sun, 9 Jun 2019 20:20:20 +0000 (16:20 -0400)]
Fix typo in opcache function flag info (mage->image)
ext/gd/gd.c seems to return null for wrong parameter count, false for
error, and long otherwise. See https://php.net/imagecolorallocate
In php 8.0, the MAY_BE_NULL can probably be removed.
Tyson Andre [Sun, 9 Jun 2019 20:14:13 +0000 (16:14 -0400)]
Delete opcache flags for php 8.0's removed mbereg*() aliases
See UPGRADING for Mbstring.
All of these are aliases of corresponding `mb_*`
functions that existed in php 7 but were removed in php 8.
Other functions such as gzgetss were already removed.
Joe Watkins [Tue, 11 Jun 2019 07:06:48 +0000 (09:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Clean up opcache func flags for set_socket_blocking
Tyson Andre [Sun, 9 Jun 2019 21:58:50 +0000 (17:58 -0400)]
Clean up opcache func flags for set_socket_blocking
It was removed in php 7.0. See https://php.net/set_socket_blocking
Joe Watkins [Tue, 11 Jun 2019 07:05:07 +0000 (09:05 +0200)]
Joe Watkins [Tue, 11 Jun 2019 07:00:19 +0000 (09:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix a typo in opcache func info for "get_parrent_class"
Tyson Andre [Sun, 9 Jun 2019 19:13:44 +0000 (15:13 -0400)]
Fix a typo in opcache func info for "get_parrent_class"
This should only have one r.
http://php.net/get_parent_class mentions that it returns string|false
Also, I'm not 100% sure if this is right - should this include
MAY_BE_NULL to handle the case of too many parameters?
(then again, get_called_class() also returns null in the global scope)
```
php > var_export(get_parent_class(2,3));
Warning: get_parent_class() expects at most 1 parameter, 2 given in php
shell code on line 1
NULL
```
Joe Watkins [Tue, 11 Jun 2019 06:54:00 +0000 (08:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ext/pgsql: Use PKG_CHECK_MODULES to detect the pq library
Hugh McMaster [Fri, 7 Jun 2019 12:29:55 +0000 (22:29 +1000)]
ext/pgsql: Use PKG_CHECK_MODULES to detect the pq library
Christoph M. Becker [Tue, 11 Jun 2019 06:45:32 +0000 (08:45 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77937: preg_match failed
Christoph M. Becker [Tue, 11 Jun 2019 06:44:54 +0000 (08:44 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77937: preg_match failed
Christoph M. Becker [Tue, 11 Jun 2019 06:43:20 +0000 (08:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77937: preg_match failed
Christoph M. Becker [Tue, 30 Apr 2019 14:10:04 +0000 (16:10 +0200)]
Fix #77937: preg_match failed
On some recent Windows systems, ext\pcre\tests\locales.phpt fails,
because 'pt_PT' is accepted by `setlocale()`, but not properly
supported by the ctype functions, which are used internally by PCRE2 to
build the localized character tables.
Since there appears to be no way to properly check whether a given
locale is fully supported, but we want to minimize BC impact, we filter
out typical Unix locale names, except for a few cases which have
already been properly supported on Windows. This way code like
setlocale(LC_ALL, 'de_DE.UTF-8', 'de_DE', 'German_Germany.1252');
should work like on older Windows systems.
It should be noted that the locale names causing trouble are not (yet)
documented as valid names anyway, see
<https://docs.microsoft.com/en-us/cpp/c-runtime-library/locale-names-languages-and-country-region-strings?view=vs-2019>.
Dmitry Stogov [Mon, 10 Jun 2019 13:43:36 +0000 (16:43 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
micro-optimization
Dmitry Stogov [Mon, 10 Jun 2019 13:43:20 +0000 (16:43 +0300)]
micro-optimization
Joe Watkins [Mon, 10 Jun 2019 12:23:55 +0000 (14:23 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
watchpoints have flaws in implementation
Joe Watkins [Mon, 10 Jun 2019 12:23:37 +0000 (14:23 +0200)]
watchpoints have flaws in implementation
Joe Watkins [Mon, 10 Jun 2019 12:19:58 +0000 (14:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
BIND_LEXICAL has a meaningless line number
Joe Watkins [Mon, 10 Jun 2019 12:19:39 +0000 (14:19 +0200)]
BIND_LEXICAL has a meaningless line number
Dmitry Stogov [Mon, 10 Jun 2019 09:53:34 +0000 (12:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed possible misalignment in 32-bit build.
Dmitry Stogov [Mon, 10 Jun 2019 09:53:04 +0000 (12:53 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed possible misalignment in 32-bit build.
Dmitry Stogov [Mon, 10 Jun 2019 09:52:50 +0000 (12:52 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed possible misalignment in 32-bit build.
Dmitry Stogov [Mon, 10 Jun 2019 09:51:59 +0000 (12:51 +0300)]
Fixed possible misalignment in 32-bit build.
Joe Watkins [Mon, 10 Jun 2019 08:35:57 +0000 (10:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky ipv4 loopback test
Joe Watkins [Mon, 10 Jun 2019 08:35:31 +0000 (10:35 +0200)]
fix flaky ipv4 loopback test
Peter Kokot [Sun, 9 Jun 2019 20:55:43 +0000 (22:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Extend wildcard files section in EditorConfig [ci skip]
Simplify LiteSpeed SAPI module version
Use PHP_VERSION for zend modules
Peter Kokot [Sun, 9 Jun 2019 20:55:21 +0000 (22:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Extend wildcard files section in EditorConfig [ci skip]
Peter Kokot [Sun, 9 Jun 2019 20:54:59 +0000 (22:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Extend wildcard files section in EditorConfig [ci skip]
Peter Kokot [Sun, 9 Jun 2019 20:53:58 +0000 (22:53 +0200)]
Extend wildcard files section in EditorConfig [ci skip]
Changes:
- Trim trailing whitespace for all files except patches. There isn't
really any practical reason to not trim the trailing whitespace in all
other files. Binary files or phpt files that include trailing
whitespace as part of the test should be manually set in editors/IDEs
or by disabling the editorconfig for particular editing.
- Add *.ac, *.d, *.l, *.skl, *.re, *.wsdl, *.dtd, *.html, *.rng, *.xml,
*.xsd, *.xsl, buildconf, and Makefile* files settings.
Closes #4156
Peter Kokot [Sat, 11 May 2019 02:43:40 +0000 (04:43 +0200)]
Simplify LiteSpeed SAPI module version
This patch syncs versioning of the LiteSpeed SAPI module by making it in
sync with the rest of the bundled PHP extensions and SAPIs.
Closes #4145
Peter Kokot [Sun, 19 May 2019 15:18:29 +0000 (17:18 +0200)]
Use PHP_VERSION for zend modules
Closes #4147
Joe Watkins [Sun, 9 Jun 2019 20:23:45 +0000 (22:23 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
azure macos
Jan Altensen [Thu, 6 Jun 2019 15:37:04 +0000 (17:37 +0200)]
azure macos
Change-Id: I3465dcc865c254cea02feb619f6706fa0d164757
Joe Watkins [Sun, 9 Jun 2019 11:40:04 +0000 (13:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
azure image update [not skipping on purpose to test new configuration]
Joe Watkins [Sun, 9 Jun 2019 11:39:35 +0000 (13:39 +0200)]
azure image update [not skipping on purpose to test new configuration]
Joe Watkins [Sat, 8 Jun 2019 19:48:00 +0000 (21:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78132 wrong line number on ZEND_BIND_STATIC for lexical vars
Joe Watkins [Sat, 8 Jun 2019 19:47:07 +0000 (21:47 +0200)]
Fix #78132 wrong line number on ZEND_BIND_STATIC for lexical vars
Dmitry Stogov [Fri, 7 Jun 2019 09:39:40 +0000 (12:39 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:39:24 +0000 (12:39 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:38:37 +0000 (12:38 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Restored NEWS entry
Dmitry Stogov [Fri, 7 Jun 2019 09:37:49 +0000 (12:37 +0300)]
Restored NEWS entry
Nikita Popov [Fri, 7 Jun 2019 08:58:06 +0000 (10:58 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 08:57:51 +0000 (10:57 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 7 Jun 2019 08:57:43 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Jun 2019 08:26:37 +0000 (10:26 +0200)]
Enable STRICT_TRANS_TABLES in new test
The part testing error cases relies on this.
Dmitry Stogov [Fri, 7 Jun 2019 08:50:30 +0000 (11:50 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:50:19 +0000 (11:50 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:48:57 +0000 (11:48 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Dmitry Stogov [Fri, 7 Jun 2019 08:36:39 +0000 (11:36 +0300)]
Fixed bug #77135 (Extract with EXTR_SKIP should skip $this)
Nikita Popov [Fri, 7 Jun 2019 07:54:05 +0000 (09:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 07:53:35 +0000 (09:53 +0200)]
Use batch mode on Azure
Nikita Popov [Fri, 7 Jun 2019 07:49:22 +0000 (09:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Jun 2019 07:49:09 +0000 (09:49 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 7 Jun 2019 07:49:01 +0000 (09:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Cameron Porter [Wed, 6 Mar 2019 06:33:40 +0000 (00:33 -0600)]
Fixed bug #38546
Properly support binding boolean parameters with emulated prepared
statements disabled. Also add the necessary mysqlnd support for
MYSQL_TYPE_TINY.
Nikita Popov [Fri, 7 Jun 2019 07:35:41 +0000 (09:35 +0200)]
Merge branch 'PHP-7.4'
Hugh McMaster [Thu, 6 Jun 2019 12:22:00 +0000 (22:22 +1000)]
ext/xsl: Use PKG_CHECK_MODULES to detect the EXSLT library
Hugh McMaster [Thu, 6 Jun 2019 11:19:19 +0000 (21:19 +1000)]
ext/xsl: Use PKG_CHECK_MODULES to detect the XSLT library
Peter Kokot [Thu, 6 Jun 2019 23:25:20 +0000 (01:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Catch up with
642b8d00e01170eb934c1adb56bcf43c9c4aecd4
Peter Kokot [Thu, 6 Jun 2019 23:24:02 +0000 (01:24 +0200)]
Christoph M. Becker [Thu, 6 Jun 2019 14:19:37 +0000 (16:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use zero port in socket_(export|import)_stream-4-win.phpt
Christoph M. Becker [Thu, 6 Jun 2019 14:18:25 +0000 (16:18 +0200)]
Use zero port in socket_(export|import)_stream-4-win.phpt
These regularly fail due to port clashes, though we don't seem to
use those ports in any other tests.
As we don't care about the specific port that is used here, pass
zero so that a random ephemeral port is used.
Christoph M. Becker [Thu, 6 Jun 2019 13:56:13 +0000 (15:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78094: File Search Problem Excessive Time
Christoph M. Becker [Thu, 6 Jun 2019 13:54:12 +0000 (15:54 +0200)]
Fix bug #78094: File Search Problem Excessive Time
Instead of checking GetBinaryType() for each file, we do a much cheaper
pre-check whether the filename extension matches .exe or .com, and call
GetBinaryType() only in this case. For BC we also report .bat and .cmd
files as executables again.
The patch has been provided by @weltling.
Christoph M. Becker [Thu, 6 Jun 2019 13:09:57 +0000 (15:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 13:02:41 +0000 (15:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 13:00:35 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test regarding Unix Domain Sockets on Windows
Christoph M. Becker [Thu, 6 Jun 2019 12:56:47 +0000 (14:56 +0200)]
Fix test regarding Unix Domain Sockets on Windows
Recent Windows versions actually support Unix Domain Sockets. Cf.
<https://github.com/curl/curl/pull/3939>.
Nikita Popov [Thu, 6 Jun 2019 12:56:58 +0000 (14:56 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 6 Jun 2019 12:56:42 +0000 (14:56 +0200)]
Try to fix Windows build