TurboCaching.h in passenger-5.1.5

- old
+ new

@@ -111,11 +111,11 @@
 			prep.age = 0;
 		}
 
 		prep.ageValueSize = integerSizeInOtherBase<time_t, 10>(prep.age);
 		prep.contentLengthStrSize = uintSizeAsString(entry.body->httpBodySize);
-		prep.showVersionInHeader = server->showVersionInHeader;
+		prep.showVersionInHeader = req->configCache->showVersionInHeader;
 	}
 
 	template<typename Server>
 	unsigned int buildResponseHeader(const ResponsePreparation &prep, Server *server,
 		char *output, unsigned int outputSize)
@@ -190,18 +190,19 @@
 	}
 
 public:
 	ResponseCache<Request> responseCache;
 
-	TurboCaching(State initialState = ENABLED)
-		: state(initialState),
-		  lastTimeout((ev_tstamp) time(NULL)),
-		  nextTimeout((ev_tstamp) time(NULL) + ENABLED_TIMEOUT)
-	{
-		if (initialState != ENABLED && initialState != DISABLED) {
-			throw RuntimeException("The initial turbocaching state may "
-				"only be ENABLED or DISABLED");
-		}
+	TurboCaching()
+		: state(ENABLED),
+		  lastTimeout(0),
+		  nextTimeout(0)
+		{ }
+
+	void initialize(bool initiallyEnabled) {
+		state = initiallyEnabled ? ENABLED : DISABLED;
+		lastTimeout = (ev_tstamp) time(NULL);
+		nextTimeout = (ev_tstamp) time(NULL) + ENABLED_TIMEOUT;
 	}
 
 	bool isEnabled() const {
 		return state == ENABLED;
 	}