Check cache status in cache manager

jiangwenyuan · Mar 1, 2018 · 1ddced1 · 1ddced1
1 parent 1769d65
commit 1ddced1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Nuster Changelog
 
-## 1.7.9.6 - 2018-02-28
+## 1.7.9.6 - 2018-03-01
 
 ### Added
 - Update ttl at run time

diff --git a/src/cache/engine.c b/src/cache/engine.c
@@ -836,8 +836,7 @@ int cache_purge(struct stream *s, struct channel *req, struct proxy *px) {
     struct http_msg *msg = &txn->req;
 
 
-    if(global.cache.status == CACHE_STATUS_ON &&
-            txn->meth == HTTP_METH_OTHER &&
+    if(txn->meth == HTTP_METH_OTHER &&
             memcmp(msg->chn->buf->p, global.cache.purge_method, strlen(global.cache.purge_method)) == 0) {
 
         char *key = cache_purge_build_key(s, msg);

diff --git a/src/proto_http.c b/src/proto_http.c
@@ -4357,7 +4357,7 @@ int http_process_req_common(struct stream *s, struct channel *req, int an_bit, s
 	}
 
         /* check cache purge */
-        if (cache_purge(s, req, px) || cache_manager(s, req, px)) {
+        if (global.cache.status == CACHE_STATUS_ON && (cache_manager(s, req, px) || cache_purge(s, req, px))) {
             goto return_prx_cond;
         }