From 12dbc5180c2b6a7dd39ca40a3a808f781005c87c Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Sat, 6 Mar 2021 19:34:12 +0100
Subject: [PATCH] Add support for http with PHP 8.0, enable parallel
 compilation for raphf

---
 data/supported-extensions | 2 +-
 install-php-extensions    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/supported-extensions b/data/supported-extensions
index d1f8492..02807b2 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -23,7 +23,7 @@ gmagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 gmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 gnupg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 grpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
-http 5.5 5.6 7.0 7.1 7.2 7.3 7.4
+http 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 igbinary 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 imagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
 imap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
diff --git a/install-php-extensions b/install-php-extensions
index 4042261..c245763 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -355,8 +355,10 @@ checkRequiredModule() {
 sortModulesToInstall() {
 	# apcu_bc requires apcu
 	checkRequiredModule 'apcu_bc' 'apcu'
-	# http requires propro and raphf
-	checkRequiredModule 'http' 'propro'
+	# http requires propro (for PHP < 8) and raphf
+	if test $PHP_MAJMIN_VERSION -le 704; then
+		checkRequiredModule 'http' 'propro'
+	fi
 	checkRequiredModule 'http' 'raphf'
 	# Some module installation may use igbinary if available: move it before other modules
 	if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then
@@ -1101,7 +1103,7 @@ setTargetTriplet() {
 #   The number of processors to be used
 getCompilationProcessorCount() {
 	case "$1" in
-		amqp | bcmath | bz2 | calendar | decimal | excimer | exif | gd | geospatial | gettext | gmagick | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | redis | ssh2 | soap | sockets | tidy | xdebug | xmlrpc | xsl | yaml | zip)
+		amqp | bcmath | bz2 | calendar | decimal | excimer | exif | gd | geospatial | gettext | gmagick | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | raphf | redis | ssh2 | soap | sockets | tidy | xdebug | xmlrpc | xsl | yaml | zip)
 			# These extensions support parallel compilation
 			getProcessorCount
 			;;