Merge branch 'PHP-7.4'

nikic · nikic · commit ae706e51e1fc · 2020-01-17T09:51:31.000+01:00
* PHP-7.4:
  Update php.ini files to add missing FTP extension
diff --git a/php.ini-development b/php.ini-development
@@ -899,6 +899,7 @@ default_socket_timeout = 60
 ;extension=bz2
 ;extension=curl
 ;extension=ffi
+;extension=ftp
 ;extension=fileinfo
 ;extension=gd2
 ;extension=gettext
diff --git a/php.ini-production b/php.ini-production
@@ -901,6 +901,7 @@ default_socket_timeout = 60
 ;extension=bz2
 ;extension=curl
 ;extension=ffi
+;extension=ftp
 ;extension=fileinfo
 ;extension=gd2
 ;extension=gettext
