Skip to content

Commit

Permalink
Merge pull request #742 from heroku/develop
Browse files Browse the repository at this point in the history
July 2024 PHP updates
  • Loading branch information
dzuelke authored Jul 5, 2024
2 parents 685ddb7 + 4614456 commit ad6139c
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 37 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@

## [Unreleased]

### 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

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/heroku/hatchet.git
revision: f10250e8a35d7efe2889dc78ab4ba3ad162539a9
revision: 69e268f694acd5876ff47810bdbd8467b35f8249
branch: timeouts-etc
specs:
heroku_hatchet (8.0.4)
Expand All @@ -27,7 +27,7 @@ GEM
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.7.0)
Expand Down
2 changes: 1 addition & 1 deletion bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
68 changes: 34 additions & 34 deletions support/devcenter/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ad6139c

Please sign in to comment.