Update Tengine

apps.conf

@@ -1,7 +1,7 @@
 # newest software version
 # Web
 nginx_version=1.8.0
-tengine_version=2.1.0
+tengine_version=2.1.1
 
 tomcat_7_version=7.0.63
 tomcat_8_version=8.0.24

include/tengine.sh

@@ -31,10 +31,6 @@ cd tengine-$tengine_version
 # close debug
 sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc
 
-# make[1]: *** [objs/src/event/ngx_event_openssl.o] Error 1
-sed -i 's@\(.*\)this option allow a potential SSL 2.0 rollback (CAN-2005-2969)\(.*\)@#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING\n\1this option allow a potential SSL 2.0 rollback (CAN-2005-2969)\2@' src/event/ngx_event_openssl.c
-sed -i 's@\(.*\)SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING)\(.*\)@\1SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING)\2\n#endif@' src/event/ngx_event_openssl.c
-
 if [ "$je_tc_malloc" == '1' ];then
     malloc_module='--with-jemalloc'
 elif [ "$je_tc_malloc" == '2' ];then

include/upgrade_web.sh

@@ -91,9 +91,8 @@ if [ -e "tengine-$NEW_Tengine_version.tar.gz" ];then
     tar xzf tengine-$NEW_Tengine_version.tar.gz
     cd tengine-$NEW_Tengine_version
     make clean
-    # make[1]: *** [objs/src/event/ngx_event_openssl.o] Error 1
-    sed -i 's@\(.*\)this option allow a potential SSL 2.0 rollback (CAN-2005-2969)\(.*\)@#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING\n\1this option allow a potential SSL 2.0 rollback (CAN-2005-2969)\2@' src/event/ngx_event_openssl.c
-    sed -i 's@\(.*\)SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING)\(.*\)@\1SSL_CTX_set_options(ssl->ctx, SSL_OP_MSIE_SSLV2_RSA_PADDING)\2\n#endif@' src/event/ngx_event_openssl.c
+    # close debug
+    sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc
     $tengine_install_dir/sbin/nginx -V &> $$
     tengine_configure_arguments=`cat $$ | grep 'configure arguments:' | awk -F: '{print $2}'`
     rm -rf $$

include/xcache.sh

@@ -33,12 +33,12 @@ xcache.admin.user = "admin"
 xcache.admin.pass = "$xcache_admin_md5_pass"
 
 [xcache]
-xcache.size  = $(expr $Memory_limit / 2) 
+xcache.size = $(expr $Memory_limit / 2)M
 xcache.count = $(expr `cat /proc/cpuinfo | grep -c processor` + 1) 
 xcache.slots = 8K
 xcache.ttl = 3600
 xcache.gc_interval = 300
-xcache.var_size = $(expr $Memory_limit / 2) 
+xcache.var_size = 4M
 xcache.var_count = $(expr `cat /proc/cpuinfo | grep -c processor` + 1) 
 xcache.var_slots = 8K
 xcache.var_ttl = 0