Merge pull request yiisoft#6641 from DaSourcerer/HttpCache-etag-zero-…

…padding-removal Strip zero padding from ETag strings
XiongBing · Dec 24, 2014 · 840fe73 · 840fe73
2 parents 6e46ca0 + e288c54
commit 840fe73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -12,6 +12,7 @@ Yii Framework 2 Change Log
 - Enh #6467: `ActiveForm` will scroll to the nearest visible element when the first error input is hidden (newartix)
 - Enh #6488: Support changing `yii\base\Theme::basePath` during runtime (qiangxue)
 - Chg #6427: In case of invalid route web application now throws exception with "Page not found" instead of "Invalid Route" (cebe, samdark)
+- Chg #6641: removed zero padding from ETag strings (DaSourcerer)
 
 2.0.1 December 07, 2014
 -----------------------

diff --git a/framework/filters/HttpCache.php b/framework/filters/HttpCache.php
@@ -191,6 +191,6 @@ protected function sendCacheControlHeader()
      */
     protected function generateEtag($seed)
     {
-        return '"' . base64_encode(sha1($seed, true)) . '"';
+        return '"' . rtrim(base64_encode(sha1($seed, true)), '=') . '"';
     }
 }