php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
110,311 Commits 545 Branches 1,479 Tags
3046e35718e4980a8cf7785fa6ecea51d02ebee8
Commit Graph

4897 Commits

Author SHA1 Message Date
George Wang
e981f5af51 Merge branch 'PHP-7.2' into PHP-7.3 2019-11-21 17:58:16 -05:00
George Wang
c7141412ce Added environment LSAPI_CLEAN_SHUTDOWN to control clean shutdown. Update SAPI version to LiteSpeed v7.6 . 2019-11-21 17:57:50 -05:00
Stanislav Malyshev
57b4dcbe77 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:19 -07:00
Stanislav Malyshev
4b5cdda0c7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:09 -07:00
Jakub Zelenka
ab061f95ca Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) 2019-10-20 22:50:04 -07:00
Sergei Turchanov
e546d721e8 Fix #78413: php-fpm request_terminate_timeout does not take effect after fastcgi_finish_request 
To retain legacy behavior I decided to add an option to control request
termination logic. If request_terminate_timeout_track_finished is set,
then request will be tracked for time limits even after
fastcgi_finish_request was called.

This patch depends on the fix provided in BUG 78469 (otherwise php-fpm
workers listening on named pipes on Windows will be erroneously terminated)
(PR #4636)
 2019-09-30 12:54:09 +02:00
Nikita Popov
3a2fa489dd Merge branch 'PHP-7.2' into PHP-7.3 2019-09-17 12:19:39 +02:00
Drakano
252ebce0d7 Add tilde to allowed status/ping path 
Because of user specific webdirs it should be possible to set a
status/ping path like "/~username/status".

Closes GH-4698.
 2019-09-17 12:19:21 +02:00
Tsuyoshi Sadakata
ffcf57fa18 Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation) 2019-08-26 18:05:11 +01:00
Nikita Popov
b59a9381b9 Remove test for bug #77185 
Seems to be very unreliable in CI.
 2019-07-22 12:40:26 +02:00
Nikita Popov
5e4dbce586 Reduce number of workers in test 
4 seems to be enough to reliably reproduce the issue. Let's see
if this works better in CI.
 2019-07-22 11:18:38 +02:00
Maksim Nikulin
bdf24f8d6d Prevent use after free in fpm_event_epoll_wait 
epoll event backend does not guarantee that child input/output events
are reported before SIGCHILD due to finished worker. While a bunch of
events received by epoll is being processed, child-related structures
may be removed before dispatching of an I/O event for the same child.
The result may be attempt to access to memory region allocated for
another purpose, segfault of the master process, and unavailable web
sites.

Postpone processing of SIGCHILD events till other events in the same
bunch are processed.

Fix Bug #62418 php-fpm master process crashes
Fix Bug #65398 Race condition between SIGCHLD and child stdout/stderr event leads to segfault
Fix Bug #75112 php-fpm crashing, hard to reproduce
Fix Bug #77114 php-fpm master segfaults in fpm_event_epoll_wait/fpm_event_fire
Fix Bug #77185 Use-after-free in FPM master event handling
 2019-07-22 10:32:58 +02:00
George Wang
82f35ab089 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-21 00:01:06 -04:00
George Wang
eb7e45f662 Checked in LiteSpeed SAPI 7.5, addressed two main problems in "clean shutdown" introduced in 7.4.3, 
1. falls in an infinite loop because PHP engine's inconsistent state, now override the ITIMER_PROF to 0.1 second, clean shutdown must finish before that.
2. generate too much error log, we completely disable "error_reporting" before calling php_request_shutdown().
 2019-07-20 23:59:43 -04:00
Nikita Popov
eea9d61763 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-16 11:10:51 +02:00
Nikita Popov
8a19fe29de Fixed bug #78297 2019-07-16 11:09:17 +02:00
George Wang
3ec8776940 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-04 12:04:08 -04:00
George Wang
32af676bd9 Updated to LiteSpeed SAPI V7.4.3 
Increased response header count limit from 100 to 1000.
Added crash handler to cleanly shutdown PHP request.
Added CloudLinux mod_lsapi mode
Fixed bug #76058
 2019-07-04 12:03:21 -04: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
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
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
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
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
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
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
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
Matteo Beccati
9f02f9fd5c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Ref #76801 remove old file source from file_sources hash in case of file included more than once
 2019-04-03 14:36:11 +02:00
Alessandro Chitolina
4029c0b6a2 Ref #76801 remove old file source from file_sources hash in case of file included more than once 2019-04-03 14:35:57 +02:00
Joe Watkins
62a652a0d5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix build: readline support must be disabled by default in phpdbg
 2019-03-28 07:35:15 +01:00
Joe Watkins
b7442f1bb8 fix build: readline support must be disabled by default in phpdbg 2019-03-28 07:34:45 +01:00
Joe Watkins
eb405a2192 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77805 phpdbg build fails when readline is shared
 2019-03-27 10:04:07 +01:00
Joe Watkins
7af270eb28 Fix #77805 phpdbg build fails when readline is shared 2019-03-27 10:02:42 +01:00
Joe Watkins
1e4cff9ddb Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  more work on phpdbg conditional breaks
 2019-03-27 00:02:31 +01:00
Joe Watkins
6d3a2b4693 more work on phpdbg conditional breaks 2019-03-27 00:02:15 +01:00
Joe Watkins
e177d26d0e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77800 phpdbg segfaults on conditional breakpoints
 2019-03-26 23:06:15 +01:00
Joe Watkins
7df8e4fc0a Fix #77800 phpdbg segfaults on conditional breakpoints 2019-03-26 23:05:06 +01:00
Peter Kokot
58e00df9fe Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  [ci skip] Update NEWS
  Fix #77794: Incorrect Date header format in built-in server
 2019-03-25 21:56:39 +01:00
Niklas Keller
7f9872387e Fix #77794: Incorrect Date header format in built-in server 
- Fix the date format to be compliant with https://tools.ietf.org/html/rfc7231#section-7.1.1.2
- Fix date format length and use GMT time
- Previously, local time was used instead of GMT.
- Remove extra whitespace
- Simplify string appends in php_cli_server.c
 2019-03-25 21:41:45 +01:00
Joe Watkins
93740a2482 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix bug #76801: phpdbg too many open files error
 2019-03-23 09:48:20 +01:00
Alessandro Chitolina
b8b880932e fix bug #76801: phpdbg too many open files error 2019-03-23 09:47:49 +01:00
Nikita Popov
20c261b2fe Merge branch 'PHP-7.2' into PHP-7.3 2019-03-19 09:55:42 +01:00