archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4' into PHP-8.0

Browse source
This commit is contained in:
Jakub Zelenka 2021-03-21 19:00:38 +00:00
commit 713b82131b
6 changed files with 213 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -9,6 +9,10 @@ PHP NEWS
. Fixed bug #80847 (CData structs with fields of type struct can't be passed
as C function argument). (Nickolas Daniel da Silva, Dmitry)
- FPM:
. Fixed bug #80024 (Duplication of info about inherited socket after pool
removing). (Jakub Zelenka)
- Opcache:
. Fixed bug #80839 (PHP problem with JIT). (Dmitry)
. Fixed bug #80861 (erronous array key overflow in 2D array with JIT).

28
sapi/fpm/fpm/fpm_sockets.c
View file

@ -39,6 +39,16 @@ static struct fpm_array_s sockets_list;
enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
static inline void fpm_sockets_get_env_name(char *envname, unsigned idx) /* {{{ */
{
if (!idx) {
strcpy(envname, "FPM_SOCKETS");
} else {
sprintf(envname, "FPM_SOCKETS_%d", idx);
}
}
/* }}} */
static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
{
unsigned i;
@ -82,13 +92,11 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
if (env_value) {
for (i = 0; i < socket_set_count; i++) {
if (!i) {
strcpy(envname, "FPM_SOCKETS");
} else {
sprintf(envname, "FPM_SOCKETS_%d", i);
}
fpm_sockets_get_env_name(envname, i);
setenv(envname, env_value + socket_set[i], 1);
}
fpm_sockets_get_env_name(envname, socket_set_count);
unsetenv(envname);
free(env_value);
}
@ -373,7 +381,7 @@ int fpm_sockets_init_main() /* {{{ */
{
unsigned i, lq_len;
struct fpm_worker_pool_s *wp;
char sockname[32];
char envname[32];
char sockpath[256];
char *inherited;
struct listening_socket_s *ls;
@ -384,12 +392,8 @@ int fpm_sockets_init_main() /* {{{ */
/* import inherited sockets */
for (i = 0; i < FPM_ENV_SOCKET_SET_MAX; i++) {
if (!i) {
strcpy(sockname, "FPM_SOCKETS");
} else {
sprintf(sockname, "FPM_SOCKETS_%d", i);
}
inherited = getenv(sockname);
fpm_sockets_get_env_name(envname, i);
inherited = getenv(envname);
if (!inherited) {
break;
}

7
sapi/fpm/tests/bug68391-conf-include-order.phpt
View file

@ -17,7 +17,7 @@ log_level = notice
include = {{INCLUDE:CONF}}
EOT;
$cfgPoolTemplate = <<<EOT
$cfg['poolTemplate'] = <<<EOT
[%name%]
listen = {{ADDR[%name%]}}
user = foo
@ -25,10 +25,7 @@ pm = ondemand
pm.max_children = 5
EOT;
$names = ['cccc', 'aaaa', 'eeee', 'dddd', 'bbbb'];
foreach($names as $name) {
$cfg[$name] = str_replace('%name%', $name, $cfgPoolTemplate);
}
$cfg['names'] = ['cccc', 'aaaa', 'eeee', 'dddd', 'bbbb'];
$tester = new FPM\Tester($cfg);
$tester->start();

49
sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt Normal file
View file

@ -0,0 +1,49 @@
--TEST--
FPM: bug80024 - Duplication of info about inherited socket after pool removing
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php
require_once "tester.inc";
$cfg['main'] = <<<EOT
[global]
error_log = {{FILE:LOG}}
pid = {{FILE:PID}}
include = {{INCLUDE:CONF}}
EOT;
$cfg['poolTemplate'] = <<<EOT
[pool_%index%]
listen = {{ADDR:UDS[pool_%index%]}}
pm = ondemand
pm.start_servers = 2
pm.min_spare_servers = 1
pm.max_spare_servers = 3
pm.max_children = 5
EOT;
$cfg['count'] = 129;
$tester = new FPM\Tester($cfg);
$tester->start();
$tester->expectLogStartNotices();
$cfg['count'] = 128;
$tester->reload($cfg);
$tester->expectLogReloadingNotices(129);
$tester->reload();
$tester->expectLogReloadingNotices(128);
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();
?>
Done
--EXPECT--
Done
--CLEAN--
<?php
require_once "tester.inc";
FPM\Tester::clean();
?>

39
sapi/fpm/tests/logtool.inc
View file

@ -9,6 +9,12 @@ class LogTool
const P_PREFIX_STDOUT = '\[pool unconfined\] child \d+ said into stdout: ';
const FINAL_SUFFIX = ', pipe is closed';
const DEBUG = 'DEBUG';
const NOTICE = 'NOTICE';
const WARNING = 'WARNING';
const ERROR = 'ERROR';
const ALERT = 'ALERT';
/**
* @var string
*/
@ -278,6 +284,28 @@ class LogTool
return true;
}
/**
* @param array $lines
* @return bool
*/
public function expectReloadingLines(array $lines)
{
if (
!$this->expectNotice($lines[0], 'Reloading in progress ...') ||
!$this->expectNotice($lines[1], 'reloading: .*')
) {
return false;
}
for ($i = 2; $i < count($lines) - 2; $i++) {
if (!$this->expectNotice($lines[$i], 'using inherited socket fd=\d+, "[^"]+"')) {
return false;
}
}
return $this->expectStartingLines(array_splice($lines, $i));
}
/**
* @param array $lines
* @return bool
@ -359,7 +387,7 @@ class LogTool
*/
public function expectDebug(string $line, string $expectedMessage, $pool = null)
{
return $this->expectEntry('DEBUG', $line, $expectedMessage, $pool);
return $this->expectEntry(self::DEBUG, $line, $expectedMessage, $pool);
}
/**
@ -370,7 +398,7 @@ class LogTool
*/
public function expectNotice(string $line, string $expectedMessage, $pool = null)
{
return $this->expectEntry('NOTICE', $line, $expectedMessage, $pool);
return $this->expectEntry(self::NOTICE, $line, $expectedMessage, $pool);
}
/**
@ -381,7 +409,7 @@ class LogTool
*/
public function expectWarning(string $line, string $expectedMessage, $pool = null)
{
return $this->expectEntry('WARNING', $line, $expectedMessage, $pool);
return $this->expectEntry(self::WARNING, $line, $expectedMessage, $pool);
}
/**
@ -392,7 +420,7 @@ class LogTool
*/
public function expectError(string $line, string $expectedMessage, $pool = null)
{
return $this->expectEntry('ERROR', $line, $expectedMessage, $pool);
return $this->expectEntry(self::ERROR, $line, $expectedMessage, $pool);
}
/**
@ -403,10 +431,9 @@ class LogTool
*/
public function expectAlert(string $line, string $expectedMessage, $pool = null)
{
return $this->expectEntry('ALERT', $line, $expectedMessage, $pool);
return $this->expectEntry(self::ALERT, $line, $expectedMessage, $pool);
}
/**
* @param string $msg
* @return bool

124
sapi/fpm/tests/tester.inc
View file

@ -72,7 +72,7 @@ class Tester
/**
* Configuration template
*
* @var string
* @var string|array
*/
private $configTemplate;
@ -152,7 +152,14 @@ class Tester
unlink($filePath);
}
}
// clean config files
self::cleanConfigFiles();
}
/**
* Clean config files
*/
static public function cleanConfigFiles() {
if (is_dir(self::CONF_DIR)) {
foreach(glob(self::CONF_DIR . '/*.conf') as $name) {
unlink($name);
@ -686,6 +693,12 @@ class Tester
}
}
if ($this->debug) {
foreach ($lines as $line) {
echo "LOG LINE: " . $line;
}
}
return $lines;
}
@ -731,6 +744,24 @@ class Tester
return getmygid();
}
/**
* Reload FPM by sending USR2 signal and optionally change config before that.
*
* @param string|array $configTemplate
* @return string
* @throws \Exception
*/
public function reload($configTemplate = null)
{
if (!is_null($configTemplate)) {
self::cleanConfigFiles();
$this->configTemplate = $configTemplate;
$this->createConfig();
}
return $this->signal('USR2');
}
/**
* Send signal to the supplied PID or the server PID.
*
@ -784,14 +815,13 @@ class Tester
throw new \Exception('The config template array has to have main config');
}
$mainTemplate = $configTemplates['main'];
unset($configTemplates['main']);
if (!is_dir(self::CONF_DIR)) {
mkdir(self::CONF_DIR);
}
foreach ($configTemplates as $name => $configTemplate) {
foreach ($this->createPoolConfigs($configTemplates) as $name => $poolConfig) {
$this->makeFile(
'conf',
$this->processTemplate($configTemplate),
$this->processTemplate($poolConfig),
self::CONF_DIR,
$name
);
@ -803,6 +833,36 @@ class Tester
return $this->makeFile($extension, $this->processTemplate($mainTemplate));
}
/**
* Create pool config templates.
*
* @param array $configTemplates
* @return array
* @throws \Exception
*/
private function createPoolConfigs(array $configTemplates)
{
if (!isset($configTemplates['poolTemplate'])) {
unset($configTemplates['main']);
return $configTemplates;
}
$poolTemplate = $configTemplates['poolTemplate'];
$configs = [];
if (isset($configTemplates['count'])) {
$start = $configTemplates['start'] ?? 1;
for ($i = $start; $i < $start + $configTemplates['count']; $i++) {
$configs[$i] = str_replace('%index%', $i, $poolTemplate);
}
} elseif (isset($configTemplates['names'])) {
foreach($configTemplates['names'] as $name) {
$configs[$name] = str_replace('%name%', $name, $poolTemplate);
}
} else {
throw new \Exception('The config template requires count or names if poolTemplate set');
}
return $configs;
}
/**
* Process template string.
*
@ -1110,6 +1170,16 @@ class Tester
$this->logTool->checkTruncatedMessage($this->response->getErrorData());
}
/**
* Expect reloading lines to be logged.
*
* @param int $socketCount
*/
public function expectLogReloadingNotices($socketCount = 1)
{
$this->logTool->expectReloadingLines($this->getLogLines($socketCount + 4));
}
/**
* Expect starting lines to be logged.
*/
@ -1176,16 +1246,36 @@ class Tester
return $this->logTool->checkWrappedMessage($logLines, false, true, $is_stderr);
}
/**
* Expect log entry.
*
* @param string $type The log type
* @param string $message The expected message
* @param string|null $pool The pool for pool prefixed log entry
* @param int $count The number of items
* @return bool
*/
private function expectLogEntry(string $type, string $message, $pool = null, $count = 1)
{
for ($i = 0; $i < $count; $i++) {
if (!$this->logTool->expectEntry($type, $this->getLastLogLine(), $message, $pool)) {
return false;
}
}
return true;
}
/**
* Expect a log debug message.
*
* @param string $message
* @param string|null $pool
* @param int $count
* @return bool
*/
public function expectLogDebug(string $message, $pool = null)
public function expectLogDebug(string $message, $pool = null, $count = 1)
{
return $this->logTool->expectDebug($this->getLastLogLine(), $message, $pool);
return $this->expectLogEntry(LogTool::DEBUG, $message, $pool, $count);
}
/**
@ -1193,11 +1283,12 @@ class Tester
*
* @param string $message
* @param string|null $pool
* @param int $count
* @return bool
*/
public function expectLogNotice(string $message, $pool = null)
public function expectLogNotice(string $message, $pool = null, $count = 1)
{
return $this->logTool->expectNotice($this->getLastLogLine(), $message, $pool);
return $this->expectLogEntry(LogTool::NOTICE, $message, $pool, $count);
}
/**
@ -1205,11 +1296,12 @@ class Tester
*
* @param string $message
* @param string|null $pool
* @param int $count
* @return bool
*/
public function expectLogWarning(string $message, $pool = null)
public function expectLogWarning(string $message, $pool = null, $count = 1)
{
return $this->logTool->expectWarning($this->getLastLogLine(), $message, $pool);
return $this->expectLogEntry(LogTool::WARNING, $message, $pool, $count);
}
/**
@ -1217,11 +1309,12 @@ class Tester
*
* @param string $message
* @param string|null $pool
* @param int $count
* @return bool
*/
public function expectLogError(string $message, $pool = null)
public function expectLogError(string $message, $pool = null, $count = 1)
{
return $this->logTool->expectError($this->getLastLogLine(), $message, $pool);
return $this->expectLogEntry(LogTool::ERROR, $message, $pool, $count);
}
/**
@ -1229,11 +1322,12 @@ class Tester
*
* @param string $message
* @param string|null $pool
* @param int $count
* @return bool
*/
public function expectLogAlert(string $message, $pool = null)
public function expectLogAlert(string $message, $pool = null, $count = 1)
{
return $this->logTool->expectAlert($this->getLastLogLine(), $message, $pool);
return $this->expectLogEntry(LogTool::ALERT, $message, $pool, $count);
}
/**