mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
114,048 Commits 500 Branches 1,381 Tags 798 MiB
dfce767a62
Commit Graph

5117 Commits

Author SHA1 Message Date
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
Joe Watkins
9ecc0a4f29
use XFAILIF rather than XFAIL to avoid warnings [ci skip] 2019-06-11 12:55:28 +02:00
Joe Watkins
7361701351
Merge branch 'PHP-7.4' 
* PHP-7.4:
  watchpoints have flaws in implementation
 2019-06-10 14:23:55 +02:00
Joe Watkins
1e5004060e
watchpoints have flaws in implementation 2019-06-10 14:23:37 +02:00
Peter Kokot
76323fefac Merge branch 'PHP-7.4' 
* PHP-7.4:
  Extend wildcard files section in EditorConfig [ci skip]
  Simplify LiteSpeed SAPI module version
  Use PHP_VERSION for zend modules
 2019-06-09 22:55:43 +02:00
Peter Kokot
2dd6ec07d1 Simplify LiteSpeed SAPI module version 
This patch syncs versioning of the LiteSpeed SAPI module by making it in
sync with the rest of the bundled PHP extensions and SAPIs.

Closes #4145
 2019-06-09 22:32:47 +02:00
Peter Kokot
5b36c9fef6 Use PHP_VERSION for zend modules 
Closes #4147
 2019-06-09 22:32:47 +02:00
Nikita Popov
d154301866 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:27:57 +02:00
Nikita Popov
a3e6b50442 Fixed bug #78050 
This is a backport of a982125561.
 2019-06-04 16:26:34 +02:00
Nikita Popov
623eedbbd5 Merge branch 'PHP-7.4' 2019-06-04 16:14:46 +02:00
Nikita Popov
18060e5923 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-04 16:14:26 +02:00
Nikita Popov
a4633b13d4 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:14:14 +02:00
Nikita Popov
2d3bc71e89 Reload tsrmls_id in release builds as well 
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
 2019-06-04 16:12:59 +02:00
Nikita Popov
f721f2fa12 Merge branch 'PHP-7.4' 2019-06-04 15:09:01 +02:00
Nikita Popov
a982125561 Try to fix phpdbg + opcache compatibility 2019-06-04 15:08:55 +02:00
Anatol Belski
09ac6eb36d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Don't involve output check in the test
 2019-06-01 23:33:00 +02:00
Anatol Belski
7a64150921 Don't involve output check in the test 2019-06-01 23:31:05 +02:00
Christoph M. Becker
e720fb7565 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix ZTS issue regarding new Windows CTRL handling API
 2019-06-01 09:36:25 +02:00
Christoph M. Becker
637d8677b3 Fix ZTS issue regarding new Windows CTRL handling API 
php_win32_signal_system_ctrl_handler() is called from a kernel thread,
so the former initialization of `vm_interrupt_flag` has no effect,
since it is defined as thread-local.  This is, however, not necessary,
since the CTRL signal handling is supposed to work only for the main
thread anyway.  We therefore change `vm_interrupt_flag` and the related
variables to true globals.

This also allows us to unmark the respective test case as XFAIL.

Furthermore, `vm_interrupt_flag` is declared as `zend_bool *`, so we
better treat it such.
 2019-06-01 09:35:47 +02:00
Nikita Popov
8230d27c98 Merge branch 'PHP-7.4' 2019-05-31 10:54:58 +02:00
Nikita Popov
96a11bee1c Add CONFLCITS file for fpm 
We should not run FPM tests in parallel due to port clashes.
 2019-05-31 10:54:41 +02:00
Nikita Popov
4fff40e0d2 Merge branch 'PHP-7.4' 2019-05-31 09:18:09 +02:00
Nikita Popov
4b1f711823 Mark sapi_windows_set_ctrl_handler.phpt as XFAIL 2019-05-31 09:17:51 +02:00
Nikita Popov
4241258d74 Fix FPM tests for PHP 8 2019-05-29 17:31:10 +02:00
Nikita Popov
693955c5c5 Merge branch 'PHP-7.4' 2019-05-29 17:07:52 +02:00
Nikita Popov
3ba64545ed Update phpdbg oplog test 2019-05-29 17:05:01 +02:00
Nikita Popov
b32b8e91bd Update cli reflection test 2019-05-29 17:02:36 +02:00
Nikita Popov
43be89ed87 Remove two zpp tests in sapi/cli/tests 
These fail on master -- apparently we're not running these tests...
 2019-05-29 17:00:12 +02:00
Joe Watkins
3518c4dfe9
Merge branch 'PHP-7.4' 
* PHP-7.4:
  Revert "Rename *.l files to *.re"
 2019-05-20 06:07:03 +02:00
Joe Watkins
e11233dc49
Revert "Rename *.l files to *.re" 
This reverts commit 969047749d.
 2019-05-20 06:06:38 +02:00
Peter Kokot
0a7d71b593 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Rename *.l files to *.re
 2019-05-17 23:54:12 +02:00
Peter Kokot
969047749d Rename *.l files to *.re 
This syncs PHP lexer files to all use *.re extension. The *.re files are
processed with the RE2C tool.
 2019-05-17 23:53:03 +02:00
Peter Kokot
6ca8e06f82 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update UPGRADING about LiteSpeed
  Rename configure --with-litespeed to --enable-litespeed
 2019-05-17 03:18:13 +02:00
Peter Kokot
8e456d3b9e Rename configure --with-litespeed to --enable-litespeed 
This syncs the configuration option of the litespeed module to be
compliant with the approach of:
--with-foo (when something additional needs to be installed such as
  libfoo)
--enable-foo (when extension/sapi doesn't have dependencies on some
  library)
 2019-05-17 03:14:13 +02:00
Jakub Zelenka
e75aa7ed21 Merge branch 'PHP-7.4' 2019-05-13 18:52:17 +01:00
Jakub Zelenka
5036c293b3 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-13 18:51:41 +01:00
Jakub Zelenka
aa74c30466 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-13 18:51:05 +01:00
Jakub Zelenka
ad63bd169b Add ping to the fpm test for bug #77934 2019-05-13 18:50:24 +01:00
Peter Kokot
406437eadb Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Remove outdated fastcgi info in favor of the manual
 2019-05-13 02:58:52 +02:00
Peter Kokot
ecb6a8db63 [ci skip] Remove outdated fastcgi info in favor of the manual 2019-05-13 02:57:20 +02:00
Peter Kokot
2cf90bb2f0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Normalize comments in *nix build system m4 files
 2019-05-12 18:51:50 +02:00
Peter Kokot
75fb74860d Normalize comments in *nix build system m4 files 
Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
  favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now
 2019-05-12 18:43:03 +02:00
Peter Kokot
628806c382 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the systemd library
 2019-05-12 00:19:20 +02:00
Hugh McMaster
755f6f6ede Use PKG_CHECK_MODULES to detect the systemd library 2019-05-12 00:19:03 +02:00
Jakub Zelenka
4b2239b52b Merge branch 'PHP-7.4' 2019-05-11 20:10:43 +01:00
Jakub Zelenka
4bf37e467b Merge branch 'PHP-7.3' into PHP-7.4 2019-05-11 20:10:13 +01:00
Jakub Zelenka
0cad701374 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-11 20:08:57 +01:00
Jakub Zelenka
cc5c51e7f0 Fix bug #77934 (php-fpm kill -USR2 not working) 2019-05-11 20:07:39 +01:00
Peter Kokot
a3c88135d4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused variables
 2019-05-10 22:58:29 +02:00
Peter Kokot
313930a36a Remove unused variables 2019-05-10 22:58:14 +02:00
George Wang
487ffb45d2 Merge branch 'PHP-7.4' 2019-05-09 18:16:09 -04:00
George Wang
dc63b0e480 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-09 18:15:48 -04:00
George Wang
d2037b1bd4 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-09 18:14:11 -04:00
George Wang
af4143753f Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K. 2019-05-09 18:13:25 -04:00
Kalle Sommer Nielsen
c265652879 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Include the request method in CLI server logs
 2019-05-02 23:32:43 +03:00
Simon Welsh
6e3438bc62 Include the request method in CLI server logs 2019-05-02 23:32:22 +03:00
Nikita Popov
0d8eb57980 Merge branch 'PHP-7.4' 2019-04-29 14:18:07 +02:00
Hugh McMaster
c9ee822bb6 Always use pkg-config from the host architecture 2019-04-29 14:16:16 +02:00
Peter Kokot
8f71468ea0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Remove outdated and redundant Apache README
 2019-04-28 02:30:20 +02:00
Peter Kokot
807901072d [ci skip] Remove outdated and redundant Apache README 
PHP manual includes more information and a bit more updated than this
README.
 2019-04-28 02:29:08 +02:00
Peter Kokot
bedfb33dfb Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Remove CLI sapi README
 2019-04-23 08:52:30 +02:00
Peter Kokot
9443bd1bbf [ci skip] Remove CLI sapi README 
Removing in favour of:
- https://www.php.net/manual/en/features.commandline.introduction.php
- https://www.php.net/manual/en/features.commandline.differences.php
 2019-04-23 08:51:23 +02:00
George Wang
39a249d12a Merge branch 'PHP-7.4' 2019-04-21 16:00:07 -04:00
George Wang
bd86ae4b8a Merge branch 'PHP-7.3' into PHP-7.4 2019-04-21 15:59:49 -04:00
George Wang
fb4c811835 Merge branch 'PHP-7.2' into PHP-7.3 2019-04-21 15:59:07 -04:00
George Wang
ce73841cdc Improved LSAPI_End_Response_r() . 2019-04-21 15:04:54 -04:00
George Wang
ccf051c317 Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now. 2019-04-21 14:59:51 -04:00
Peter Kokot
cbca8a8df4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  [ci skip] Fix CS in Markdown files
 2019-04-21 15:39:22 +02:00
Peter Kokot
1c94aac89e [ci skip] Fix CS in Markdown files 
Checked and quickfixed with Markdown linter
- 80 columns line width (~)
- code highlighting
- ...

Some most obvious outdated content updated a bit more.
 2019-04-21 15:33:20 +02:00
Peter Kokot
2cf6187b77 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update changelog
  Update changelog
  Fix #77921: static.php.net doesn't work anymore
 2019-04-20 19:13:35 +02:00
Peter Kokot
2e8819549b Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update changelog
  Update changelog
  Fix #77921: static.php.net doesn't work anymore
 2019-04-20 19:13:21 +02:00
Peter Kokot
2549f7d220 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update changelog
  Fix #77921: static.php.net doesn't work anymore
 2019-04-20 19:12:31 +02:00
Peter Kokot
4450288344 Fix #77921: static.php.net doesn't work anymore 
This embeds the PHP logo image in the FPM status HTML page instead of
using remote location. The phpinfo() output also uses such approach
and browser compatibility looks decent [1].

1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
 2019-04-20 19:00:51 +02:00
Nikita Popov
dc42e403a2 Merge branch 'PHP-7.4' 2019-04-15 11:42:55 +02:00
Nikita Popov
7f6c22cb3d Fix last maybe uninit warnings on 7.4 
Most of these only occur under GCC 5. Not fond of all the workarounds
(especially the PDO one), but it gets us a clean build...
 2019-04-15 11:35:13 +02:00
George Wang
5fe7b805ba Merge branch 'PHP-7.4' 2019-04-12 17:48:39 -04:00
George Wang
f0f1388d60 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-12 17:48:22 -04:00
George Wang
7f551c728c Merge branch 'PHP-7.2' into PHP-7.3 2019-04-12 17:44:32 -04:00
George Wang
1e7f1b90e8 LiteSpeed SAPI 7.3, better process management, new API function litespeed_finish_request(). 2019-04-12 17:43:45 -04:00
Nikita Popov
f2fd51cb80 Merge branch 'PHP-7.4' 2019-04-12 17:05:07 +02:00
Nikita Popov
3c23084cf6 Fix strict aliasing violation in phpdbg 
By explicitly computing the message length from bytes. This also
makes sure that the length is interpreted in an endianness-independent
manner.
 2019-04-12 16:46:23 +02:00
Nikita Popov
785f034e41 Merge branch 'PHP-7.4' 2019-04-12 12:04:11 +02:00
Nikita Popov
c09b63595e Fix potentially uninitialized warnings in phpdbg 2019-04-12 11:46:03 +02:00
Dmitry Stogov
55cc280429 Backported call frame initialization improvement 2019-04-12 02:35:42 +03:00
Nikita Popov
79d1d88e06 Merge branch 'PHP-7.4' 2019-04-11 17:44:38 +02:00
Nikita Popov
09b2e20333 Work around -Walloc-size-larger-than bug 2019-04-11 17:44:20 +02:00
Nikita Popov
76f0ad3ade Merge branch 'PHP-7.4' 2019-04-11 12:23:03 +02:00
Nikita Popov
d087a356fe Suppress warnings using zend_quiet_write 2019-04-11 12:22:52 +02:00
Dmitry Stogov
cc900edd77 Simplify call frame initialization 2019-04-11 02:08:32 +03:00
David Carlier
914b27acb7 Fix few compiler warnings. 2019-04-08 00:00:09 +02:00
Peter Kokot
36d2ac01d1 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add AS_HELP_STRING to phpdbg options
 2019-04-07 23:24:25 +02:00
Peter Kokot
6acba73876 Add AS_HELP_STRING to phpdbg options 2019-04-07 23:24:10 +02:00
Peter Kokot
e6f86fb17c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove checks for locale.h, setlocale, localeconv
 2019-04-07 18:34:02 +02:00