mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
114,101 Commits 500 Branches 1,381 Tags 796 MiB
0904dd3dc2
Commit Graph

114101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikita Popov
1086198711 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-05 11:41:57 +02:00
Nikita Popov
920283ff2b Merge branch 'PHP-7.2' into PHP-7.3 2019-07-05 11:40:45 +02:00
Nikita Popov
c353f17d42 Fix inference for compound object op on dim 2019-07-05 11:39:42 +02:00
Nikita Popov
57a385db09 Merge branch 'PHP-7.4' 2019-07-05 11:21:43 +02:00
Nikita Popov
ea86a9209c Optimize integer in_array with strict=true 
It doesn't make sense that using in_array with strict=false is
much faster for this case, due to lack of a specialized codepath.
 2019-07-05 11:20:29 +02:00
Dmitry Stogov
1f800e2f82 Removed die('skip wurstuoppe'); 2019-07-05 12:20:12 +03:00
Dmitry Stogov
1b5b8175af Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP
 2019-07-05 12:16:30 +03:00
Dmitry Stogov
48ca5a1e17 Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP 2019-07-05 12:03:25 +03:00
Nikita Popov
215e9d069c Merge branch 'PHP-7.4' 2019-07-05 11:00:54 +02:00
Nikita Popov
24ecfcc833 Add test 
Forgot to commit this.
 2019-07-05 11:00:27 +02:00