[6.0] 18bf1d491 Move cache.h changes to the bottom

Reza Naghibi reza at naghibi.com
Wed Aug 26 16:27:06 UTC 2020


commit 18bf1d491bf857f05b703c29f690d1be33a9bddc
Author: Reza Naghibi <reza at naghibi.com>
Date:   Wed Aug 26 12:25:48 2020 -0400

    Move cache.h changes to the bottom

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 95d6d97b1..5cff79beb 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -390,8 +390,7 @@ struct busyobj {
 	 * All fields from retries and down are zeroed when the busyobj
 	 * is recycled.
 	 */
-	unsigned		retries;
-	enum req_body_state_e	initial_req_body_status;
+	int			retries;
 	struct req		*req;
 	struct sess		*sp;
 	struct worker		*wrk;
@@ -403,7 +402,6 @@ struct busyobj {
 	struct http		*bereq0;
 	struct http		*bereq;
 	struct http		*beresp;
-	struct objcore		*bereq_body;
 	struct objcore		*stale_oc;
 	struct objcore		*fetch_objcore;
 
@@ -439,6 +437,9 @@ struct busyobj {
 
 	uint16_t		err_code;
 	const char		*err_reason;
+
+	enum req_body_state_e	initial_req_body_status;
+	struct objcore		*bereq_body;
 };
 
 


More information about the varnish-commit mailing list