Commit Graph

114111 Commits

Author SHA1 Message Date
Dmitry Stogov
0e5ecc7a8f Merge branch 'PHP-7.4'
* PHP-7.4:
  Delay EG(exception) check on slow path
2019-07-08 14:13:02 +03:00
Dmitry Stogov
9a833438d1 Delay EG(exception) check on slow path 2019-07-08 13:56:34 +03:00
Nikita Popov
78068171dd Merge branch 'PHP-7.4' 2019-07-08 12:53:50 +02:00
Nikita Popov
3ee570ae0d Remove redundant variable declaration 2019-07-08 12:50:00 +02:00
Scott Dutton
d90cdbd9df Deprecate passing invalid character to base_convert etc
RFC: https://wiki.php.net/rfc/base_convert_improvements
2019-07-08 12:49:21 +02:00
Peter Kokot
da54b1c20e Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove C89 checks for signal.h and strerror
2019-07-08 12:47:35 +02:00
Peter Kokot
550c2aa89b Remove C89 checks for signal.h and strerror
These are part of the C89 and on today's systems not needed to be
checked anymore. This removes symbols HAVE_SIGNAL and HAVE_STRERROR.

- http://port70.net/~nsz/c/c89/c89-draft.html
- locale.h is also part of C89 but will be removed per request in PHP 8
2019-07-08 12:46:51 +02:00
Peter Kokot
fa8a51f140 Merge branch 'PHP-7.4'
* PHP-7.4:
  Update libmagic patch
2019-07-08 12:41:15 +02:00
David Carlier
5e13688142 JIT: Reading php binary symbols list on FreeBSD
Closes GH-4363.
2019-07-08 12:39:18 +02:00
Peter Kokot
f002761e08 Update libmagic patch
This simplifies the libmagic patch:
- in upstream the HAVE_STRERROR check has been removed
- in upstream library the HAVE_SIGNAL_H has been removed
- indentations syncs with the upstream library
- some irrelevant changes removed from the patch (log comment), upstream
  has this correctly logged already so no need to patch the comment.

Closes GH-4298
2019-07-08 12:38:47 +02:00
Nikita Popov
0904dd3dc2 Remove INPUT_SESSION and INPUT_REQUEST
These were never supported and always generated a warning. Remove
them entirely for PHP 8.
2019-07-08 10:50:34 +02:00
Christoph M. Becker
8aa6d5a0ea Merge branch 'PHP-7.4'
* PHP-7.4:
  Implement FR #77230: Support custom CFLAGS and LDFLAGS from environment
2019-07-08 10:47:09 +02:00
Christoph M. Becker
338e1b245d Implement FR #77230: Support custom CFLAGS and LDFLAGS from environment
While it is already possible to *set* CFLAGS and LDFLAGS (actually all
variables) from the environment for `nmake` (by passing the `/E`
option), it is not possible to *add* any (C|LD)FLAGS, which can be
useful in some cases.  Instead of allowing this for `nmake`, we add
support for additional custom (C|LD)FLAGS to `configure`, similar to
how that works on Linux, so one could actually write:
````
set CFLAGS=foo & set LDFLAGS=bar & configure
````
This also allows us to use these flags during configure.
2019-07-08 10:46:51 +02:00
Christoph M. Becker
8e22d7c785 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix TsHashTable related race conditions
2019-07-08 10:32:39 +02:00
Christoph M. Becker
98b6330ab4 Fix TsHashTable related race conditions
Although TsHashTable and the according API are supposed to easily make
a HashTable thread-safe, they do not; for instance, there can be race
conditions between finding and updating entries.  We therefore avoid
the usage of TsHashTable in favor of a HashTable with our own mutex
management.

The patch has been provided by krakjoe@php.net; I only did some minor
fixes and tweaks.
2019-07-08 10:31:36 +02:00
Peter Kokot
4f5c6bc15e Merge branch 'PHP-7.4'
* PHP-7.4:
  Simplify PHP_CHECK_PDO_INCLUDES calls
2019-07-08 10:26:08 +02:00
Peter Kokot
a39ea91753 Simplify PHP_CHECK_PDO_INCLUDES calls
Conditional checks were once used for backwards compatibility with
phpize from PHP versions that didn't have this macro call yet.

Closes GH-4376
2019-07-08 10:24:41 +02:00
Dmitry Stogov
b8dae9981d Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed opcode description
2019-07-08 11:21:54 +03:00
Dmitry Stogov
1305d9c0d2 Fixed opcode description 2019-07-08 11:20:46 +03:00
Peter Kokot
c752b74665 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove some unused variables
2019-07-08 10:20:14 +02:00
Peter Kokot
5ba69ab3ad Remove some unused variables
- Variables php_abs_top_srcdir php_abs_top_builddir are no longer used.
- ZEND_EXT_TYPE is always zend_extension and variable is no longer used.

Closes GH-4378
2019-07-08 10:18:17 +02:00
Sara Golemon
17bfac6347 Merge branch 'PHP-7.4'
* PHP-7.4:
  Provide argon2i(d) password hashing from sodium when needed
2019-07-07 21:55:12 -04:00
Sara Golemon
0ba1db7a4a Provide argon2i(d) password hashing from sodium when needed 2019-07-07 21:53:43 -04:00
Stanislav Malyshev
27b6d36f98 Merge branch 'PHP-7.4'
* PHP-7.4:
  Simplify expression and remove the possibility of div by 0
2019-07-07 16:21:06 -07:00
Stanislav Malyshev
57e7c3aac1 Simplify expression and remove the possibility of div by 0
Maybe should use exp2() but not sure about how supported it is.
2019-07-07 16:16:05 -07:00
Peter Kokot
04f9a523eb Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove PHP_DEBUG_MACRO
2019-07-07 12:16:14 +02:00
Peter Kokot
3bde4838f4 Remove PHP_DEBUG_MACRO
The macro is no longer used. The warning at the end of the configure
script therefore is also no longer used.
2019-07-07 12:15:36 +02:00
Peter Kokot
35709b56e4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove some more Apache 1 left overs
2019-07-07 12:10:59 +02:00
Peter Kokot
49cc2a63b3 Remove some more Apache 1 left overs
- warning in configure.ac is relevant for the sapi/apache
- errors output redirected to /dev/null when checking Apache version
2019-07-07 12:09:19 +02:00
Nikita Popov
e89cbfc1c9 Merge branch 'PHP-7.4'
[ci skip]
2019-07-07 11:25:16 +02:00
Nikita Popov
7514b5d91c Mention that zend_parse_parameters should not be tested
Also mention that --CREDITS-- section should not be included
anymore. We should also change qa.php.net to stop advertising
these.

[ci skip]
2019-07-07 11:24:26 +02:00
Nikita Popov
8e948204f9 Disable jit on msan job
JIT code is not instrumented and as such incompatible with msan.
I'm not sure why this only started failing in the last build, it
shouldn't have worked before either...
2019-07-06 23:51:26 +02:00
Peter Kokot
0707caf163 Merge branch 'PHP-7.4'
* PHP-7.4:
  Move footer to the end of configure output
2019-07-06 04:55:42 +02:00
Peter Kokot
539b577827 Move footer to the end of configure output 2019-07-06 01:00:24 +02:00
Peter Kokot
b36b6c5fdf Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove PTHREADS_ASSIGN_VARS
2019-07-05 23:30:51 +02:00
Peter Kokot
1c9e8e8f6a Remove PTHREADS_ASSIGN_VARS
This simplifies TSRM build steps a bit and avoids doing unnecessary
steps:
- The `PTHREADS_CHECK_COMPILE` can called inside the for loops only
  since this is only where the `$pthreads_checked` variable is used.
- Assigning variables can be then done only in the configure.ac
  once.
- use `m4_include()` instead of the `sinclude()` in the middle of
  the build steps.
- The `$threads_result` variable is not used in the code or in
  extensions.
2019-07-05 23:26:20 +02:00
Nikita Popov
da8b583ac1 Always generate interrupt check in jit
Even if zend_interrupt_function is NULL, we still need to perform
the interrupt check for timeouts (which do not use
zend_interrupt_function).
2019-07-05 20:52:30 +02:00
Christoph M. Becker
705f8abcb7 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove superfluous assignment
2019-07-05 15:57:01 +02:00
Christoph M. Becker
30441e65dd Remove superfluous assignment 2019-07-05 15:56:26 +02:00
Dmitry Stogov
bfca9592d0 Merge branch 'PHP-7.4'
* PHP-7.4:
  Eliminate useless checks
2019-07-05 14:25:26 +03:00
Dmitry Stogov
55f7d3b70a Eliminate useless checks 2019-07-05 14:21:18 +03:00
Christoph M. Becker
2d926d994f Merge branch 'PHP-7.4'
* PHP-7.4:
  Temporarily skip test
2019-07-05 12:49:14 +02:00
Christoph M. Becker
4e5a717866 Temporarily skip test
This test hangs on Windows for ~10 minutes as of commit 30019f4, so we
temporarily skip it.  The issue will be investigated by Joe and myself
in due course.
2019-07-05 12:48:10 +02:00
Nikita Popov
526f2d681b Merge branch 'PHP-7.4' 2019-07-05 12:07:51 +02:00
Nikita Popov
201673d1a6 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-05 12:07:45 +02:00
Nikita Popov
e3c701ea38 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-05 12:07:10 +02:00
Nikita Popov
5846e85283 Backport fe_reset_rw case 2019-07-05 12:06:52 +02:00
Nikita Popov
a92e6d7136 Merge branch 'PHP-7.4' 2019-07-05 12:05:10 +02:00
Nikita Popov
73fd2da754 Make sure all cases of fetch_dim_w adjustment are handled
Use EMPTY_SWITCH_DEFAULT_CASE() to trigger an assertion in case
we miss something.

Add missing FE_RESET_RW case.
2019-07-05 12:02:26 +02:00
Nikita Popov
8ae9e1b9a2 Merge branch 'PHP-7.4' 2019-07-05 11:43:26 +02:00