Merge pull request #1024 from ezsystems/ezp-23107_custom_headers_semi…

…colon Fix EZP-23107: Custom headers break if header value contains semicolons
ezsystems · Jul 17, 2014 · 2ad2127 · 2ad2127
2 parents 0455a8e + 9f807b8
commit 2ad2127
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/kernel/classes/ezhttpheader.php b/kernel/classes/ezhttpheader.php
@@ -113,7 +113,10 @@ static function headerOverrideArray( $uri )
 
                 if ( strpos( $uriString, $path ) === 0 )
                 {
-                    @list( $headerValue, $depth, $level ) = explode( ';', $value );
+                    $config = eZStringUtils::explodeStr( $value, ';' );
+                    $headerValue = $config[0];
+                    $depth = isset( $config[1] ) ? $config[1] : null;
+                    $level = isset( $config[2] ) ? $config[2] : null;
 
                     if ( $header == 'Expires' )
                     {

diff --git a/settings/site.ini b/settings/site.ini
@@ -1482,6 +1482,7 @@ HeaderList[]=Expires
 # Default Cache-Control header
 # HTTP Headers are specified using the following format :
 # <HTTP header>[<eZ Publish path|module{/view}>]=<value>{;<depth>{;<level>}}
+# Note: to use a semicolon in the value, you need to escape it with a backslash.
 #
 # Example :
 # # Set Pragma HTTP header to no-cache for whole site, except /news, and 2 levels below news.