Browse Source

Update apps.conf

lj2007331 9 years ago
parent
commit
b4b92c8e50
4 changed files with 14 additions and 12 deletions
  1. 7 7
      apps.conf
  2. 2 1
      include/apache-2.2.sh
  3. 2 1
      include/apache-2.4.sh
  4. 3 3
      vhost.sh

+ 7 - 7
apps.conf

@@ -4,7 +4,7 @@ nginx_version=1.9.5
 tengine_version=2.1.1
 
 tomcat_7_version=7.0.64
-tomcat_8_version=8.0.26
+tomcat_8_version=8.0.27
 
 apache_2_version=2.2.31
 apache_4_version=2.4.16
@@ -13,8 +13,8 @@ apr_version=1.5.2
 apr_util_version=1.5.4
 
 # DB
-mysql_6_version=5.6.26
-mysql_5_version=5.5.45
+mysql_6_version=5.6.27
+mysql_5_version=5.5.46
 
 mariadb_10_version=10.0.21
 mariadb_5_version=5.5.45
@@ -30,9 +30,9 @@ jdk_8_version=1.8.0_60
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.45
-php_5_version=5.5.29
-php_6_version=5.6.13
-php_7_version=7.0.0RC3
+php_5_version=5.5.30
+php_6_version=5.6.14
+php_7_version=7.0.0RC4
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0
@@ -63,7 +63,7 @@ memcache_pecl_version=2.2.7
 phpMyAdmin_version=4.4.15
 
 # jemalloc
-jemalloc_version=4.0.2
+jemalloc_version=4.0.3
 
 # tcmalloc
 tcmalloc_version=2.4

+ 2 - 1
include/apache-2.2.sh

@@ -57,6 +57,7 @@ elif [ "$Nginx_version" == '1' -o "$Nginx_version" == '2' -o -e "$web_install_di
     TMP_IP=127.0.0.1
 fi
 sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .phtml\n    AddType application/x-httpd-php-source .phps@" $apache_install_dir/conf/httpd.conf
+sed -i "s@#AddHandler cgi-script .cgi@AddHandler cgi-script .cgi .pl@" $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule rewrite_module@LoadModule rewrite_module@' $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule\(.*\)mod_deflate.so@LoadModule\1mod_deflate.so@' $apache_install_dir/conf/httpd.conf
 sed -i 's@DirectoryIndex index.html@DirectoryIndex index.html index.php@' $apache_install_dir/conf/httpd.conf
@@ -91,7 +92,7 @@ NameVirtualHost *:$TMP_PORT
     CustomLog "$wwwlogs_dir/access_apache.log" common
 <Directory "$wwwroot_dir/default">
     SetOutputFilter DEFLATE
-    Options FollowSymLinks
+    Options FollowSymLinks ExecCGI
     AllowOverride All
     Order allow,deny
     Allow from all

+ 2 - 1
include/apache-2.4.sh

@@ -70,6 +70,7 @@ elif [ "$Nginx_version" == '1' -o "$Nginx_version" == '2' -o -e "$web_install_di
     TMP_IP=127.0.0.1
 fi
 sed -i "s@AddType\(.*\)Z@AddType\1Z\n    AddType application/x-httpd-php .php .phtml\n    AddType application/x-httpd-php-source .phps@" $apache_install_dir/conf/httpd.conf
+sed -i "s@#AddHandler cgi-script .cgi@AddHandler cgi-script .cgi .pl@" $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule rewrite_module@LoadModule rewrite_module@' $apache_install_dir/conf/httpd.conf
 sed -i 's@^#LoadModule\(.*\)mod_deflate.so@LoadModule\1mod_deflate.so@' $apache_install_dir/conf/httpd.conf
 sed -i 's@DirectoryIndex index.html@DirectoryIndex index.html index.php@' $apache_install_dir/conf/httpd.conf
@@ -103,7 +104,7 @@ cat >> $apache_install_dir/conf/vhost/0.conf << EOF
     CustomLog "$wwwlogs_dir/access_apache.log" common
 <Directory "$wwwroot_dir/default">
     SetOutputFilter DEFLATE
-    Options FollowSymLinks
+    Options FollowSymLinks ExecCGI
     Require all granted
     AllowOverride All
     Order allow,deny

+ 3 - 3
vhost.sh

@@ -413,7 +413,7 @@ cat > $apache_install_dir/conf/vhost/$domain.conf << EOF
     $A_log
 <Directory "$vhostdir">
     SetOutputFilter DEFLATE
-    Options FollowSymLinks
+    Options FollowSymLinks ExecCGI
     $R_TMP
     AllowOverride All
     Order allow,deny
@@ -463,7 +463,7 @@ location @apache {
     proxy_pass http://127.0.0.1:88;
     include proxy.conf;
     }
-location ~ .*\.(php|php5)?$ {
+location ~ .*\.(php|php5|cgi|pl)?$ {
     proxy_pass http://127.0.0.1:88;
     include proxy.conf;
     }
@@ -501,7 +501,7 @@ cat > $apache_install_dir/conf/vhost/$domain.conf << EOF
     $A_log
 <Directory "$vhostdir">
     SetOutputFilter DEFLATE
-    Options FollowSymLinks
+    Options FollowSymLinks ExecCGI
     $R_TMP
     AllowOverride All
     Order allow,deny