Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70917 install-pear-nozlib.phar missing
  Update mime type generator script to keep track of additional mime-types
  Added support for CSS/JavaScript source maps

makedist

@@ -119,6 +119,11 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLD
 $ECHO_N "makedist: Attempting to download PEAR's phar archive"
 if test ! -x wget; then
 	wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/
+	if [ "x$?" != "x0" ]
+	then
+		$ECHO_N "Pear download failed";
+		exit 7
+	fi
 else
 	$ECHO_N "Missing wget binary needed for pear download";
 	exit 7