Update versions.txt

config/nginx.conf

@@ -18,6 +18,7 @@ http {
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
     client_max_body_size 1024m;
+    client_body_buffer_size 10m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

config/nginx_apache.conf

@@ -18,6 +18,7 @@ http {
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
     client_max_body_size 1024m;
+    client_body_buffer_size 10m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

config/nginx_tomcat.conf

@@ -18,6 +18,7 @@ http {
     client_header_buffer_size 32k;
     large_client_header_buffers 4 32k;
     client_max_body_size 1024m;
+    client_body_buffer_size 10m;
     sendfile on;
     tcp_nopush on;
     keepalive_timeout 120;

config/server.xml

@@ -26,6 +26,7 @@
               maxThreads="1000"
               minSpareThreads="20"
               acceptCount="1000"
+              maxHttpHeaderSize="65536"
               debug="0"
               disableUploadTimeout="true"
               useBodyEncodingForURI="true"

include/GraphicsMagick.sh

@@ -25,9 +25,9 @@ Install_php-gmagick() {
 cd $oneinstack_dir/src
 if [ -e "$php_install_dir/bin/phpize" ];then
     if [ "`$php_install_dir/bin/php -r 'echo PHP_VERSION;' | awk -F. '{print $1}'`" == '7' ];then
-        src_url=https://pecl.php.net/get/gmagick-2.0.2RC2.tgz && Download_src
-        tar xzf gmagick-2.0.2RC2.tgz
-        cd gmagick-2.0.2RC2
+        src_url=https://pecl.php.net/get/gmagick-2.0.4RC1.tgz && Download_src
+        tar xzf gmagick-2.0.4RC1.tgz
+        cd gmagick-2.0.4RC1
     else
         src_url=http://pecl.php.net/get/gmagick-$gmagick_version.tgz && Download_src
         tar xzf gmagick-$gmagick_version.tgz

include/check_os.sh

@@ -21,10 +21,11 @@ elif [ -n "`grep Deepin /etc/issue`" -o "`lsb_release -is 2>/dev/null`" == 'Deep
     OS=Debian
     [ ! -e "`which lsb_release`" ] && { apt-get -y update; apt-get -y install lsb-release; clear; }
     Debian_version=`lsb_release -sr | awk -F. '{print $1}'`
-elif [ -n "`grep Ubuntu /etc/issue`" -o "`lsb_release -is 2>/dev/null`" == 'Ubuntu' ];then
+elif [ -n "`grep Ubuntu /etc/issue`" -o "`lsb_release -is 2>/dev/null`" == 'Ubuntu' -o -n "`grep 'Linux Mint' /etc/issue`" ];then
     OS=Ubuntu
     [ ! -e "`which lsb_release`" ] && { apt-get -y update; apt-get -y install lsb-release; clear; }
     Ubuntu_version=`lsb_release -sr | awk -F. '{print $1}'`
+    [ -n "`grep 'Linux Mint 18' /etc/issue`" ] && Ubuntu_version=16
 else
     echo "${CFAILURE}Does not support this OS, Please contact the author! ${CEND}"
     kill -9 $$

include/php-5.3.sh

@@ -125,7 +125,7 @@ else
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi
 sed -i '/^BUILD_/ s/\$(CC)/\$(CXX)/g' Makefile
-make ZEND_EXTRA_LIBS='-liconv'
+make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then

include/php-5.4.sh

@@ -87,7 +87,7 @@ else
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi
-make ZEND_EXTRA_LIBS='-liconv'
+make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then

include/php-5.5.sh

@@ -87,7 +87,7 @@ else
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi
-make ZEND_EXTRA_LIBS='-liconv'
+make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then

include/php-5.6.sh

@@ -86,7 +86,7 @@ else
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi
-make ZEND_EXTRA_LIBS='-liconv'
+make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then

include/php-7.sh

@@ -87,7 +87,7 @@ else
 --with-mhash --enable-pcntl --enable-sockets --with-xmlrpc --enable-ftp --enable-intl --with-xsl \
 --with-gettext --enable-zip --enable-soap --disable-ipv6 --disable-debug
 fi
-make ZEND_EXTRA_LIBS='-liconv'
+make ZEND_EXTRA_LIBS='-liconv' -j ${THREAD}
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then

uninstall.sh

@@ -81,7 +81,7 @@ Uninstall_Web() {
 [ -d "$tengine_install_dir" ] && { killall nginx > /dev/null 2>&1; rm -rf $tengine_install_dir /etc/init.d/nginx /etc/logrotate.d/nginx; sed -i "s@$tengine_install_dir/sbin:@@" /etc/profile; }
 [ -d "$openresty_install_dir" ] && { killall nginx > /dev/null 2>&1; rm -rf $openresty_install_dir /etc/init.d/nginx /etc/logrotate.d/nginx; sed -i "s@$openresty_install_dir/nginx/sbin:@@" /etc/profile; }
 [ -d "$apache_install_dir" ] && { service httpd stop > /dev/null 2>&1; rm -rf $apache_install_dir /etc/init.d/httpd /etc/logrotate.d/apache; sed -i "s@$apache_install_dir/bin:@@" /etc/profile; }
-[ -d "$tomcat_install_dir" ] && { killall java > /dev/null 2>&1; rm -rf $tomcat_install_dir /etc/init.d/tomcat; /etc/logrotate.d/tomcat; }
+[ -d "$tomcat_install_dir" ] && { killall java > /dev/null 2>&1; chmod +x /etc/logrotate.d/tomcat; rm -rf $tomcat_install_dir /etc/init.d/tomcat; /etc/logrotate.d/tomcat; }
 [ -d "/usr/java" ] && { rm -rf /usr/java; sed -i '/export JAVA_HOME=/d' /etc/profile; sed -i '/export CLASSPATH=/d' /etc/profile; sed -i 's@\$JAVA_HOME/bin:@@' /etc/profile; }
 [ -e "$wwwroot_dir" ] && /bin/mv ${wwwroot_dir}{,$(date +%Y%m%d%H)}
 sed -i 's@^website_name=.*@website_name=@' ./options.conf

versions.txt

@@ -20,7 +20,7 @@ mysql_5_7_version=5.7.13
 mysql_5_6_version=5.6.31
 mysql_5_5_version=5.5.50
 
-mariadb_10_1_version=10.1.14
+mariadb_10_1_version=10.1.16
 mariadb_10_0_version=10.0.26
 mariadb_5_5_version=5.5.50