php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
115,813 Commits 549 Branches 1,487 Tags
375ceefec00df23c71bbc164e272ff41f68c91bc
Commit Graph

5209 Commits

Author SHA1 Message Date
Joe Watkins 22fb96ab85 Merge branch 'PHP-7.4' 
* PHP-7.4:
  implement support for workers in cli-server on platforms supporting fork
 2019-06-29 05:28:12 +02:00
Joe Watkins 82effb3fc7 implement support for workers in cli-server on platforms supporting fork 2019-06-29 05:27:35 +02:00
Nikita Popov 8f0729cb65 Merge branch 'PHP-7.4' 2019-06-28 17:47:45 +02:00
Nikita Popov 45ab57339e Use strcmp() in phpdbg_eol_global_update 
memcmp() only makes sense on equal length strings, and here we don't
know anything about the length of the input.
 2019-06-28 17:24:30 +02:00
Nikita Popov cf29c0f212 Remove phpdbg_xml_asprintf() 
Clang doesn't like the use of promoted zend_bool in va_start. As
the function isn't used anyway, I'm simply dropping it...
 2019-06-28 16:59:52 +02:00
Nikita Popov b98c148f78 Merge branch 'PHP-7.4' 2019-06-28 15:05:00 +02:00
Nikita Popov 54dd762f59 Set up asan+ubsan scheduled build on azure 
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.

I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
 2019-06-28 15:00:54 +02:00
Nikita Popov 0a0ca984f0 Merge branch 'PHP-7.4' 2019-06-28 14:48:08 +02:00
Nikita Popov 50cce5eb4f Avoid reliance on arena details on phpdbg oplog 
Instead of guessing what the address of the first arena allocation
is going to be, embed the sentinel in the oplog_list structure
directly.
 2019-06-28 14:47:42 +02:00
Joe Watkins b98cd0719a Merge branch 'PHP-7.4' 
* PHP-7.4:
  implement tsrm_is_shutdown API
 2019-06-28 10:27:39 +02:00
Joe Watkins 68485f8ab4 implement tsrm_is_shutdown API 2019-06-28 10:27:19 +02:00
Christoph M. Becker 0504f04591 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Use the portable zend_strndup() instead of strndup()
 2019-06-28 10:24:15 +02:00
Christoph M. Becker bc0db8ce45 Use the portable zend_strndup() instead of strndup() 2019-06-28 10:23:38 +02:00
Nikita Popov aa8d70f309 Merge branch 'PHP-7.4' 2019-06-28 09:19:49 +02:00
Nikita Popov 8c4d199851 Fix init_file leak in phpdbg 2019-06-28 09:17:26 +02:00
Nikita Popov 5918171f95 Merge branch 'PHP-7.4' 2019-06-27 14:21:49 +02:00
Nikita Popov c3132781ec Fix phpdbg shutdown order 
In particular, make sure that everything using zmm is released
before zmm is shut down. phpdbg currently gets away with this,
because either a) its custom handlers are used and no auto-free
happens or b) the system allocator is used and no auto-free happens.
With the tracking allocator for asan this no longer works.
 2019-06-27 14:20:51 +02:00
Nikita Popov 2149ed7072 Don't use zmm for PHPDBG_G(exec) 
Uses system allocator when backing up settings ... let's avoid
unnecessary confusion.
 2019-06-27 14:20:30 +02:00
Peter Kokot 6bfa6bff0b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Clean headers checks
 2019-06-27 02:45:31 +02:00
Peter Kokot 2079b09854 Clean headers checks 
Some headers were checked multiple times in the main configure.ac file
and in the bundled extensions or SAPIs themselves. Also many of these
checks are then used accross other extensions or SAPIs so a central
configure.ac makes most sense for these checks.
 2019-06-27 02:45:09 +02:00
Nikita Popov ac749b126f Merge branch 'PHP-7.4' 2019-06-26 11:43:30 +02:00
Nikita Popov 698dd32b03 Fix fpm limit_extensions leak 
The logic here is somewhat ugly because the worker pool structure
gets freed early, so we need to explicitly transfer ownership.
 2019-06-26 11:40:39 +02:00
Nikita Popov a1479fbbd9 Merge branch 'PHP-7.4' 2019-06-25 14:30:24 +02:00
Nikita Popov 42b22d3a94 Fix out of bounds write in phpdbg 
It seems that this code has a peculiar interpretation of "len",
where it actually points to the last character, not one past it.
So we need +1 here for that extra char and another +1 for the
terminating null byte.
 2019-06-25 14:28:58 +02:00
Christoph M. Becker 5120e4a133 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Split test case
 2019-06-24 14:08:30 +02:00
Christoph M. Becker 94df6dc3fd Split test case 
This test is failing on AppVeyor almost all of the time, so splitting
it seems appropriate.  This also allows us to rid php_cli_server_stop()
which was only used by this test case.
 2019-06-24 14:08:11 +02:00
Nikita Popov e4371ef158 Merge branch 'PHP-7.4' 2019-06-21 17:01:47 +02:00
Nikita Popov 152ccfb08d Fix stack leak in phpdbg 2019-06-21 17:01:25 +02:00
Nikita Popov a7bcfee9c9 Fix prompt leak in phpdbg 2019-06-21 17:01:18 +02:00
Joe Watkins 089e45c91a Merge branch 'PHP-7.4' 
* PHP-7.4:
  refactor a little more to add some more useful error messages and raise the limits on waiting for slow machines
 2019-06-19 11:42:02 +02:00
Joe Watkins eda5d8afcf refactor a little more to add some more useful error messages and raise the limits on waiting for slow machines 2019-06-19 11:41:24 +02:00
Joe Watkins 0cf3034af1 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Separate check for process creation and ability to accept connections
 2019-06-19 11:09:48 +02:00
Joe Watkins d6480fa231 Separate check for process creation and ability to accept connections 2019-06-19 11:09:26 +02:00
Nikita Popov 80e4a6aaef Merge branch 'PHP-7.4' 2019-06-17 13:31:11 +02:00
Freddie Leeman 482784284a Simplify pm.start_servers calculation in docs 
This makes it more obvious that this is just the average.
 2019-06-17 13:24:22 +02:00
Joe Watkins 7f0a52e07d Merge branch 'PHP-7.4' 
* PHP-7.4:
  bugs in fpm logging #4273 #4007
 2019-06-17 07:49:28 +02:00
Joe Watkins 116d42d990 bugs in fpm logging #4273 #4007 2019-06-17 07:48:37 +02:00
Joe Watkins 956db0cdc2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix mac tests on azure
 2019-06-14 12:58:13 +02:00
Joe Watkins dd10bf5450 Merge branch 'mac-tests' into PHP-7.4 
* mac-tests:
  fix mac tests on azure
 2019-06-14 12:56:08 +02:00
Joe Watkins f16b012116 fix mac tests on azure 2019-06-14 12:55:00 +02:00
Nikita Popov 646b64b119 Fix skipif syntax errors 
Apparently I did this only on masster...
 2019-06-14 09:29:14 +02:00
twosee 61f78de486 Constify some char* arguments or return values of ZEND_API 
Closes GH-4247.
 2019-06-12 16:49:32 +02:00
Nikita Popov eabb8a6324 Skip syntax errors in skipif conditions 2019-06-12 15:56:38 +02:00
Nikita Popov eea206a06c Merge branch 'PHP-7.4' 2019-06-12 13:18:04 +02:00
Nikita Popov 16f79129c7 Fix unused variables in fpm_env.c 2019-06-12 13:17:25 +02:00
Nikita Popov 9fa009c86d Merge branch 'PHP-7.4' 2019-06-12 09:29:06 +02:00
Nikita Popov 852ab5d83f Use %define api.pure instead of %pure-parser 
%pure-parser is deprecated. In our case there is no difference between
true & full, as we don't use locations.
 2019-06-12 09:26:34 +02:00
Nikita Popov e4fae9c061 Merge branch 'PHP-7.4' 2019-06-11 13:16:38 +02:00
Nikita Popov 89b2d88659 Register class before fetching parent 
We want the class declaration to be available while compiling the
parent class.
 2019-06-11 13:09:33 +02:00
Joe Watkins 8f93beb06e use XFAILIF rather than XFAIL to avoid warnings [ci skip] 2019-06-11 12:55:38 +02:00