Merge branch 'master' into master

rahul286 · web-flow · commit 10a432e1179f · 2018-01-18T12:25:47.000+05:30
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Please attach the output of following command when open a new support request.
+Kindly, attach the output of the following commands while creating a new support request.
 
 - [ ] lsb_release -a
 - [ ] ee -v
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+v3.7.5 - Jan 12, 2018
+- Upgrade wp-cli version to 1.4.1
+- Update templates to skip cache for more plugins
+
 v3.7.4 - Aug 29, 2016
 - Fix phpmemcacheadmin download urls [critical]
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-#[EasyEngine](https://easyengine.io/)
+# [EasyEngine](https://easyengine.io/)
 
 [![Travis Build Status](https://travis-ci.org/EasyEngine/easyengine.svg)](https://travis-ci.org/EasyEngine/easyengine) [![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/)
 
@@ -118,10 +118,7 @@ ee site create example.com --php --pagespeed     # create example.com php site w
 ## Donations
 
 [![PayPal-Donate](https://cloud.githubusercontent.com/assets/4115/5297691/c7b50292-7bd7-11e4-987b-2dc21069e756.png)](http://rt.cx/eedonate)
-
 [![BitCoin-Donate](https://bitpay.com/img/donate-button.svg)](https://bitpay.com/417008/donate)
 
----
-
 ## License
-[MIT] (http://opensource.org/licenses/MIT)
+[MIT](http://opensource.org/licenses/MIT)
diff --git a/ee/cli/templates/redis-hhvm.mustache b/ee/cli/templates/redis-hhvm.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/redis-php7.mustache b/ee/cli/templates/redis-php7.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/redis.mustache b/ee/cli/templates/redis.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/w3tc-hhvm.mustache b/ee/cli/templates/w3tc-hhvm.mustache
@@ -10,11 +10,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/w3tc-php7.mustache b/ee/cli/templates/w3tc-php7.mustache
@@ -10,11 +10,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/w3tc.mustache b/ee/cli/templates/w3tc.mustache
@@ -10,11 +10,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpcommon-php7.mustache b/ee/cli/templates/wpcommon-php7.mustache
@@ -19,17 +19,3 @@ location /wp-content/uploads/ {
     deny all;
   }
 }
-# Yoast sitemap
-location ~ ([^/]*)sitemap(.*)\.x(m|s)l$ {
-  rewrite ^/sitemap\.xml$ /sitemap_index.xml permanent;
-  rewrite ^/([a-z]+)?-?sitemap\.xsl$ /index.php?xsl=$1 last;
-  # Rules for yoast sitemap with wp|wpsubdir|wpsubdomain
-  rewrite ^.*/sitemap_index\.xml$ /index.php?sitemap=1 last;
-  rewrite ^.*/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;
-  # Following lines are options. Needed for WordPress seo addons
-  rewrite ^/news_sitemap\.xml$ /index.php?sitemap=wpseo_news last;
-  rewrite ^/locations\.kml$ /index.php?sitemap=wpseo_local_kml last;
-  rewrite ^/geo_sitemap\.xml$ /index.php?sitemap=wpseo_local last;
-  rewrite ^/video-sitemap\.xsl$ /index.php?xsl=video last;
-  access_log off;
-}
diff --git a/ee/cli/templates/wpcommon.mustache b/ee/cli/templates/wpcommon.mustache
@@ -19,17 +19,3 @@ location /wp-content/uploads/ {
     deny all;
   }
 }
-# Yoast sitemap
-location ~ ([^/]*)sitemap(.*)\.x(m|s)l$ {
-  rewrite ^/sitemap\.xml$ /sitemap_index.xml permanent;
-  rewrite ^/([a-z]+)?-?sitemap\.xsl$ /index.php?xsl=$1 last;
-  # Rules for yoast sitemap with wp|wpsubdir|wpsubdomain
-  rewrite ^.*/sitemap_index\.xml$ /index.php?sitemap=1 last;
-  rewrite ^.*/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;
-  # Following lines are options. Needed for WordPress seo addons
-  rewrite ^/news_sitemap\.xml$ /index.php?sitemap=wpseo_news last;
-  rewrite ^/locations\.kml$ /index.php?sitemap=wpseo_local_kml last;
-  rewrite ^/geo_sitemap\.xml$ /index.php?sitemap=wpseo_local last;
-  rewrite ^/video-sitemap\.xsl$ /index.php?xsl=video last;
-  access_log off;
-}
diff --git a/ee/cli/templates/wpfc-hhvm.mustache b/ee/cli/templates/wpfc-hhvm.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpfc-php7.mustache b/ee/cli/templates/wpfc-php7.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpfc.mustache b/ee/cli/templates/wpfc.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $skip_cache 1;
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $skip_cache 1;
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $skip_cache 1;
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpsc-hhvm.mustache b/ee/cli/templates/wpsc-hhvm.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpsc-php7.mustache b/ee/cli/templates/wpsc-php7.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/cli/templates/wpsc.mustache b/ee/cli/templates/wpsc.mustache
@@ -9,11 +9,11 @@ if ($query_string != "") {
   set $cache_uri 'null cache';
 }
 # Don't cache URL containing the following segments
-if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*.php|index.php|/feed/|sitemap(_index)?.xml|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {
+if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|wp-.*\.php|index.php|/feed/|.*sitemap.*\.xml)") {
   set $cache_uri 'null cache';
 }
 # Don't use the cache for logged in users or recent commenter or customer with items in cart
-if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_logged_in|woocommerce_items_in_cart") {
+if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|[a-z0-9]+_items_in_cart") {
   set $cache_uri 'null cache';
 }
 # Use cached or actual file if they exists, Otherwise pass request to WordPress
diff --git a/ee/core/variables.py b/ee/core/variables.py
@@ -12,9 +12,9 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.7.4"
+    ee_version = "3.7.5"
     # EasyEngine packages versions
-    ee_wp_cli = "0.24.1"
+    ee_wp_cli = "1.4.1"
     ee_adminer = "4.2.5"
     ee_roundcube = "1.1.4"
    # ee_vimbadmin = "3.0.12"
diff --git a/install b/install
@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.7.4"
+readonly ee_version_new="3.7.5"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -57,15 +57,15 @@ readonly ee_distro_version=$(lsb_release -sc)
 # Checking linux distro
 if [ "$ee_linux_distro" != "Ubuntu" ] && [ "$ee_linux_distro" != "Debian" ]; then
     ee_lib_echo_fail "EasyEngine (ee) is made for Ubuntu and Debian only as of now"
-    ee_lib_echo_fail "You are free to fork EasyEngine (ee): https://github.com/rtCamp/easyengine/fork"
+    ee_lib_echo_fail "You are free to fork EasyEngine (ee): https://github.com/EasyEngine/easyengine/fork"
     ee_lib_echo_fail "EasyEngine (ee) only support Ubuntu 12.04/14.04 and Debian 7.x/8.x"
     exit 100
 fi
 
 # EasyEngine (ee) only support all Ubuntu/Debian distro except the distro reached EOL
 lsb_release -d | egrep -e "12.04|14.04|16.04|wheezy|jessie" &>> /dev/null
 if [ "$?" -ne "0" ]; then
-    ee_lib_echo_fail "EasyEngine (ee) only support Ubuntu 12.04/14.04 and Debian 7.x/8.x"
+    ee_lib_echo_fail "EasyEngine (ee) only support Ubuntu 12.04/14.04/16.04 LTS and Debian 7.x/8.x"
     exit 100
 fi
 
@@ -233,7 +233,7 @@ function ee_update_wp_cli()
     if [ "${WP_CLI_PATH}" != "" ]; then
         # Get WP-CLI version
         WP_CLI_VERSION=$(${PHP_PATH} ${WP_CLI_PATH} --allow-root cli version | awk '{ print $2 }')
-        dpkg --compare-versions ${WP_CLI_VERSION} lt 0.24.1
+        dpkg --compare-versions ${WP_CLI_VERSION} lt 1.4.1
         # Update WP-CLI version
         if [ "$?" == "0" ]; then
            wget -qO ${WP_CLI_PATH} https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
@@ -740,7 +740,7 @@ if [ -f /usr/local/sbin/easyengine ]; then
     if [[ $? -ne 0 ]]; then
         ee_lib_echo "EasyEngine $ee_version_old not found on your system" | tee -ai $ee_install_log
         ee_lib_echo "Updating your EasyEngine to $ee_version_old for compability" | tee -ai $ee_install_log
-        wget -q https://raw.githubusercontent.com/rtCamp/easyengine/old-stable/bin/update && bash update
+        wget -q https://raw.githubusercontent.com/EasyEngine/easyengine/old-stable/bin/update && bash update
         if [[ $? -ne 0 ]]; then
             ee_lib_echo_fail "Unable to update EasyEngine to $ee_version_old, exit status = " $?
             exit 100
diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='ee',
-      version='3.7.4',
+      version='3.7.5',
       description=long_description,
       long_description=long_description,
       classifiers=[],

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Please attach the output of following command when open a new support request.`
	`1`	`+Kindly, attach the output of the following commands while creating a new support request.`
`2`	`2`
`3`	`3`	`- [ ] lsb_release -a`
`4`	`4`	`- [ ] ee -v`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ if ($query_string != "") {`
`9`	`9`	`set $skip_cache 1;`
`10`	`10`	`}`
`11`	`11`	`# Don't cache URL containing the following segments`
`12`		`-if ($request_uri ~* "(/wp-admin/\|/xmlrpc.php\|wp-.*.php\|index.php\|/feed/\|sitemap(_index)?.xml\|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {`
	`12`	`+if ($request_uri ~* "(/wp-admin/\|/xmlrpc.php\|wp-.\.php\|index.php\|/feed/\|.sitemap.*\.xml)") {`
`13`	`13`	`set $skip_cache 1;`
`14`	`14`	`}`
`15`	`15`	`# Don't use the cache for logged in users or recent commenter or customer with items in cart`
`16`		`-if ($http_cookie ~* "comment_author\|wordpress_[a-f0-9]+\|wp-postpass\|wordpress_no_cache\|wordpress_logged_in\|woocommerce_items_in_cart") {`
	`16`	`+if ($http_cookie ~* "comment_author\|wordpress_[a-f0-9]+\|wp-postpass\|wordpress_no_cache\|wordpress_logged_in\|[a-z0-9]+_items_in_cart") {`
`17`	`17`	`set $skip_cache 1;`
`18`	`18`	`}`
`19`	`19`	`# Use cached or actual file if they exists, Otherwise pass request to WordPress`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ if ($query_string != "") {`
`10`	`10`	`set $cache_uri 'null cache';`
`11`	`11`	`}`
`12`	`12`	`# Don't cache URL containing the following segments`
`13`		`-if ($request_uri ~* "(/wp-admin/\|/xmlrpc.php\|wp-.*.php\|index.php\|/feed/\|sitemap(_index)?.xml\|[a-z0-9_-]+-sitemap([0-9]+)?.xml)") {`
	`13`	`+if ($request_uri ~* "(/wp-admin/\|/xmlrpc.php\|wp-.\.php\|index.php\|/feed/\|.sitemap.*\.xml)") {`
`14`	`14`	`set $cache_uri 'null cache';`
`15`	`15`	`}`
`16`	`16`	`# Don't use the cache for logged in users or recent commenter or customer with items in cart`
`17`		`-if ($http_cookie ~* "comment_author\|wordpress_[a-f0-9]+\|wp-postpass\|wordpress_logged_in\|woocommerce_items_in_cart") {`
	`17`	`+if ($http_cookie ~* "comment_author\|wordpress_[a-f0-9]+\|wp-postpass\|wordpress_no_cache\|wordpress_logged_in\|[a-z0-9]+_items_in_cart") {`
`18`	`18`	`set $cache_uri 'null cache';`
`19`	`19`	`}`
`20`	`20`	`# Use cached or actual file if they exists, Otherwise pass request to WordPress`