From: Olivier Houchard <cognet@ci0.org>
Date: Wed, 1 Nov 2017 13:04:02 +0000 (+0100)
Subject: MINOR: cache: Don't confuse act_return and act_parse_ret.
X-Git-Tag: v1.8-rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fccf840cdf807197beaa93a16e80d9e70b5c0d9c;p=thirdparty%2Fhaproxy.git

MINOR: cache: Don't confuse act_return and act_parse_ret.
---

diff --git a/src/cache.c b/src/cache.c
index 4263c91557..2d7cdcda00 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -561,7 +561,7 @@ enum act_parse_ret parse_cache_store(const char **args, int *orig_arg, struct pr
 	return ACT_RET_PRS_OK;
 
 err:
-	return ACT_RET_ERR;
+	return ACT_RET_PRS_ERR;
 }
 
 
@@ -584,12 +584,12 @@ enum act_return http_action_req_cache_use(struct act_rule *rule, struct proxy *p
 			appctx->st0 = HTTP_CACHE_INIT;
 			appctx->rule = rule;
 			appctx->ctx.cache.entry = res;
-			return ACT_RET_PRS_OK;
+			return ACT_RET_CONT;
 		} else {
-			return ACT_RET_PRS_ERR;
+			return ACT_RET_YIELD;
 		}
 	}
-	return ACT_RET_PRS_OK;
+	return ACT_RET_CONT;
 }
 
 
@@ -617,7 +617,7 @@ enum act_parse_ret parse_cache_use(const char **args, int *orig_arg, struct prox
 	return ACT_RET_PRS_OK;
 
 err:
-	return ACT_RET_ERR;
+	return ACT_RET_PRS_ERR;
 
 }