From 74030c5c91c19e1f530ff97c3129b189f86a2666 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 19 Dec 2020 11:07:45 +0100 Subject: [PATCH] xdebug: set start_with_request to default --- CHANGELOG.md | 7 ++++++- Dockerfiles/base/data/php-ini.d/php-7.2.ini | 2 +- Dockerfiles/base/data/php-ini.d/php-7.3.ini | 2 +- Dockerfiles/base/data/php-ini.d/php-7.4.ini | 2 +- Dockerfiles/base/data/php-ini.d/php-8.0.ini | 2 +- Dockerfiles/base/data/php-ini.d/php-8.1.ini | 2 +- Dockerfiles/work/data/php-ini.d/php-7.2.ini | 2 +- Dockerfiles/work/data/php-ini.d/php-7.3.ini | 2 +- Dockerfiles/work/data/php-ini.d/php-7.4.ini | 2 +- Dockerfiles/work/data/php-ini.d/php-8.0.ini | 2 +- Dockerfiles/work/data/php-ini.d/php-8.1.ini | 2 +- build/ansible/group_vars/all/all-php-settings.yml | 4 ++-- 12 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c5fc4..31e4674 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,12 @@ #### Fixed - Fixex `redis` module compilation for PHP 8.1 -- Fixed PHP Xdebug v3 defaults +- Fixed PHP Xdebug v3 defaults to: + ```ini + xdebug.mode = Off + xdebug.start_with_request = default + xdebug.client_port = 9000 + ``` #### Changed - Removed `pdo_dblib` from PHP 8.1 due to errors diff --git a/Dockerfiles/base/data/php-ini.d/php-7.2.ini b/Dockerfiles/base/data/php-ini.d/php-7.2.ini index 17bf11d..e208660 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.2.ini @@ -44,5 +44,5 @@ html_errors = Off ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.3.ini b/Dockerfiles/base/data/php-ini.d/php-7.3.ini index 09b5d0b..dd8fc93 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.3.ini @@ -44,5 +44,5 @@ html_errors = Off ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-7.4.ini b/Dockerfiles/base/data/php-ini.d/php-7.4.ini index e498c09..f70aa0e 100644 --- a/Dockerfiles/base/data/php-ini.d/php-7.4.ini +++ b/Dockerfiles/base/data/php-ini.d/php-7.4.ini @@ -44,5 +44,5 @@ html_errors = Off ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-8.0.ini b/Dockerfiles/base/data/php-ini.d/php-8.0.ini index a08a216..eee6ba5 100644 --- a/Dockerfiles/base/data/php-ini.d/php-8.0.ini +++ b/Dockerfiles/base/data/php-ini.d/php-8.0.ini @@ -44,5 +44,5 @@ html_errors = Off ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/base/data/php-ini.d/php-8.1.ini b/Dockerfiles/base/data/php-ini.d/php-8.1.ini index 8be3a58..dc439ae 100644 --- a/Dockerfiles/base/data/php-ini.d/php-8.1.ini +++ b/Dockerfiles/base/data/php-ini.d/php-8.1.ini @@ -44,5 +44,5 @@ html_errors = Off ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.2.ini b/Dockerfiles/work/data/php-ini.d/php-7.2.ini index 2257b31..14a8e3f 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.2.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.2.ini @@ -44,5 +44,5 @@ html_errors = On ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.3.ini b/Dockerfiles/work/data/php-ini.d/php-7.3.ini index f8dac1b..edda098 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.3.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.3.ini @@ -44,5 +44,5 @@ html_errors = On ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-7.4.ini b/Dockerfiles/work/data/php-ini.d/php-7.4.ini index cc3d03a..7f3f75d 100644 --- a/Dockerfiles/work/data/php-ini.d/php-7.4.ini +++ b/Dockerfiles/work/data/php-ini.d/php-7.4.ini @@ -44,5 +44,5 @@ html_errors = On ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-8.0.ini b/Dockerfiles/work/data/php-ini.d/php-8.0.ini index 627dff4..2aeea6e 100644 --- a/Dockerfiles/work/data/php-ini.d/php-8.0.ini +++ b/Dockerfiles/work/data/php-ini.d/php-8.0.ini @@ -44,5 +44,5 @@ html_errors = On ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/Dockerfiles/work/data/php-ini.d/php-8.1.ini b/Dockerfiles/work/data/php-ini.d/php-8.1.ini index a083939..08952f7 100644 --- a/Dockerfiles/work/data/php-ini.d/php-8.1.ini +++ b/Dockerfiles/work/data/php-ini.d/php-8.1.ini @@ -44,5 +44,5 @@ html_errors = On ; Xdebug settings xdebug.mode = Off -xdebug.start_with_request = Off +xdebug.start_with_request = default xdebug.client_port = 9000 diff --git a/build/ansible/group_vars/all/all-php-settings.yml b/build/ansible/group_vars/all/all-php-settings.yml index 74d087a..6ebc10a 100644 --- a/build/ansible/group_vars/all/all-php-settings.yml +++ b/build/ansible/group_vars/all/all-php-settings.yml @@ -46,7 +46,7 @@ php_settings_ini: xdebug2_remote_autostart: 'Off' # Xdebug3 settings xdebug3_mode: 'Off' - xdebug3_start_with_request: 'Off' + xdebug3_start_with_request: 'default' xdebug3_client_port: '9000' # ---- Inherits from base ---- @@ -71,7 +71,7 @@ php_settings_ini: xdebug2_remote_autostart: 'Off' # Xdebug3 settings xdebug3_mode: 'Off' - xdebug3_start_with_request: 'Off' + xdebug3_start_with_request: 'default' xdebug3_client_port: '9000' # -------------------------------------------------------------------------------------------------