Skip to content

fix: disable Zend Signals and enable Zend Max Execution Timers for ZTS builds #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 21, 2023
Merged

fix: disable Zend Signals and enable Zend Max Execution Timers for ZTS builds #135

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9785286
fix: disable Zend Signals and enable Zend Max Execution Timers for ZT…
dunglas Aug 21, 2023
b62cccc
detect PHP 8.1+
dunglas Aug 21, 2023
9d8a185
fix
dunglas Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/SPC/builder/linux/LinuxBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,11 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void

SourcePatcher::patchBeforeConfigure($this);

$json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
$phpVersionID = $this->getPHPVersionID();

$json_74 = $phpVersionID < 80000 ? '--enable-json ' : '';
$maxExecutionTimers = $this->getOption('enable-zts', false) && $this->getPHPVersionID() > 81000 ? '--enable-zend-max-execution-timers ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';

shell()->cd(SOURCE_PATH . '/php-src')
->exec(
Expand All @@ -185,6 +188,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
'--enable-fpm ' .
$json_74 .
$zts .
$maxExecutionTimers .
'--enable-micro=all-static ' .
$this->makeExtensionArgs() . ' ' .
$envs
Expand Down
2 changes: 1 addition & 1 deletion src/SPC/builder/macos/MacOSBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
SourcePatcher::patchBeforeConfigure($this);

$json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts ' : '';
$zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';

shell()->cd(SOURCE_PATH . '/php-src')
->exec(
Expand Down