diff --git a/CHANGELOG.md b/CHANGELOG.md index 54d4256..82c5c07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Enabled `mod_expires` Apache module by default [lando/lando#976](https://github.com/lando/lando/issues/976) +* Fixed unclosed `` tag in `httpd.conf` * Updated `@lando/argv` to `1.2.0` * Updated `lodash` to `4.17.23` * Updated `lodash-es` to `4.17.23` diff --git a/config/httpd.conf b/config/httpd.conf index 3397b7c..c436726 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -113,7 +113,7 @@ LoadModule log_config_module modules/mod_log_config.so #LoadModule log_debug_module modules/mod_log_debug.so #LoadModule logio_module modules/mod_logio.so LoadModule env_module modules/mod_env.so -#LoadModule expires_module modules/mod_expires.so +LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so #LoadModule unique_id_module modules/mod_unique_id.so LoadModule setenvif_module modules/mod_setenvif.so @@ -518,3 +518,4 @@ IncludeOptional /opt/bitnami/apache/conf/vhosts/*.conf RequestHeader unset Proxy + diff --git a/examples/2.4/.htaccess b/examples/2.4/.htaccess new file mode 100644 index 0000000..a26e080 --- /dev/null +++ b/examples/2.4/.htaccess @@ -0,0 +1,8 @@ + + Header set X-Lando-Test "blazes" + + + + ExpiresActive On + ExpiresDefault "access plus 1 hour" + diff --git a/examples/2.4/README.md b/examples/2.4/README.md index 92a3203..37a621a 100644 --- a/examples/2.4/README.md +++ b/examples/2.4/README.md @@ -30,6 +30,12 @@ lando exec curl -- curl http://defaults | grep ROOTDIR # Should only serve over http by default lando exec curl -- curl https://defaults || echo $? | grep 7 + +# Should have mod_headers enabled and working +lando exec curl -- curl -sI http://defaults | grep -i "X-Lando-Test: blazes" + +# Should have mod_expires enabled and working +lando exec curl -- curl -sI http://defaults | grep -i "Expires:" ``` ## Destroy tests