1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

108708 Commits

Author SHA1 Message Date
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
Christoph M. Becker 21cd552e1e Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod
2018-09-05 15:10:27 +02:00
Christoph M. Becker 7a2c9585c4 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod
2018-09-05 15:07:59 +02:00
Christoph M. Becker c0a389a927 Fix #74454: Wrong exception being thrown when using ReflectionMethod
If zend_throw_exception_ex() already threw an exception, we should not
throw again.
2018-09-05 15:05:19 +02:00
Dmitry Stogov 8939c4d96b Get rid of ZEND_ACC_CTOR, ZEND_ACC_DTOR and ZEND_ACC_IMPLEMENTED_ABSTRACT 2018-09-05 13:16:10 +03:00
Peter Kokot 6c1ff61a36 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
2018-09-05 11:51:19 +02:00
Joe Watkins 3b1b0c589d Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix typos in UPGRADING.INTERNALS
2018-09-05 11:50:38 +02:00
Tyson Andre 86c930e268 Fix typos in UPGRADING.INTERNALS 2018-09-05 11:50:23 +02:00
Anatol Belski 836b8583c0 Merge branch 'PHP-7.3'
* PHP-7.3:
  Restore NEWS entry [skip ci]
2018-09-04 13:03:47 +02:00
Anatol Belski d903fc0861 Restore NEWS entry [skip ci] 2018-09-04 13:03:17 +02:00
Peter Kokot 472e7cded0 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.
2018-09-04 12:04:11 +02:00
Peter Kokot 29dc0470c8 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
2018-09-04 12:03:34 +02:00
Peter Kokot 6db3c105f2 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
2018-09-04 12:02:47 +02:00
Joe Watkins 4318a58023 Merge branch 'master' of git://github.com/php/php-src 2018-09-04 12:01:53 +02:00
Peter Kokot eff22dc511 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 6ed790685f 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
2018-09-04 12:01:24 +02:00
Xinchen Hui 48fd1d2ea1 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
2018-09-04 17:27:41 +08:00
Xinchen Hui dd3fb58e7c 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
2018-09-04 17:27:30 +08:00
Xinchen Hui 6078491720 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed bug #76825 (Undefined symbols ___cpuid_count)
2018-09-04 17:26:56 +08:00
Xinchen Hui 3497b75b73 Fixed bug #76825 (Undefined symbols ___cpuid_count) 2018-09-04 17:26:46 +08:00
Joe Watkins efbc05a5a8 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix bug #74764 and add a test case
2018-09-04 11:14:57 +02:00
Joe Watkins 6b5e7e6b42 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix bug #74764 and add a test case
2018-09-04 11:13:14 +02:00
Joe Watkins 21f8cd2a92 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix bug #74764 and add a test case
2018-09-04 11:12:39 +02:00
Ville Hukkamaki 0f724453c0 Fix bug #74764 and add a test case 2018-09-04 11:12:04 +02:00
Anatol Belski 59be8d52d4 Merge branch 'PHP-7.3'
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-09-04 11:03:56 +02:00
Anatol Belski 7585a20d44 [ci skip] Update NEWS 2018-09-04 11:03:33 +02:00
Anatol Belski b6e7aab5f2 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-09-04 11:03:01 +02:00