]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 10 Sep 2018 07:51:58 +0000 (09:51 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Skip test on unsuitable env
Anatol Belski [Mon, 10 Sep 2018 07:48:18 +0000 (09:48 +0200)]
Skip test on unsuitable env
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:41 +0000 (12:29 -0700)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:34 +0000 (12:29 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:29 +0000 (12:29 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:23 +0000 (12:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:27:44 +0000 (12:27 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:19:38 +0000 (12:19 -0700)]
Update NEWS
Stanislav Malyshev [Sun, 29 Jul 2018 05:16:29 +0000 (22:16 -0700)]
Fix for bug #76582
The brigade seems to end up in a messed up state if something fails
in shutdown, so we clean it up.
Jakub Zelenka [Sun, 9 Sep 2018 18:00:37 +0000 (19:00 +0100)]
Merge branch 'PHP-7.3'
Jakub Zelenka [Sun, 9 Sep 2018 17:59:47 +0000 (18:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 9 Sep 2018 17:58:23 +0000 (18:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 9 Sep 2018 17:53:37 +0000 (18:53 +0100)]
Fix ssl stream reneg limit test to print only after first renegotiation
It has been reported that in some setup the test does multiple
renegotiations which is allowed.
Anatol Belski [Sun, 9 Sep 2018 08:43:34 +0000 (10:43 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Make a copy unconditionally
Anatol Belski [Sun, 9 Sep 2018 08:42:53 +0000 (10:42 +0200)]
Make a copy unconditionally
Anatol Belski [Sun, 9 Sep 2018 08:39:15 +0000 (10:39 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix memory leak in pcre cache
Anatol Belski [Sun, 9 Sep 2018 08:38:36 +0000 (10:38 +0200)]
Fix memory leak in pcre cache
Peter Kokot [Wed, 5 Sep 2018 19:34:40 +0000 (21:34 +0200)]
Remove not needed checking for <errno.h>
Header `<errno.h>` is part of the standard C89 headers [1] and on
current systems checking is not need anymore since PHP requires at
least C89. This is noted also by Autoconf itself in the docs and
code [2].
The Autoconf check defined the `HAVE_ERRNO_H` symbol when building PHP
with sockets extension or fpm sapi. This symbol is not utilized across
the PHP source code except in the current version of bundled GD library
which has worked ok so far also with sockets extension or fpm sapi
disabled anyway.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Peter Kokot [Tue, 4 Sep 2018 22:09:56 +0000 (00:09 +0200)]
Remove HAVE_ASSERT_H
The `<assert.h>` header file is part of the standard C89 headers [1] and
on older systems there needed to be also a manual check if header is
present.
Since PHP requires at least C89 manual check and the `HAVE_ASSERT_H`
symbol defined by Autoconf in configure.ac can be both removed [2].
This patch also removes unused <assert.h> includes where c files don't
use the `assert()` macro.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Anatol Belski [Sat, 8 Sep 2018 19:40:14 +0000 (21:40 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Add test for bug #76850
Anatol Belski [Sat, 8 Sep 2018 19:39:54 +0000 (21:39 +0200)]
Add test for bug #76850
Anatol Belski [Sat, 8 Sep 2018 19:38:05 +0000 (21:38 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76850 Exit code mangled by set locale/preg_match
Anatol Belski [Sat, 8 Sep 2018 19:35:23 +0000 (21:35 +0200)]
Fixed bug #76850 Exit code mangled by set locale/preg_match
Gabriel Caruso [Sat, 8 Sep 2018 19:28:48 +0000 (16:28 -0300)]
Remove empty PHP tags from test
Christoph M. Becker [Sat, 8 Sep 2018 17:14:22 +0000 (19:14 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 17:12:14 +0000 (19:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 17:08:59 +0000 (19:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 16:27:57 +0000 (18:27 +0200)]
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Whenever we return with `PSFS_PASS_ON`, we need to update
`bytes_consumed` to not mislead the caller. Instead of fixing the
respective `if` clauses, we eschew the early bail-outs to simplify the
code a bit.
Gabriel Caruso [Fri, 7 Sep 2018 19:30:28 +0000 (16:30 -0300)]
Fix PCRE2 exclusion and remove dead libs in Makefile.gcov
Christoph M. Becker [Sat, 8 Sep 2018 11:57:01 +0000 (13:57 +0200)]
Report mem leaks to stderr if no Win debugger is present
Formerly, we sent output regarding memory leaks always to the debugger
on Windows, but this appears to be not useful especially for the PHPTs,
which usually are not run under a debugger, and so important info will
not be available there.
Gabriel Caruso [Sat, 8 Sep 2018 02:33:17 +0000 (23:33 -0300)]
Use combined assignment contanation operator
Nikita Popov [Fri, 7 Sep 2018 12:03:04 +0000 (14:03 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 7 Sep 2018 12:02:36 +0000 (14:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Sep 2018 12:02:03 +0000 (14:02 +0200)]
Fixed bug #76796
Nikita Popov [Fri, 7 Sep 2018 10:10:15 +0000 (12:10 +0200)]
Merge branch 'PHP-7.3'
David Carlier [Wed, 29 Aug 2018 20:04:32 +0000 (21:04 +0100)]
Support fixed address mmap without replacement
Reapply changes for Zend fixed mapping but only for FreeBSD.
Other BSD might expose some day a similar flag (private
for OpenBSD for the moment for example).
The Linux's part could be brought back but not before 7.4,
at this time, distributions with kernel > 4.17 will be
more widely available.
Peter Kokot [Wed, 5 Sep 2018 22:29:36 +0000 (00:29 +0200)]
Remove netware header
Netware system is discontinued and support has been removed from PHP
source code.
Anatol Belski [Wed, 5 Sep 2018 19:30:52 +0000 (21:30 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Sync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 19:30:25 +0000 (21:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 19:29:53 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 15:40:25 +0000 (17:40 +0200)]
Sync with recent changes to default libcurl build
(cherry picked from commit
a1ba3007a452fb2618526ed7159236362219a208 )
Dmitry Stogov [Wed, 5 Sep 2018 19:11:36 +0000 (22:11 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed support for commutative "user opcodes"
Dmitry Stogov [Wed, 5 Sep 2018 19:11:10 +0000 (22:11 +0300)]
Fixed support for commutative "user opcodes"
Anatol Belski [Wed, 5 Sep 2018 15:40:25 +0000 (17:40 +0200)]
Sync with recent changes to default libcurl build
Fabien Villepinte [Wed, 5 Sep 2018 15:14:03 +0000 (17:14 +0200)]
Fix typos in UPGRADING.INTERNALS
Christoph M. Becker [Wed, 5 Sep 2018 13:11:09 +0000 (15:11 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:10:27 +0000 (15:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:07:59 +0000 (15:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:05:19 +0000 (15:05 +0200)]
Fix #74454: Wrong exception being thrown when using ReflectionMethod
If zend_throw_exception_ex() already threw an exception, we should not
throw again.
Dmitry Stogov [Wed, 5 Sep 2018 10:16:10 +0000 (13:16 +0300)]
Get rid of ZEND_ACC_CTOR, ZEND_ACC_DTOR and ZEND_ACC_IMPLEMENTED_ABSTRACT
Peter Kokot [Wed, 5 Sep 2018 00:53:12 +0000 (02:53 +0200)]
Remove HAVE_STDDEF_H
The `<stddef.h>` header file is part of the standard C89 headers [1] and
on current systems there is no need for a manual check if header is
present.
Since PHP requires at least C89 the `HAVE_STDDEF_H` symbol isn't defined
by Autoconf anywhere else anymore [2] and accross the PHP source code
the header is included unconditionally already.
This patch syncs this also for the bundled libmbfl which is maintaned as
a fork in php-src.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Joe Watkins [Wed, 5 Sep 2018 09:50:38 +0000 (11:50 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix typos in UPGRADING.INTERNALS
Tyson Andre [Wed, 5 Sep 2018 00:35:51 +0000 (20:35 -0400)]
Fix typos in UPGRADING.INTERNALS
Anatol Belski [Tue, 4 Sep 2018 11:03:47 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Restore NEWS entry [skip ci]
Anatol Belski [Tue, 4 Sep 2018 11:03:17 +0000 (13:03 +0200)]
Restore NEWS entry [skip ci]
Peter Kokot [Thu, 23 Aug 2018 17:11:14 +0000 (19:11 +0200)]
Remove unused buildsystem files in TSRM
Buildsystem files in the TSRM folder used to provide standalone build of
the TSRM. Today these files are oudated and not used.
Peter Kokot [Sat, 1 Sep 2018 01:56:52 +0000 (03:56 +0200)]
Remove AC_FUNC_UTIME_NULL
Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems, including the AC_FUNC_UTIME_NULL.
This macro checks if `utime(file, NULL)` sets file's timestamp to the
current time and defines the `HAVE_UTIME_NULL` symbol. This check was
relevant on very old systems (for example, 4.3BSD released in 1986) and
today can be omitted for systems with utime since it should be well
supported by now. [2]
Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
Peter Kokot [Mon, 3 Sep 2018 19:35:01 +0000 (21:35 +0200)]
Remove AC_FUNC_MEMCMP
Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems anymore, including the `AC_FUNC_MEMCMP`.
On some old systems such as SunOS 4.1.3 (EOL in 2003) and NeXT x86
OpenStep (discontinued) the `memcmp` function wasn't present or it
didn't work properly. [2]
On current systems including at least Solaris 10+ this check is not
relevant anymore.
Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
Joe Watkins [Tue, 4 Sep 2018 10:01:53 +0000 (12:01 +0200)]
Merge branch 'master' of git://github.com/php/php-src
Peter Kokot [Mon, 3 Sep 2018 22:17:21 +0000 (00:17 +0200)]
Remove AC_HEADER_DIRENT
Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems anymore, including the `AC_HEADER_DIRENT`.
This macro checks which header defines the `DIR` type. If `<dirent.h>`
is available it defines the `HAVE_DIRENT_H` symbol. Since the `<dirent.h>`
header is already checked in the `configure.ac`, this check is not needed
anymore. This macro also additionally checks for SCO Xenix (discontinued,
latest release 1989) dir and x libraries. [2]
Commit
6ed790685f9ddae11834f36b0ba4fea58afc805a introduced also
`<sys/dir.h>`. This header exists from times of UNIX System V and
provided definition of DIR type on these systems such as 4.3BSD.
Today `<sys/dir.h>` is kept for backwards compatibility and includes
the `<dirent.h>` on current systems. With `dirent.h>` present this
include is no longer required.
Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
Remove unused dirent.h includes
Xinchen Hui [Tue, 4 Sep 2018 09:27:41 +0000 (17:27 +0800)]
Merge branch 'PHP-7.3' of git.php.net:/php-src into PHP-7.3
* 'PHP-7.3' of git.php.net:/php-src:
Fix bug #74764 and add a test case
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Xinchen Hui [Tue, 4 Sep 2018 09:27:30 +0000 (17:27 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix bug #74764 and add a test case
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Xinchen Hui [Tue, 4 Sep 2018 09:26:56 +0000 (17:26 +0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76825 (Undefined symbols ___cpuid_count)
Xinchen Hui [Tue, 4 Sep 2018 09:26:46 +0000 (17:26 +0800)]
Fixed bug #76825 (Undefined symbols ___cpuid_count)
Joe Watkins [Tue, 4 Sep 2018 09:13:41 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix bug #74764 and add a test case
Joe Watkins [Tue, 4 Sep 2018 09:12:57 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #74764 and add a test case
Joe Watkins [Tue, 4 Sep 2018 09:12:26 +0000 (11:12 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #74764 and add a test case
Ville Hukkamaki [Tue, 28 Aug 2018 21:26:13 +0000 (23:26 +0200)]
Fix bug #74764 and add a test case
Anatol Belski [Tue, 4 Sep 2018 09:03:56 +0000 (11:03 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:03:33 +0000 (11:03 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:03:01 +0000 (11:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:02:26 +0000 (11:02 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:01:57 +0000 (11:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:01:24 +0000 (11:01 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 08:57:47 +0000 (10:57 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
Anatol Belski [Tue, 4 Sep 2018 08:57:25 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
Anatol Belski [Tue, 4 Sep 2018 08:51:14 +0000 (10:51 +0200)]
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
It would probably be better to remove this test as it's too much
maintanance for a little gain.
Nikita Popov [Tue, 4 Sep 2018 06:09:22 +0000 (08:09 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 4 Sep 2018 06:08:39 +0000 (08:08 +0200)]
Fix incorrect literal freeing if pass_two generates fatal error
Nikita Popov [Tue, 4 Sep 2018 03:57:43 +0000 (05:57 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 4 Sep 2018 03:57:07 +0000 (05:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:49:02 +0000 (05:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:45:45 +0000 (05:45 +0200)]
Revert all MySQL auth related changes
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.
Revert "Fixed invalid free introduced by
d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)"
This reverts commit
11507c0e1bfa17a96480f3648397f6975c31551e .
Revert "Fix mysqlnd build without openssl"
This reverts commit
6c9db02ff7812c298d1e7e292ba731d9d3a66790 .
Revert "Fix VC compilation as variable size array is not supported"
This reverts commit
f96df64cb2219fda42ca875483f874cf3052647c .
Revert "Fix MySQL 8 auth"
This reverts commit
d6e81f0bfd0cb90586dd83d4fd47a4302605261a .
Nikita Popov [Tue, 4 Sep 2018 03:33:00 +0000 (05:33 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 4 Sep 2018 03:32:52 +0000 (05:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:32:42 +0000 (05:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:32:25 +0000 (05:32 +0200)]
Fix parenthesis warning
Peter Kokot [Wed, 13 Jun 2018 02:36:55 +0000 (04:36 +0200)]
Fix bug #75481: makedev warning
To use makedev the sys/sysmacros.h needs to be included on newer
systems.
Cherry-picked from PHP-7.3.
Nikita Popov [Tue, 4 Sep 2018 03:08:47 +0000 (05:08 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 4 Sep 2018 03:07:43 +0000 (05:07 +0200)]
Escape trigraph sequence
??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.
Nikita Popov [Tue, 4 Sep 2018 02:58:44 +0000 (04:58 +0200)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 4 Sep 2018 02:57:13 +0000 (04:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 02:55:15 +0000 (04:55 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ville Hukkamaki [Fri, 24 Aug 2018 20:49:53 +0000 (22:49 +0200)]
Fixed bug #73457
Correctly report errors when opening FTP data connection.
Dmitry Stogov [Mon, 3 Sep 2018 22:19:07 +0000 (01:19 +0300)]
Keep collision list ordered from higher to lower buckets.
Tiffany [Sun, 2 Sep 2018 19:48:41 +0000 (14:48 -0500)]
Update grammar and clarify wording in couple places
On line 512, I clarified the sentence which uses effect, previously the sentence was awkward.
On line 656, the wrong word is used, I changed affect to effect.
Anatol Belski [Mon, 3 Sep 2018 13:11:45 +0000 (15:11 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:11:10 +0000 (15:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:10:25 +0000 (15:10 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:09:23 +0000 (15:09 +0200)]
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS