]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 16 Apr 2019 10:21:48 +0000 (12:21 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Apr 2019 10:19:37 +0000 (12:19 +0200)]
Don't overwrite iterator count during real init
Nikita Popov [Tue, 16 Apr 2019 10:21:16 +0000 (12:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 16 Apr 2019 09:47:41 +0000 (11:47 +0200)]
Fix HT flags copying wrt iterator count
HT_FLAGS() includes the full flag word, including the iterator
count. When we're fully reassigning it, we need to make sure that
we either really do want to copy the iterator count (as in some
cases in array.c) or we need to mask only the actual flag byte.
Add an assert to hash_iterators_del() to make sure the iterator
count is non-zero (which is how I ran into this) and make sure that
the iterator count is correctly preserved during array splicing.
Christoph M. Becker [Tue, 16 Apr 2019 09:57:30 +0000 (11:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prepare main branch for PHP 7.3.6
Christoph M. Becker [Tue, 16 Apr 2019 09:56:58 +0000 (11:56 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prepare main branch for PHP 7.3.6
Christoph M. Becker [Tue, 16 Apr 2019 09:56:03 +0000 (11:56 +0200)]
Prepare main branch for PHP 7.3.6
Nikita Popov [Tue, 16 Apr 2019 08:40:01 +0000 (10:40 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 16 Apr 2019 08:39:48 +0000 (10:39 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 15:14:11 +0000 (17:14 +0200)]
s/mysql_connect()/mysqli_connect() in php.ini
Nikita Popov [Tue, 16 Apr 2019 08:38:20 +0000 (10:38 +0200)]
Fix second part of bug #77903
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
Nikita Popov [Tue, 16 Apr 2019 08:20:19 +0000 (10:20 +0200)]
Partial fix for bug #77903
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.
There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
Christoph M. Becker [Tue, 16 Apr 2019 06:44:19 +0000 (08:44 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use curl_mime_*() functions if available
Christoph M. Becker [Mon, 15 Apr 2019 16:24:59 +0000 (18:24 +0200)]
Use curl_mime_*() functions if available
As of curl 7.56.0, `curl_formadd()` is deprecated in favor of
`curl_mime_*()`, so we use the latter if available.
Dmitry Stogov [Mon, 15 Apr 2019 21:09:52 +0000 (00:09 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Dmitry Stogov [Mon, 15 Apr 2019 21:09:45 +0000 (00:09 +0300)]
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
Remove not needed extension generated files gitignores
Add test for curl_version()
Fixed bug #77895
Zero sockaddr struct
Fix saproxy_property_write signature
Correctly destroy reference in ArrayObject sort
Dmitry Stogov [Mon, 15 Apr 2019 21:09:08 +0000 (00:09 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
execute_data->return_value is not used for internal functions
Dmitry Stogov [Mon, 15 Apr 2019 21:08:16 +0000 (00:08 +0300)]
execute_data->return_value is not used for internal functions
Peter Kokot [Mon, 15 Apr 2019 18:07:37 +0000 (20:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove not needed extension generated files gitignores
Peter Kokot [Mon, 15 Apr 2019 18:03:48 +0000 (20:03 +0200)]
Remove not needed extension generated files gitignores
These were refactored and moved to build directory via:
2957651c5c2a003e96318fc9217764b91266723a and
7e445ef3b1a197dccbc92f35cb66988b66671841
Nikita Popov [Mon, 15 Apr 2019 13:58:14 +0000 (15:58 +0200)]
Merge branch 'PHP-7.4'
Rodrigo Prado [Mon, 15 Apr 2019 00:40:27 +0000 (21:40 -0300)]
Add test for curl_version()
David Carlier [Mon, 15 Apr 2019 09:03:11 +0000 (09:03 +0000)]
Both readlink args should not point to the same buffer
Nikita Popov [Mon, 15 Apr 2019 13:28:07 +0000 (15:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 13:27:37 +0000 (15:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 13:27:19 +0000 (15:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 13:26:58 +0000 (15:26 +0200)]
Fixed bug #77895
Nikita Popov [Mon, 15 Apr 2019 13:01:03 +0000 (15:01 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 13:00:56 +0000 (15:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 13:00:49 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 12:59:05 +0000 (14:59 +0200)]
Zero sockaddr struct
in6 has a bunch of extra fields that we're leaving uninitialized. I
don't see them locally, but there's valgrind warnings on gcov.
Nikita Popov [Mon, 15 Apr 2019 12:34:32 +0000 (14:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 12:33:47 +0000 (14:33 +0200)]
Fix saproxy_property_write signature
Nikita Popov [Mon, 15 Apr 2019 11:22:00 +0000 (13:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 11:16:16 +0000 (13:16 +0200)]
Correctly destroy reference in ArrayObject sort
The reference may be captured in an exception backtrace, in which
case the refcount may be more than one.
Dmitry Stogov [Mon, 15 Apr 2019 10:19:39 +0000 (13:19 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Removed tests that always (or almost always) true
Dmitry Stogov [Mon, 15 Apr 2019 10:18:16 +0000 (13:18 +0300)]
Removed tests that always (or almost always) true
Nikita Popov [Mon, 15 Apr 2019 09:47:10 +0000 (11:47 +0200)]
Suppress some maybe uninit warnings in jit
Nikita Popov [Mon, 15 Apr 2019 09:42:55 +0000 (11:42 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 09:40:37 +0000 (11:40 +0200)]
Try to fix stat_variation3-win32.phpt
After fixing comparison operator typos in
f73c104927b64d6137cbe42bf42260d9349cbd02 this test is failing. I
believe the comparison here should be using < rather than ==.
Nikita Popov [Mon, 15 Apr 2019 09:35:13 +0000 (11:35 +0200)]
Fix last maybe uninit warnings on 7.4
Most of these only occur under GCC 5. Not fond of all the workarounds
(especially the PDO one), but it gets us a clean build...
Nikita Popov [Mon, 15 Apr 2019 08:59:45 +0000 (10:59 +0200)]
Avoid maybe uninit warning in libmagic
GCC 5 false positive, gone in newer versions.
Nikita Popov [Mon, 15 Apr 2019 08:54:46 +0000 (10:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 08:54:39 +0000 (10:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 08:54:31 +0000 (10:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 08:53:33 +0000 (10:53 +0200)]
Fix uninitialized cert_captured
This is a legimitimate bug and also shows up under valgrind.
Nikita Popov [Mon, 15 Apr 2019 08:43:49 +0000 (10:43 +0200)]
Disable strict aliasing warnings
It seems like GCC 5 likes to warn about exactly those trivial strict
aliasing violations that it's not going to miscompile anyway and the
warnings are gone in newer versions. Just disable the noise.
Nikita Popov [Mon, 15 Apr 2019 08:25:27 +0000 (10:25 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 08:25:20 +0000 (10:25 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 15 Apr 2019 08:25:00 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 08:22:40 +0000 (10:22 +0200)]
Fixed bug #77882
Côme Chilliet [Mon, 15 Apr 2019 08:21:27 +0000 (10:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Updated NEWS
Fix a NULL dereferencing crash in php-ldap
Côme Chilliet [Mon, 15 Apr 2019 08:20:12 +0000 (10:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Updated NEWS
Fix a NULL dereferencing crash in php-ldap
Côme Chilliet [Mon, 15 Apr 2019 08:19:19 +0000 (10:19 +0200)]
Updated NEWS
Côme Chilliet [Mon, 15 Apr 2019 08:16:29 +0000 (10:16 +0200)]
Fix a NULL dereferencing crash in php-ldap
This happens when parsing a control response to a VLV request which does
not contain a "context" string.
See bug #77869
Nikita Popov [Mon, 15 Apr 2019 08:05:25 +0000 (10:05 +0200)]
Merge branch 'PHP-7.4'
Rodrigo Prado [Mon, 15 Apr 2019 00:15:23 +0000 (21:15 -0300)]
Remove functions from func_info that were removed in PHP 7
Nikita Popov [Mon, 15 Apr 2019 07:48:57 +0000 (09:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 15 Apr 2019 07:48:39 +0000 (09:48 +0200)]
Fix incorrect compare_stats operator
Gabriel Caruso [Sun, 14 Apr 2019 14:51:39 +0000 (11:51 -0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_* for always available extensions
Gabriel Caruso [Sat, 16 Mar 2019 09:14:01 +0000 (06:14 -0300)]
Remove HAVE_* for always available extensions
Peter Kokot [Sat, 13 Apr 2019 05:01:11 +0000 (07:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Disable PACKAGE_* preprocessor symbols
Peter Kokot [Tue, 9 Apr 2019 23:04:02 +0000 (01:04 +0200)]
Disable PACKAGE_* preprocessor symbols
Autoconf defines PACKAGE_* symbols:
- PACKAGE_NAME
- PACKAGE_VERSION
- PACKAGE_TARNAME
- PACKAGE_STRING
- PACKAGE_BUGREPORT
- PACKAGE_URL
and appends them to the generated config.h.in files. With AC_INIT change
via
afd52f9d9986d92dd0c63832a07ab1a16bf11d53 where package version, URL,
bug report location and similar meta data are defined, these
preprocessor macros are then non empty strings in the generated
configuration header file. When using phpize, PHP shares the config
files in extensions, warnings of redefined macros appear, such as:
- `warning: 'PACKAGE_NAME' macro redefined`
This patch now disables these non utilized symbols in the generated
config header files.
Better practice would be to include only API specific headers where
needed but this would require even more refactorings. Some extensions
such as pcre, pgsql, and pdo_pgsql solve this issue by undefining some
of these symbols before including the library configuration headers in
the code also. Because these symbols can be defined by any library which
uses Autotools.
Additionally, the unused PACKAGE_* symbols were cleaned for the bundled
libmbfl library and with this patch not needed undef code removed.
Peter Kokot [Sat, 13 Apr 2019 02:51:03 +0000 (04:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove PHP_READDIR_R_TYPE
Peter Kokot [Sat, 13 Apr 2019 02:45:28 +0000 (04:45 +0200)]
Remove PHP_READDIR_R_TYPE
The PHP_READDIR_R_TYPE m4 macro has been removed via
2b28f7189144a21e753dbc09efadd571121a82b9 .
HAVE_POSIX_READDIR_R in windows header file is also not needed anymore.
George Wang [Fri, 12 Apr 2019 21:48:39 +0000 (17:48 -0400)]
Merge branch 'PHP-7.4'
George Wang [Fri, 12 Apr 2019 21:48:22 +0000 (17:48 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
George Wang [Fri, 12 Apr 2019 21:44:32 +0000 (17:44 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Fri, 12 Apr 2019 21:43:45 +0000 (17:43 -0400)]
LiteSpeed SAPI 7.3, better process management, new API function litespeed_finish_request().
Nikita Popov [Fri, 12 Apr 2019 15:05:07 +0000 (17:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Apr 2019 15:04:44 +0000 (17:04 +0200)]
Try to fix windows build
noreturn attribute has to be on the declaration as well.
Nikita Popov [Fri, 12 Apr 2019 14:46:23 +0000 (16:46 +0200)]
Fix strict aliasing violation in phpdbg
By explicitly computing the message length from bytes. This also
makes sure that the length is interpreted in an endianness-independent
manner.
Nikita Popov [Fri, 12 Apr 2019 14:17:35 +0000 (16:17 +0200)]
Don't use php_strtok_r in build_tablename
This is unnecessary convoluted... we just want to find the position
of the dot. Using php_strtok_r requires a copy of the string, and the
implementation also relied on the specific semantics of the scratch
space that strtok_r uses.
Nikita Popov [Fri, 12 Apr 2019 14:03:01 +0000 (16:03 +0200)]
Fix uninit warning in gd.c
This matches the upstream implementation.
Nikita Popov [Fri, 12 Apr 2019 13:54:29 +0000 (15:54 +0200)]
Avoid uninit warning in ftp
Nikita Popov [Fri, 12 Apr 2019 13:12:47 +0000 (15:12 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Apr 2019 13:10:17 +0000 (15:10 +0200)]
Remove dubious memcmp optimization in iconv
This violates strict aliasing, and appears entirely unnecessary --
the compiler can optimize fixed size memcmp's by itself.
Nikita Popov [Fri, 12 Apr 2019 13:00:55 +0000 (15:00 +0200)]
Avoid uninit warnin in http_fopen_wrapper
This one looks semi-legit, in case php_stream_eof() returns false
but php_stream_get_line() fails. Not totally sure this cannot
happen, so rewriting to check both conditions at once.
Nikita Popov [Fri, 12 Apr 2019 12:56:21 +0000 (14:56 +0200)]
Avoid uninit warning in dtoa
This code is extremely convoluted, I have no idea whether or not
this one is legitimate. Suppressing with explicit initialization.
Nikita Popov [Fri, 12 Apr 2019 12:55:37 +0000 (14:55 +0200)]
Avoid misc uninitialized variable warnings
Nikita Popov [Fri, 12 Apr 2019 12:32:29 +0000 (14:32 +0200)]
Avoid uninitialized variable warnings in gmp
Nikita Popov [Fri, 12 Apr 2019 11:38:51 +0000 (13:38 +0200)]
Add test for get_cfg_var with array variable
And fix incorrect variable shadowing in add_config_entry(). However,
the test doesn't hit this case, as it requires a nested array. I'm
not sure if it's possible to produce nested arrays from ini?
Nikita Popov [Fri, 12 Apr 2019 11:18:23 +0000 (13:18 +0200)]
Avoid unitialized variable warning in soap
Extract envelope fetch into separate function, so the control
flow becomes more obvious.
Nikita Popov [Fri, 12 Apr 2019 13:10:17 +0000 (15:10 +0200)]
Remove dubious memcmp optimization in iconv
This violates strict aliasing, and appears entirely unnecessary --
the compiler can optimize fixed size memcmp's by itself.
Nikita Popov [Fri, 12 Apr 2019 13:00:55 +0000 (15:00 +0200)]
Avoid uninit warnin in http_fopen_wrapper
This one looks semi-legit, in case php_stream_eof() returns false
but php_stream_get_line() fails. Not totally sure this cannot
happen, so rewriting to check both conditions at once.
Nikita Popov [Fri, 12 Apr 2019 12:56:21 +0000 (14:56 +0200)]
Avoid uninit warning in dtoa
This code is extremely convoluted, I have no idea whether or not
this one is legitimate. Suppressing with explicit initialization.
Nikita Popov [Fri, 12 Apr 2019 12:55:37 +0000 (14:55 +0200)]
Avoid misc uninitialized variable warnings
Nikita Popov [Fri, 12 Apr 2019 12:32:29 +0000 (14:32 +0200)]
Avoid uninitialized variable warnings in gmp
Nikita Popov [Fri, 12 Apr 2019 11:38:51 +0000 (13:38 +0200)]
Add test for get_cfg_var with array variable
And fix incorrect variable shadowing in add_config_entry(). However,
the test doesn't hit this case, as it requires a nested array. I'm
not sure if it's possible to produce nested arrays from ini?
Nikita Popov [Fri, 12 Apr 2019 11:18:23 +0000 (13:18 +0200)]
Avoid unitialized variable warning in soap
Extract envelope fetch into separate function, so the control
flow becomes more obvious.
Christoph M. Becker [Fri, 12 Apr 2019 12:12:33 +0000 (14:12 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Include libpq-fs.h on Windows, too
Christoph M. Becker [Fri, 12 Apr 2019 12:12:08 +0000 (14:12 +0200)]
Include libpq-fs.h on Windows, too
That's more future proof than defining hard-coded macros.
Christoph M. Becker [Fri, 12 Apr 2019 11:09:11 +0000 (13:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tests wrt. internationalization
Christoph M. Becker [Fri, 12 Apr 2019 11:08:44 +0000 (13:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix tests wrt. internationalization
Christoph M. Becker [Fri, 12 Apr 2019 11:08:13 +0000 (13:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests wrt. internationalization
Christoph M. Becker [Fri, 12 Apr 2019 11:05:16 +0000 (13:05 +0200)]
Fix tests wrt. internationalization
Nikita Popov [Fri, 12 Apr 2019 10:51:42 +0000 (12:51 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Apr 2019 10:47:39 +0000 (12:47 +0200)]
Fix SOAP bailout handling
This code was reusing the _bailout variable from
SOAP_CLIENT_BEGIN/END_CODE(). As _bailout is not volatile, modifying
it after the setjmp call and then reading it back on return is
illegal. Use a separate local bailout variable instead.
This fixes the miscompile introduced by marking zend_bailout() as
noreturn.
Nikita Popov [Fri, 12 Apr 2019 10:09:09 +0000 (12:09 +0200)]
Enable -Wall on release builds for GCC
-Wall was already enabled for debug builds, enable it for release
builds as well.
Nikita Popov [Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)]
Merge branch 'PHP-7.4'