Merge pull request #24 from CyberShadow/send-etag-anyway

milo · web-flow · commit f1a6a86f6e1b · 2018-12-11T12:41:00.000+01:00
CachedClient: Send If-None-Match even with Last-Modified
diff --git a/src/Github/Http/CachedClient.php b/src/Github/Http/CachedClient.php
@@ -77,7 +77,8 @@ public function request(Request $request)
 			/** @var $cached Response */
 			if ($cached->hasHeader('Last-Modified')) {
 				$request->addHeader('If-Modified-Since', $cached->getHeader('Last-Modified'));
-			} elseif ($cached->hasHeader('ETag')) {
+			}
+			if ($cached->hasHeader('ETag')) {
 				$request->addHeader('If-None-Match', $cached->getHeader('ETag'));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ public function request(Request $request)`
`77`	`77`	`/** @var $cached Response */`
`78`	`78`	`if ($cached->hasHeader('Last-Modified')) {`
`79`	`79`	`$request->addHeader('If-Modified-Since', $cached->getHeader('Last-Modified'));`
`80`		`- } elseif ($cached->hasHeader('ETag')) {`
	`80`	`+ }`
	`81`	`+ if ($cached->hasHeader('ETag')) {`
`81`	`82`	`$request->addHeader('If-None-Match', $cached->getHeader('ETag'));`
`82`	`83`	`}`
`83`	`84`	`}`