Merge pull request #312 from mlocati/http-php8.0

Add support for http with PHP 8.0, enable parallel compilation for raphf
pull/313/head
Michele Locati 2021-03-06 20:38:55 +01:00 committed by GitHub
commit 167583d4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View File

@ -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 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 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 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 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 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 imap 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0

View File

@ -355,8 +355,10 @@ checkRequiredModule() {
sortModulesToInstall() { sortModulesToInstall() {
# apcu_bc requires apcu # apcu_bc requires apcu
checkRequiredModule 'apcu_bc' 'apcu' checkRequiredModule 'apcu_bc' 'apcu'
# http requires propro and raphf # http requires propro (for PHP < 8) and raphf
if test $PHP_MAJMIN_VERSION -le 704; then
checkRequiredModule 'http' 'propro' checkRequiredModule 'http' 'propro'
fi
checkRequiredModule 'http' 'raphf' checkRequiredModule 'http' 'raphf'
# Some module installation may use igbinary if available: move it before other modules # Some module installation may use igbinary if available: move it before other modules
if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then if stringInList 'igbinary' "$PHP_MODULES_TO_INSTALL"; then
@ -1101,7 +1103,7 @@ setTargetTriplet() {
# The number of processors to be used # The number of processors to be used
getCompilationProcessorCount() { getCompilationProcessorCount() {
case "$1" in 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 # These extensions support parallel compilation
getProcessorCount getProcessorCount
;; ;;