diff --git a/abra.sh b/abra.sh index e26e557..d3b53d1 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export PHP_UPLOADS_CONF_VERSION=v4 +export PHP_UPLOADS_CONF_VERSION=v5 export ENTRYPOINT_CONF_VERSION=v10 export ENTRYPOINT_MAILRELAY_CONF_VERSION=v2 export MSMTP_CONF_VERSION=v4 diff --git a/tests/test_templates.sh b/tests/test_templates.sh index 12e6a78..153f9f0 100755 --- a/tests/test_templates.sh +++ b/tests/test_templates.sh @@ -216,6 +216,10 @@ test_uploads_default() { echo " FAIL uploads default: expected 30 max_execution_time" return 1 fi + if ! echo "$output" | grep -q "session.upload_progress.enabled = Off"; then + echo " FAIL uploads default: expected session.upload_progress disabled" + return 1 + fi echo " PASS uploads default" } diff --git a/uploads.ini.tmpl b/uploads.ini.tmpl index 56fed73..35831d7 100644 --- a/uploads.ini.tmpl +++ b/uploads.ini.tmpl @@ -8,4 +8,6 @@ upload_max_filesize = {{ $upload_max_size }} post_max_size = {{ $upload_max_size }} memory_limit = {{ $upload_max_size }} max_execution_time = {{ $upload_max_time }} -max_input_time = {{ $upload_max_time }} \ No newline at end of file +max_input_time = {{ $upload_max_time }} + +session.upload_progress.enabled = Off