Merge branch 'heroku:main' into main

CHANGELOG.md

@@ -3,6 +3,22 @@
 ## [Unreleased]
 
 
+## [v254] - 2024-07-05
+
+### ADD
+
+- PHP/8.2.21 [David Zuelke]
+- PHP/8.3.9 [David Zuelke]
+- ext-newrelic/10.22.0.12 [David Zuelke]
+- ext-blackfire/1.92.18 [David Zuelke]
+
+### CHG
+
+- Sync Nginx `mime.types` config with upstream to add `application/wasm` for `.wasm` and `image/avif` for `.avif` files (#738) [David Zuelke]
+- Add MIME type `text/javascript` for `.mjs` files to Nginx config as per RFC 9239; `application/javascript` remains for `.js` from upstream default `mime.types` (#737) [David Zuelke]
+- Apache/2.4.61 [David Zuelke]
+- Blackfire/2.28.7 [David Zuelke]
+
 ## [v253] - 2024-06-13
 
 ### ADD
@@ -2688,7 +2704,8 @@
 
 - Auto-set and follow (but not enable, for now) the FPM slowlog [David Zuelke]
 
-[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v253...main
+[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v254...main
+[v254]: https://github.com/heroku/heroku-buildpack-php/compare/v253...v254
 [v253]: https://github.com/heroku/heroku-buildpack-php/compare/v252...v253
 [v252]: https://github.com/heroku/heroku-buildpack-php/compare/v251...v252
 [v251]: https://github.com/heroku/heroku-buildpack-php/compare/v250...v251

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/heroku/hatchet.git
-  revision: 0de04fcc3c2125efb07060445e058b643de99d49
+  revision: 69e268f694acd5876ff47810bdbd8467b35f8249
   branch: timeouts-etc
   specs:
-    heroku_hatchet (8.0.2)
+    heroku_hatchet (8.0.4)
       excon (~> 0)
       platform-api (~> 3)
       rrrretry (~> 1)
@@ -14,21 +14,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
+    base64 (0.2.0)
     diff-lcs (1.5.1)
     erubis (2.7.0)
-    excon (0.109.0)
-    heroics (0.1.2)
+    excon (0.110.0)
+    heroics (0.1.3)
+      base64
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
       webrick
     moneta (1.0.0)
     multi_json (1.15.0)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parallel_tests (4.7.1)
       parallel
-    platform-api (3.6.0)
+    platform-api (3.7.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
@@ -37,7 +39,7 @@ GEM
     rrrretry (1.0.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-retry (0.6.2)

bin/compile

@@ -250,7 +250,7 @@ fi
 mkdir -p $build_dir/.heroku/php-min
 ln -s $build_dir/.heroku/php-min /app/.heroku/php-min
 
-curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.3.8.tar.gz" || {
+curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.3.9.tar.gz" || {
 	mcount "failures.bootstrap.download.php-min"
 	error <<-EOF
 		Failed to download minimal PHP for bootstrapping!

conf/nginx/heroku.conf.php

@@ -1,5 +1,6 @@
 http {
 	include       mime.types;
+	include       heroku.types;
 	default_type  application/octet-stream;
 
 	#log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '

conf/nginx/heroku.types

@@ -0,0 +1,9 @@
+# this file is separate from mime.types to allow easier syncing with upstream
+types {
+	# mime.types still defines "application/javascript" for "js"
+	# We only define "mjs" here to avoid duplicate extension warnings on startup.
+	# In compliance with RFC 9239, we are using "text/javascript" for "mjs"
+	# If and when upsteam ever update their default config, we can drop this.
+	# Also see https://trac.nginx.org/nginx/ticket/2216
+	text/javascript mjs;
+}

conf/nginx/mime.types

@@ -15,6 +15,7 @@ types {
     text/vnd.wap.wml                                 wml;
     text/x-component                                 htc;
 
+    image/avif                                       avif;
     image/png                                        png;
     image/svg+xml                                    svg svgz;
     image/tiff                                       tif tiff;
@@ -51,6 +52,7 @@ types {
     application/vnd.openxmlformats-officedocument.wordprocessingml.document
                                                      docx;
     application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
     application/x-7z-compressed                      7z;
     application/x-cocoa                              cco;
     application/x-java-archive-diff                  jardiff;

support/devcenter/changelog.twig

@@ -28,7 +28,7 @@ The following new [Composer versions](https://devcenter.heroku.com/articles/php-
 {% endif -%}
 
 {% if apache %}
-The Apache HTTPD [web server](https://devcenter.heroku.com/articles/php-support#web-servers) has been updated to version [{{apache.version}}](https://downloads.apache.org/httpd/CHANGES_{{apache.version}}).
+The Apache HTTP [web server](https://devcenter.heroku.com/articles/php-support#web-servers) has been updated to version [{{apache.version}}](https://archive.apache.org/dist/httpd/CHANGES_{{apache.version}}).
 
 {% endif -%}
 

support/devcenter/generate.php

@@ -26,7 +26,7 @@
 	$stacks = [
 		1 => '20', // the offset we start with here is relevant for the numbering of footnotes
 		'22',
-		// '24',
+		'24',
 	];
 }
 

test/fixtures/devcenter/changelog/changelog.md

@@ -17,7 +17,7 @@ The following new [Composer versions](https://devcenter.heroku.com/articles/php-
 
 - [Composer 2.8.0](https://getcomposer.org/changelog/2.8.0)
 
-The Apache HTTPD [web server](https://devcenter.heroku.com/articles/php-support#web-servers) has been updated to version [2.4.4](https://downloads.apache.org/httpd/CHANGES_2.4.4).
+The Apache HTTP [web server](https://devcenter.heroku.com/articles/php-support#web-servers) has been updated to version [2.4.4](https://archive.apache.org/dist/httpd/CHANGES_2.4.4).
 
 The Nginx [web server](https://devcenter.heroku.com/articles/php-support#web-servers) has been updated to version [2.9.0](https://nginx.org/en/CHANGES-2.9).