1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Commit Graph

108733 Commits

Author SHA1 Message Date
Sara Golemon 7f56150ef2 Merge branch 'PHP-7.3'
* PHP-7.3:
  Enforce ordering of property compare in object comparisons
2018-09-10 08:56:19 -04:00
Sara Golemon a26a107aae Enforce ordering of property compare in object comparisons 2018-09-10 08:47:50 -04:00
Dmitry Stogov 5d2894c8e7 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed wrong assertion
2018-09-10 15:27:48 +03:00
Dmitry Stogov 64dad57d19 Fixed wrong assertion 2018-09-10 15:26:38 +03:00
Anatol Belski c126061e4c Merge branch 'PHP-7.3'
* PHP-7.3:
  Skip test on unsuitable env
2018-09-10 09:51:58 +02:00
Anatol Belski 27b270de89 Skip test on unsuitable env 2018-09-10 09:51:36 +02:00
Stanislav Malyshev 1e550e6f7e Merge branch 'PHP-7.3'
* PHP-7.3:
  Update NEWS
  Fix for bug #76582
2018-09-09 12:29:41 -07:00
Stanislav Malyshev af38a991ff Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update NEWS
  Fix for bug #76582
2018-09-09 12:29:34 -07:00
Stanislav Malyshev 788717d56d Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update NEWS
  Fix for bug #76582
2018-09-09 12:29:29 -07:00
Stanislav Malyshev 6623f3caca Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Update NEWS
  Fix for bug #76582
2018-09-09 12:29:23 -07:00
Stanislav Malyshev 024f3ac160 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Update NEWS
  Fix for bug #76582
2018-09-09 12:27:44 -07:00
Stanislav Malyshev c1de84014d Update NEWS 2018-09-09 12:19:38 -07:00
Stanislav Malyshev 23b057742e 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.
2018-09-09 11:45:14 -07:00
Jakub Zelenka f4cf60c757 Merge branch 'PHP-7.3' 2018-09-09 19:00:37 +01:00
Jakub Zelenka 9eec7d06f6 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-09 18:59:47 +01:00
Jakub Zelenka 87a9536bda Merge branch 'PHP-7.1' into PHP-7.2 2018-09-09 18:58:23 +01:00
Jakub Zelenka be50a72715 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.
2018-09-09 18:53:55 +01:00
Anatol Belski d51af6462c Merge branch 'PHP-7.3'
* PHP-7.3:
  Make a copy unconditionally
2018-09-09 10:43:34 +02:00
Anatol Belski 68c34ce0dc Make a copy unconditionally 2018-09-09 10:42:53 +02:00
Anatol Belski 73ecad2f00 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix memory leak in pcre cache
2018-09-09 10:39:15 +02:00
Anatol Belski 9278be148e Fix memory leak in pcre cache 2018-09-09 10:38:36 +02:00
Peter Kokot 50b9ef8d94 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
2018-09-09 10:19:04 +02:00
Peter Kokot 77118fc925 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
2018-09-09 09:43:03 +02:00
Anatol Belski c92425dbab Merge branch 'PHP-7.3'
* PHP-7.3:
  Add test for bug #76850
2018-09-08 21:40:14 +02:00
Anatol Belski 4905d5e0df Add test for bug #76850 2018-09-08 21:39:54 +02:00
Anatol Belski 3de0ba7cbf Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed bug #76850 Exit code mangled by set locale/preg_match
2018-09-08 21:38:05 +02:00
Anatol Belski c6ddd45650 Fixed bug #76850 Exit code mangled by set locale/preg_match 2018-09-08 21:35:23 +02:00
Gabriel Caruso a303089ffe Remove empty PHP tags from test 2018-09-08 16:28:48 -03:00
Christoph M. Becker 5177db127d Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
2018-09-08 19:14:22 +02:00
Christoph M. Becker 58e2f5ead1 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
2018-09-08 19:13:26 +02:00
Christoph M. Becker fa70b91a4f Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
2018-09-08 19:09:56 +02:00
Christoph M. Becker 90d863898c 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.
2018-09-08 19:01:36 +02:00
Gabriel Caruso 5df49555a9 Fix PCRE2 exclusion and remove dead libs in Makefile.gcov 2018-09-08 10:04:10 -03:00
Christoph M. Becker 3145d6c6b9 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.
2018-09-08 13:57:01 +02:00
Gabriel Caruso 98b01a14e3 Use combined assignment contanation operator 2018-09-07 23:33:17 -03:00
Nikita Popov 1038c4b4ce Merge branch 'PHP-7.3' 2018-09-07 14:03:04 +02:00
Nikita Popov a32c563e50 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-07 14:02:51 +02:00
Nikita Popov cfdd828163 Fixed bug #76796 2018-09-07 14:02:03 +02:00
Nikita Popov 100733f86b Merge branch 'PHP-7.3' 2018-09-07 12:10:15 +02:00
David Carlier f7b573b4e9 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.
2018-09-07 12:10:05 +02:00
Peter Kokot b1f65fb25b Remove netware header
Netware system is discontinued and support has been removed from PHP
source code.
2018-09-06 05:20:37 +02:00
Anatol Belski aa82afe6a1 Merge branch 'PHP-7.3'
* PHP-7.3:
  Sync with recent changes to default libcurl build
2018-09-05 21:30:52 +02:00
Anatol Belski 6c376996cf Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Sync with recent changes to default libcurl build
2018-09-05 21:30:25 +02:00
Anatol Belski b323e1e8d0 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Sync with recent changes to default libcurl build
2018-09-05 21:29:53 +02:00
Anatol Belski 28c6125053 Sync with recent changes to default libcurl build
(cherry picked from commit a1ba3007a4)
2018-09-05 21:28:59 +02:00
Dmitry Stogov 25d43cab8c Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed support for commutative "user opcodes"
2018-09-05 22:11:36 +03:00
Dmitry Stogov 1d36c3361f Fixed support for commutative "user opcodes" 2018-09-05 22:11:10 +03:00
Anatol Belski a1ba3007a4 Sync with recent changes to default libcurl build 2018-09-05 17:40:25 +02:00
Fabien Villepinte ec110f1ecc Fix typos in UPGRADING.INTERNALS 2018-09-05 17:21:31 +02:00
Christoph M. Becker f94518dca1 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod
2018-09-05 15:11:09 +02:00