Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

2018-10-24 10:03:11 -04:00 · 2018-10-24 10:03:11 -04:00 · 6488122862
parent 115141bf9f 18850d8779
commit 6488122862
1 changed files with 3 additions and 0 deletions
--- a/web/api/lib/Cake/Network/CakeResponse.php
+++ b/web/api/lib/Cake/Network/CakeResponse.php
@ -1168,6 +1168,9 @@ class CakeResponse {
 		if ($modifiedSince) {
 			$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
 		}
+		if (!isset($etagMatches, $timeMatches)) {
+		return false;
+		}
 		$checks = compact('etagMatches', 'timeMatches');
 		if (empty($checks)) {
 			return false;