From 2ad2f7fd2fc39e5b222bbfb430798ec25b18c704 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 21 Aug 2019 22:36:48 +0100 Subject: [PATCH 1/2] Apache/2.4.41 We can now drop the 2.4.39 specific mod_reqtimeout config workaround (https://bz.apache.org/bugzilla/show_bug.cgi?id=63325) --- CHANGELOG.md | 1 + conf/apache2/2/4/39/heroku.conf | 73 ------------------- .../build/{apache-2.4.39 => apache-2.4.41} | 0 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 conf/apache2/2/4/39/heroku.conf rename support/build/{apache-2.4.39 => apache-2.4.41} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5187b7de8..091cb2595 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-newrelic/9.0.2.245 [David Zuelke] - ext-blackfire/1.27.0 [David Zuelke] +- Apache/2.4.41 [David Zuelke] ### CHG diff --git a/conf/apache2/2/4/39/heroku.conf b/conf/apache2/2/4/39/heroku.conf deleted file mode 100644 index 596b76c52..000000000 --- a/conf/apache2/2/4/39/heroku.conf +++ /dev/null @@ -1,73 +0,0 @@ -# workaround for bug in 2.4.39 only, see https://bz.apache.org/bugzilla/show_bug.cgi?id=63325 -RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 - -# define a short-hand to our fcgi proxy, for convenience -# Define heroku-fcgi fcgi://127.0.0.1:4999 -Define heroku-fcgi unix:/tmp/heroku.fcgi.${PORT}.sock|fcgi://heroku-fcgi - -# make sure the proxy is registered with the unix socket; we can then use just "fcgi://heroku-fcgi" in proxy and rewrites directives -# we have to do this because we can't rewrite to a UDS location and because PHP doesn't support the unix:...|fcgi://... syntax -# this is also a lot more convenient for users -# http://thread.gmane.org/gmane.comp.apache.devel/52892 - - # we must declare a parameter in here or it'll not register the proxy ahead of time - # min=0 is an obvious candidate since that's the default value already and sensible - ProxySet min=0 - - -Listen ${PORT} - - - - ServerName localhost - - ErrorLog /tmp/heroku.apache2_error.${PORT}.log - # redefine "combined" log format so includes can overwrite it - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" heroku - CustomLog /tmp/heroku.apache2_access.${PORT}.log heroku - - TraceEnable off - - - # lock it down fully by default - # if it's also the docroot, it'll be opened up again further below - Require all denied - - # explicitly deny these again, merged with the docroot later - Require all denied - - - # handle these separately; who knows where they are and whether they're accessible - - Require all denied - - - Require all denied - - - DocumentRoot "${DOCUMENT_ROOT}" - - - Options FollowSymLinks - - # allow .htaccess to do everything - AllowOverride All - - # no limits - Require all granted - - - # mod_proxy doesn't forward the Authorization header, must fix that ourselves - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - - # pass requests to .php files to mod_proxy_fcgi - # this requires Apache 2.4.10+ and PHP 5.5.15+ to work properly - - # make sure the file exists so that if not, Apache will show its 404 page and not FPM - SetHandler proxy:fcgi://heroku-fcgi - - - - Include "${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}" - - diff --git a/support/build/apache-2.4.39 b/support/build/apache-2.4.41 similarity index 100% rename from support/build/apache-2.4.39 rename to support/build/apache-2.4.41 From 666cc5f1f39b5b3fde73b8714b17b4626eb72194 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 21 Aug 2019 23:45:42 +0100 Subject: [PATCH 2/2] v160 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 091cb2595..54e485926 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v160 (2019-08-??) +## v160 (2019-08-23) ### ADD