php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
113,214 Commits 547 Branches 1,481 Tags
3820296c42e146cc080bc24314ccdfdd700e743e
Commit Graph

5051 Commits

Author SHA1 Message Date
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