summaryrefslogtreecommitdiffstats
path: root/admin/survey/minify/lib/HTTP/ConditionalGet.php
diff options
context:
space:
mode:
Diffstat (limited to 'admin/survey/minify/lib/HTTP/ConditionalGet.php')
-rw-r--r--admin/survey/minify/lib/HTTP/ConditionalGet.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/survey/minify/lib/HTTP/ConditionalGet.php b/admin/survey/minify/lib/HTTP/ConditionalGet.php
index d81f8db..1ae37fb 100644
--- a/admin/survey/minify/lib/HTTP/ConditionalGet.php
+++ b/admin/survey/minify/lib/HTTP/ConditionalGet.php
@@ -128,8 +128,8 @@ class HTTP_ConditionalGet
$etagAppend = '';
if (isset($spec['encoding'])) {
$this->_stripEtag = true;
- $this->_headers['Vary'] = 'Accept-Encoding';
if ('' !== $spec['encoding']) {
+ $this->_headers['Vary'] = 'Accept-Encoding';
if (0 === strpos($spec['encoding'], 'x-')) {
$spec['encoding'] = substr($spec['encoding'], 2);
}
@@ -317,7 +317,7 @@ class HTTP_ConditionalGet
if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
return false;
}
- $clientEtagList = get_magic_quotes_gpc()
+ $clientEtagList = PHP_VERSION_ID < 50400 && get_magic_quotes_gpc()
? stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])
: $_SERVER['HTTP_IF_NONE_MATCH'];
$clientEtags = explode(',', $clientEtagList);