From 84c2ccf468296b5fce156ecb562768e98a7de113 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 14 Mar 2015 00:02:04 +0000
Subject: [PATCH] Issue #2092245 by jbrown, rpayanm: SVGZ isn't served with
 correct encoding

---
 .htaccess                                      |  4 ++++
 .../system/src/Tests/System/HtaccessTest.php   | 12 +++++++++++-
 core/modules/system/tests/logo.svgz            | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 core/modules/system/tests/logo.svgz

diff --git a/.htaccess b/.htaccess
index 479f923b0006..fd7bd2917ea9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,6 +24,10 @@ ErrorDocument 404 /index.php
 # Set the default handler.
 DirectoryIndex index.php index.html index.htm
 
+# Add correct encoding for SVGZ.
+AddType image/svg+xml svg svgz
+AddEncoding gzip svgz
+
 # Override PHP settings that cannot be changed at runtime. See
 # sites/default/default.settings.php and
 # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
diff --git a/core/modules/system/src/Tests/System/HtaccessTest.php b/core/modules/system/src/Tests/System/HtaccessTest.php
index 00e8ea7de6a1..94bfe2092d4b 100644
--- a/core/modules/system/src/Tests/System/HtaccessTest.php
+++ b/core/modules/system/src/Tests/System/HtaccessTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests access restrictions provided by the default .htaccess file.
+ * Tests .htaccess is working correctly.
  *
  * @group system
  */
@@ -68,4 +68,14 @@ protected function assertNoFileAccess($path) {
     $this->assertResponse(403);
   }
 
+  /**
+   * Tests that SVGZ files are served with Content-Encoding: gzip.
+   */
+  public function testSvgzContentEncoding() {
+    $this->drupalGet('core/modules/system/tests/logo.svgz');
+    $this->assertResponse(200);
+    $header = $this->drupalGetHeader('Content-Encoding');
+    $this->assertEqual($header, 'gzip');
+  }
+
 }
diff --git a/core/modules/system/tests/logo.svgz b/core/modules/system/tests/logo.svgz
new file mode 100644
index 000000000000..a91a1391fb26
--- /dev/null
+++ b/core/modules/system/tests/logo.svgz
@@ -0,0 +1,18 @@
+‹‘šáTlogo.svg�}—Ër$·E÷þ
+D{] ñvˆZhZ3C†z!RCy¾Þç&Š”Ã!;ìBU
ù¼y3뇧oßnŸŸî.ÏÏ_ÿñîÝËËK|)ñËoßYJé;.áåñ—燻K—ððþñãÃóÝ¥÷Køöøþå§/Ü]êȱ…ÚGh#èÍûÏ÷?ßÞ?ß_ýøÛ—ß?ÿrwùüþ%ü÷¾øzÿü¾|½¿>>ÿëîí><Þnw—¿—¤¿Kàä?›MŽµTãêíšBî±—z䳕`#öÜöX}½É)Ú
+éÈ+ÎU›•Ã8?æ‘kÌ}ÜbOíˆÉÆ5Ç’KÈ1/%–,¶F¬©j™±8ŽÁÞ^C‹½rlŽÝPGëÁ¸ä.µyëqY“X4J?ÏדŔ‹Ì™Cç¶äv=°Ü¶¡„ö”rƇq¦yé·;:ë�CÔ°³1óŸ§lq#k«nú-ÖÊå*Ÿhuü/¹†ÉA{½±†!ãûåÝ™‘3	>|83âCË$")b)õˆNƒ¸4V³ÄÖ§¼b˧~»~jÕë%¢ˆÔqÔEçVkS“ÁæÈëÉ[ìxS¹ÎÌ¿"Ó‹‡ÃWOz W®îÊ»Ôy3ȇOSK)_O„¥éýèÇiãTÊ´”Ðy¸kr#±ž7˜T¦^wYÉòû'%¼‚s³«üîXGDÕ…úËS
@JÀ)…N¸d^.ƒD$\Ý¡$‚;8«¸
+h1ãc"¬¦%з*LšÈs¡
+˜@ã^ðeGG‰Êð1(Jh«LEê²kÚñ-/âT2±Xq‰Røf²¡kø¦6øµ©
+ËŸÈù«Z¾¿¿-äD=†º°°
+÷3cf.*‰„CYð÷‚
/*˜ð
+·$„S(ª<ù§
+RDADï*åÖ*]¹Ør½ªs„Ïš¯<-€Sh*”À¡:({‰ E\&Wƒ.ô¬£ŒèOn`’‘	Ï-{‰¡Ññ ÝEe Hè6Cƒë\'cµÈ§JÖ™i1�
MæÅBŸÂï~
+¥-oòB
+J¨ü�4.aÙ&!¤H†ÍyS†Ümáèl
Y¼2º/V©ßm»n7–0( JŒ&ï#¸LH„Êñ`ÉjbÃ9»À¼„r˜¦/ÙŽA¸ÊöÔU––ì	L“Œ]’Öƒ�©Í‹Cë"ꃳDæýW©ðt%E·f"½à¤‡ˆX)[ÓK!ºwÓ%Ú¨œšŒÅÊÖæWH»Zû+´¶?;O)'ZÕ)T+¶2¯Ãú.TÒY{Ýü{R*Vƒ,RŒ
±*ÔE¨€ª,¡Šð¼§3xqÙZšrۍGDïQA¯'ü
¥xTÁ–Þ)6··5:X)ÇŸ’!ÇWFÐàžpv^áÇ:¥Æ1e	oÏÃãõ&7OL¯î*î Ø{í&Çýl¢Ÿ
euZÙZfWìeóµ€D…xûr¯²‚²òôþÕ¾B˜©TJ½¢«Q,P˜:3ž–×õt»“0!j‚û95(

«i¯¢	‘d!ÀÎZU¿Y¼˜À/œÕ_Af
+¤¦~¿{öh{
ô‡sõ¦N4å~_Ò”f?û1Áó”å\ƒ¼Å«ácG±³Y£uH-â\Ãbˆ÷2Ûµ˜UYrºÂ"Y}­È…)ѳ·³iàDRâòÒzT™	ýx³é–ªhœKyd¥^*uÅ…Rà$2CÅ[-ï5Á>ùàYÒtÑœon
+­´ÎkVNM
X
+8Îþ™öAWY[²+w5ª&´,uE±yMªýîSß¼»¥2H}WÏ4Uˆ^–Šâäûÿuû6¬Ô%ödÌÝcŠû|Ž›g@)E_áŽÈ>nø®ì=
jž±³ãåMÄ»jAÖ¹Ý}Os–ÛC‘-%¿Ê#îUŒ¥¶SD²
+!ƒÉQ­ÆCÌ‚?Ðvç³iBQu¹°k¼šù	 hèôA‚:$ØnTZWE!ŒJÏðŽcR³›kýŸƒÝÆ*3;L“U
+2áÍîæÔ;ò›îÝ´ÛTÖk-k|½ø¥	Jv$¤]:ÉiJÓêª>Ö=Bf¡¿o™>ìdó9F&¾ßMÉi£ú¼Í·³Aƒ[7³eš›˜Þñì)”lP烎9<÷š‰ˆšÛs’°‡)
[ÞwÕ
“ªÝßaŠ6—qŽC2Rs éDxezO¡x9ëY“ö=Îiç€*‘>º
+èò ïÉקM‘¢<•ñÔÀ«¶CMJØ™úH 5Q­V䍢N·5¨š
+ÆÈKÏiíÕè|´¯R°÷8âéƒûTêlÙÏ¥ÚN÷!]>bUáQmšŠÉò»:&¬é㼦
\z› ­W¢xjŠH³zå8Î6çoMàoUÜß7éùʁDô¡‘Ã'‘–§ÊE>›ºP%QŁI'=Nç	}¹þø·>Óô1â��
\ No newline at end of file
-- 
GitLab