Merge branch 'master' of github.com:rtCamp/easyengine into feature/minorfixes

Conflicts:
	ee/core/variables.py
	install
	setup.py

CHANGELOG.txt

@@ -1,8 +1,11 @@
+v 3.3.4 - Aug 12, 2015
+- Bug Fix for https://github.com/rtCamp/easyengine/issues/598#issue-98354466
+
 v 3.3.3 - Jul 28, 2015
 - Bug Fix for https://github.com/rtCamp/easyengine/issues/593#issuecomment-125274633
 
 v 3.3.2 - Jul 27, 2015
-- Bug Fix #593 
+- Bug Fix #593
 - Fix package authentication problems
 - Version update roundcube 1.1.2
 - Version update vimbadmin to 3.0.12

ee/cli/templates/redis-hhvm.mustache

@@ -53,5 +53,6 @@ location ~ \.php$ {
   more_set_headers 'X-SRCache-Store-Status $srcache_store_status';
 
   include fastcgi_params;
+  fastcgi_param HTTP_ACCEPT_ENCODING "";
   fastcgi_pass hhvm;
 }

ee/core/variables.py

@@ -14,6 +14,7 @@ class EEVariables():
     # EasyEngine version
     ee_version = "3.3.5"
 
+
     # EasyEngine packages versions
     ee_wp_cli = "0.19.2"
     ee_adminer = "4.2.1"

install

@@ -424,12 +424,19 @@ function ee_update_latest()
       sed -i "s/X-Cache-2 /X-SRCache-Store-Status /g" /etc/nginx/common/redis.conf &>> /dev/null
     fi
 
-  # Update Timeout redis-hhvm.conf
+
     if [ -f /etc/nginx/common/redis-hhvm.conf ]; then
+    # Update Timeout redis-hhvm.conf
       grep -0 'redis2_query expire $key 6h' /etc/nginx/common/redis-hhvm.conf &>> /dev/null
       if [ $? -eq 0 ]; then
         sed -i 's/redis2_query expire $key 6h/redis2_query expire $key 14400/g' /etc/nginx/common/redis-hhvm.conf &>> /dev/null
       fi
+
+    #Fix for 3.3.4 redis-hhvm issue
+      grep -0 'HTTP_ACCEPT_ENCODING' /etc/nginx/common/redis-hhvm.conf &>> /dev/null
+      if [ $? -ne 0 ]; then
+        sed -i 's/fastcgi_params;/fastcgi_params;\n  fastcgi_param HTTP_ACCEPT_ENCODING "";/g' /etc/nginx/common/redis-hhvm.conf &>> /dev/null
+      fi
     fi
 
     # Fix for 3.3.2 renamed nginx.conf
@@ -453,6 +460,8 @@ function ee_update_latest()
             fi
         fi
     fi
+
+
 }
 
 # Do git intialisation