thinkphp bug

apps.conf

@@ -22,8 +22,8 @@ mariadb_10_0_version=10.0.24
 mariadb_5_5_version=5.5.48
 
 percona_5_7_version=5.7.10-3
-percona_5_6_version=5.6.28-76.1
-percona_5_5_version=5.5.47-37.7
+percona_5_6_version=5.6.29-76.2
+percona_5_5_version=5.5.48-37.8
 
 # JDK
 jdk_6_version=1.6.0_45
@@ -33,9 +33,9 @@ jdk_8_version=1.8.0_74
 # PHP
 php_3_version=5.3.29
 php_4_version=5.4.45
-php_5_version=5.5.32
-php_6_version=5.6.18
-php_7_version=7.0.3
+php_5_version=5.5.33
+php_6_version=5.6.19
+php_7_version=7.0.4
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0
@@ -63,7 +63,7 @@ memcached_pecl_version=2.2.0
 memcache_pecl_version=3.0.8
 
 # phpMyadmin
-phpMyAdmin_version=4.4.15.4
+phpMyAdmin_version=4.4.15.5
 
 # jemalloc
 jemalloc_version=4.1.0

config/index.html

@@ -25,7 +25,7 @@ font-family:"Microsoft YaHei",sans-serif;
 <br>
 <div align="center"><h2>Congratulations, OneinStack a successful installation!</h2></div>
 <h3><a href="http://oneinstack.com" target="_blank" class="links">OneinStack </a><a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona</br>+PHP+Pureftpd+phpMyAdmin+redis+memcached+jemalloc/tcmalloc.</h3>
-<p><b>Check environment:&nbsp;&nbsp;</b><a href="/proberv.php" target="_blank" class="links">Proberv</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/xcache" target="_blank" class="links">xcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a></p>
+<p><b>Check environment:&nbsp;&nbsp;</b><a href="/proberv.php" target="_blank" class="links">Proberv</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a></p>
 <p><b>Create Web virtual running script:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>
 <p><b>Create FTP virtual running script:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
 <p><b>For feedback, questions, and to follow the progress of the project:&nbsp;&nbsp;</b> <a target="_blank" class="links" href="http://oneinstack.com">http://oneinstack.com</a></p>
@@ -33,8 +33,8 @@ font-family:"Microsoft YaHei",sans-serif;
 <p><b>Donate:</b></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PayPal:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;AliPay:&nbsp;&nbsp;lj2007331@gmail.com</p>
-<div align="center"><iframe src="http://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
-<div align="center"><h3><a href="http://oneinstack.com" target="_blank">OneinStack</a> by <a href="http://blog.linuxeye.com/" target="_blank">LinuxEye</a></h3></div>
+<div align="center"><iframe src="https://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
+<div align="center"><h3><a href="http://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">LinuxEye</a></h3></div>
 </div>
 </body>
 </html>

config/index_cn.html

@@ -25,7 +25,7 @@ font-family:微软雅黑,sans-serif;
 <br>
 <div align="center"><h2>Congratulations, OneinStack安装成功！</h2></div>
 <h3><a href="http://oneinstack.com" target="_blank" class="links">OneinStack </a> <a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona+PHP</br>+Pureftpd+phpMyAdmin+redis+memcached+jemalloc/tcmalloc. 脚本中用到的软件包大多最新稳定版本,修复了一些安全性问题。</h3>
-<p><b>查看本地环境:</b>&nbsp;&nbsp;<a href="/tz.php" target="_blank" class="links">探针</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/xcache" target="_blank" class="links">xcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a>(为了更安全，建议phpMyAdmin目录重命名！)</p>
+<p><b>查看本地环境:</b>&nbsp;&nbsp;<a href="/tz.php" target="_blank" class="links">探针</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a>(为了更安全，建议phpMyAdmin目录重命名！)</p>
 <p><b>创建WEB虚拟主机执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>
 <p><b>创建FTP虚拟账号执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
 <p><b>Github项目地址:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://github.com/lj2007331/oneinstack">https://github.com/lj2007331/oneinstack</a></p>
@@ -34,8 +34,8 @@ font-family:微软雅黑,sans-serif;
 <p><b>赞助我们:</b></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支付宝:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PayPal:&nbsp;&nbsp;lj2007331@gmail.com</p>
-<div align="center"><iframe src="http://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
-<div align="center"><h3><a href="http://oneinstack.com" target="_blank">OneinStack</a> by <a href="http://blog.linuxeye.com/" target="_blank">Linux运维笔记</a></h3></div>
+<div align="center"><iframe src="https://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
+<div align="center"><h3><a href="http://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">Linux运维笔记</a></h3></div>
 </div>
 </body>
 </html>

config/thinkphp.conf

@@ -1,6 +1,6 @@
 location / {
     if (!-e $request_filename) {
-        rewrite ^/(.*)$ /index.php/$1;
-        #rewrite ^/subdir/(.*)$ /subdir/index.php/$1;
+        rewrite ^(.*)$ /index.php?s=$1 last;
+        break;
     }
 }

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.1RC3.tgz && Download_src
-        tar xzf gmagick-2.0.1RC3.tgz 
-        cd gmagick-2.0.1RC3
+        src_url=https://pecl.php.net/get/gmagick-2.0.2RC1.tgz && Download_src
+        tar xzf gmagick-2.0.2RC1.tgz 
+        cd gmagick-2.0.2RC1
     else
         src_url=http://pecl.php.net/get/gmagick-$gmagick_version.tgz && Download_src
         tar xzf gmagick-$gmagick_version.tgz 

include/ImageMagick.sh

@@ -25,9 +25,9 @@ Install_php-imagick() {
 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/imagick-3.4.0RC6.tgz && Download_src
-        tar xzf imagick-3.4.0RC6.tgz
-        cd imagick-3.4.0RC6
+        src_url=https://pecl.php.net/get/imagick-3.4.1.tgz && Download_src
+        tar xzf imagick-3.4.1.tgz
+        cd imagick-3.4.1
     else
         src_url=http://pecl.php.net/get/imagick-$imagick_version.tgz && Download_src
         tar xzf imagick-$imagick_version.tgz

include/demo.sh

@@ -24,10 +24,19 @@ if [ -e "$php_install_dir/bin/php" ];then
     fi
 
     echo '<?php phpinfo() ?>' > $wwwroot_dir/default/phpinfo.php
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/ocp.php && Download_src
-    [ "$PHP_cache" == '1' ] && /bin/cp ocp.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@' $wwwroot_dir/default/index.html
-    [ "$PHP_cache" == '3' ] && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/apc.php" target="_blank" class="links">APC</a>@' $wwwroot_dir/default/index.html
-    [ "$PHP_cache" == '4' ] && /bin/cp eaccelerator-*/control.php $wwwroot_dir/default && sed -i 's@<a href="/xcache" target="_blank" class="links">xcache</a>@<a href="/control.php" target="_blank" class="links">eAccelerator</a>@' $wwwroot_dir/default/index.html
+    if [ "$PHP_cache" == '1' ];then
+        src_url=http://mirrors.linuxeye.com/oneinstack/src/ocp.php && Download_src
+        /bin/cp ocp.php $wwwroot_dir/default
+    elif [ "$PHP_cache" == '2' ];then
+        sed -i 's@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@<a href="/xcache" target="_blank" class="links">xcache</a>@' $wwwroot_dir/default/index.html
+    elif [ "$PHP_cache" == '3' ];then
+        sed -i 's@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@<a href="/apc.php" target="_blank" class="links">APC</a>@' $wwwroot_dir/default/index.html
+    elif [ "$PHP_cache" == '4' ];then
+        /bin/cp eaccelerator-*/control.php $wwwroot_dir/default
+        sed -i 's@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@<a href="/control.php" target="_blank" class="links">eAccelerator</a>@' $wwwroot_dir/default/index.html
+    else
+        sed -i 's@<a href="/ocp.php" target="_blank" class="links">Opcache</a>@@' $wwwroot_dir/default/index.html
+    fi
 fi
 chown -R ${run_user}.$run_user $wwwroot_dir/default
 cd ..

include/init_CentOS.sh

@@ -119,12 +119,15 @@ if [ "$CentOS_RHEL_version" == '5' ];then
 elif [ "$CentOS_RHEL_version" == '6' ];then
     sed -i 's@^ACTIVE_CONSOLES.*@ACTIVE_CONSOLES=/dev/tty[1-2]@' /etc/sysconfig/init	
     sed -i 's@^start@#start@' /etc/init/control-alt-delete.conf
+    sed -i 's@LANG=.*$@LANG="en_US.UTF-8"@g' /etc/sysconfig/i18n
+elif [ "$CentOS_RHEL_version" == '7' ];then
+    sed -i 's@LANG=.*$@LANG="en_US.UTF-8"@g' /etc/locale.conf 
 fi
 init q
 
 # Update time
 ntpdate pool.ntp.org 
-[ -z "`grep 'pool.ntp.org' /var/spool/cron/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/root;chmod 600 /var/spool/cron/root; }
+[ -z "`grep 'ntpdate' /var/spool/cron/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/root;chmod 600 /var/spool/cron/root; }
 service crond restart
 
 # iptables

include/init_Debian.sh

@@ -91,7 +91,7 @@ init q
 
 # Update time
 ntpdate pool.ntp.org 
-[ -z "`grep 'pool.ntp.org' /var/spool/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
+[ -z "`grep 'ntpdate' /var/spool/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; }
 service cron restart
 
 # iptables

include/init_Ubuntu.sh

@@ -109,7 +109,7 @@ sed -i 's@^@#@g' /etc/init/control-alt-delete.conf
 
 # Update time
 ntpdate pool.ntp.org 
-[ -z "`grep 'pool.ntp.org' /var/spool/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; } 
+[ -z "`grep 'ntpdate' /var/spool/crontabs/root`" ] && { echo "*/20 * * * * `which ntpdate` pool.ntp.org > /dev/null 2>&1" >> /var/spool/cron/crontabs/root;chmod 600 /var/spool/cron/crontabs/root; } 
 service cron restart
 
 # iptables

include/jemalloc.sh

@@ -14,7 +14,7 @@ src_url=http://mirrors.linuxeye.com/oneinstack/src/jemalloc-$jemalloc_version.ta
 
 tar xjf jemalloc-$jemalloc_version.tar.bz2
 cd jemalloc-$jemalloc_version
-./configure
+LDFLAGS="${LDFLAGS} -lrt" ./configure
 make && make install
 if [ -f "/usr/local/lib/libjemalloc.so" ];then
     if [ "$OS_BIT" == '64' -a "$OS" == 'CentOS' ];then

include/php-5.3.sh

@@ -15,6 +15,7 @@ src_url=http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$libmcrypt_ver
 src_url=http://downloads.sourceforge.net/project/mhash/mhash/$mhash_version/mhash-$mhash_version.tar.gz && Download_src
 src_url=http://downloads.sourceforge.net/project/mcrypt/MCrypt/$mcrypt_version/mcrypt-$mcrypt_version.tar.gz && Download_src
 src_url=http://mirrors.linuxeye.com/oneinstack/src/fpm-race-condition.patch && Download_src
+src_url=http://mirrors.linuxeye.com/oneinstack/src/debian_patches_disable_SSLv2_for_openssl_1_0_0.patch && Download_src
 src_url=http://www.php.net/distributions/php-$php_3_version.tar.gz && Download_src
 
 tar xzf libiconv-$libiconv_version.tar.gz
@@ -64,6 +65,7 @@ tar xzf php-$php_3_version.tar.gz
 patch -d php-$php_3_version -p0 < fpm-race-condition.patch
 cd php-$php_3_version
 patch -p1 < ../php5.3patch 
+patch -p1 < ../debian_patches_disable_SSLv2_for_openssl_1_0_0.patch
 make clean
 [ ! -d "$php_install_dir" ] && mkdir -p $php_install_dir
 if [[ $Apache_version =~ ^[1-2]$ ]];then

include/upgrade_web.sh

@@ -39,6 +39,7 @@ if [ -e "nginx-$NEW_Nginx_version.tar.gz" ];then
     tar xzf nginx-$NEW_Nginx_version.tar.gz
     cd nginx-$NEW_Nginx_version
     make clean
+    sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
     $nginx_install_dir/sbin/nginx -V &> $$
     nginx_configure_arguments=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$
@@ -89,8 +90,7 @@ if [ -e "tengine-$NEW_Tengine_version.tar.gz" ];then
     tar xzf tengine-$NEW_Tengine_version.tar.gz
     cd tengine-$NEW_Tengine_version
     make clean
-    # close debug
-    sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc
+    sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
     $tengine_install_dir/sbin/nginx -V &> $$
     tengine_configure_arguments=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$

uninstall.sh

@@ -79,7 +79,7 @@ Uninstall_Web() {
 [ -d "$nginx_install_dir" ] && { killall nginx > /dev/null 2>&1; rm -rf $nginx_install_dir /etc/init.d/nginx /etc/logrotate.d/nginx; sed -i "s@$nginx_install_dir/sbin:@@" /etc/profile; }
 [ -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 "$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; }
+[ -d "$tomcat_install_dir" ] && { killall java > /dev/null 2>&1; 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

vhost.sh

@@ -342,7 +342,7 @@ else
     	rewrite="other"
     fi
     echo "You choose rewrite=${CMSG}$rewrite${CEND}"
-    [ "$NGX_FLAG" == 'php' -a "$rewrite" == "thinkphp" ] && NGX_CONF=$(echo -e "location ~ \.php {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi_params;\n    set \$real_script_name \$fastcgi_script_name;\n        if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n        set \$real_script_name \$1;\n        set \$path_info \$2;\n        }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    fastcgi_param PATH_INFO \$path_info;\n    }")
+    [ "$NGX_FLAG" == 'php' -a "$rewrite" == "thinkphp" ] && NGX_CONF=$(echo -e "location ~ \.php {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi_params;\n    set \$real_script_name \$fastcgi_script_name;\n        if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n        set \$real_script_name \$1;\n        }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    }")
     if [ -e "config/$rewrite.conf" ];then
     	/bin/cp config/$rewrite.conf $web_install_dir/conf/$rewrite.conf
     else