From 883ebe9048e45dfd33d22ebda4f6f562932912ec Mon Sep 17 00:00:00 2001 From: andriokha <3338309+andriokha@users.noreply.github.com> Date: Thu, 10 Oct 2024 20:53:53 +0100 Subject: [PATCH] feat: pass X-Accel-* headers to client, fixes #6563 (#6564) [skip ci] Co-authored-by: Randy Fay --- .../webserver_config_assets/nginx-site-backdrop.conf | 6 ++++++ .../webserver_config_assets/nginx-site-craftcms.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-drupal.conf | 6 ++++++ .../webserver_config_assets/nginx-site-drupal10.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-drupal6.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-drupal7.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-drupal8.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-drupal9.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-laravel.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-magento.conf | 6 ++++++ .../webserver_config_assets/nginx-site-magento2.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-php.conf | 6 ++++++ .../webserver_config_assets/nginx-site-shopware6.conf | 6 ++++++ pkg/ddevapp/webserver_config_assets/nginx-site-typo3.conf | 6 ++++++ .../webserver_config_assets/nginx-site-wordpress.conf | 6 ++++++ .../nginx_second_docroot_example-site-php.conf | 6 ++++++ 16 files changed, 96 insertions(+) diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-backdrop.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-backdrop.conf index 647dc163179..1e462ac0bb3 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-backdrop.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-backdrop.conf @@ -55,6 +55,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-craftcms.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-craftcms.conf index cdae2a722ee..ef29c887124 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-craftcms.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-craftcms.conf @@ -60,6 +60,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Prevent clients from accessing hidden files (starting with a dot) diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal.conf index 464fa0f1fe1..9dec2721542 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal.conf @@ -54,6 +54,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal10.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal10.conf index cbff2880ed1..91e6e90e6e8 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal10.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal10.conf @@ -54,6 +54,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal6.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal6.conf index b9ddfe968aa..36b5b5de2cd 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal6.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal6.conf @@ -65,6 +65,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal7.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal7.conf index 88edf0ebe6a..dd1b970e0b7 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal7.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal7.conf @@ -58,6 +58,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal8.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal8.conf index fd61da9b21f..22869668646 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal8.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal8.conf @@ -53,6 +53,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal9.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal9.conf index 379e91ec636..e2cb92ea75d 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-drupal9.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-drupal9.conf @@ -53,6 +53,12 @@ server { # fastcgi_read_timeout should match max_execution_time in php.ini fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; fastcgi_param HTTPS $fcgi_https; } diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-laravel.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-laravel.conf index c3154a439fa..5db973fb647 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-laravel.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-laravel.conf @@ -49,6 +49,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-magento.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-magento.conf index 2dc680f7bb3..024ee0271e9 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-magento.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-magento.conf @@ -58,6 +58,12 @@ server { fastcgi_param HTTPS $fcgi_https; fastcgi_param MAGE_RUN_CODE $mage_run_code; fastcgi_param MAGE_RUN_TYPE $mage_run_type; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-magento2.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-magento2.conf index da1622ae4e6..65113897353 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-magento2.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-magento2.conf @@ -49,6 +49,12 @@ server { fastcgi_param HTTPS $fcgi_https; fastcgi_param MAGE_RUN_CODE $mage_run_code; fastcgi_param MAGE_RUN_TYPE $mage_run_type; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-php.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-php.conf index b56f9319cfa..d6edeeb76a0 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-php.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-php.conf @@ -50,6 +50,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Prevent clients from accessing hidden files (starting with a dot) diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-shopware6.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-shopware6.conf index 5709405be43..6b8294f7214 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-shopware6.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-shopware6.conf @@ -66,6 +66,12 @@ server { fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; http2_push_preload on; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-typo3.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-typo3.conf index be29b5c8487..24e50d7fd8a 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-typo3.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-typo3.conf @@ -83,6 +83,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx-site-wordpress.conf b/pkg/ddevapp/webserver_config_assets/nginx-site-wordpress.conf index 06f1309b297..ada1f614d2c 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx-site-wordpress.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx-site-wordpress.conf @@ -76,6 +76,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content diff --git a/pkg/ddevapp/webserver_config_assets/nginx_second_docroot_example-site-php.conf b/pkg/ddevapp/webserver_config_assets/nginx_second_docroot_example-site-php.conf index ffebb6b6432..dde097aff5a 100644 --- a/pkg/ddevapp/webserver_config_assets/nginx_second_docroot_example-site-php.conf +++ b/pkg/ddevapp/webserver_config_assets/nginx_second_docroot_example-site-php.conf @@ -53,6 +53,12 @@ server { fastcgi_read_timeout 10m; fastcgi_param SERVER_NAME $host; fastcgi_param HTTPS $fcgi_https; + # Pass the X-Accel-* headers to facilitate testing. + fastcgi_pass_header "X-Accel-Buffering"; + fastcgi_pass_header "X-Accel-Charset"; + fastcgi_pass_header "X-Accel-Expires"; + fastcgi_pass_header "X-Accel-Limit-Rate"; + fastcgi_pass_header "X-Accel-Redirect"; } # Expire rules for static content