Prep for 2.1.3

HTTP_ConditionalGet: no more "must-revalidate"
HTTP_Encoder: prefers gzip over deflate
Minify: no more deflate encoding
File cache works w/o setting $min_cachePath
Minify_Source: + public $contentType

HISTORY.txt

@@ -1,5 +1,17 @@
 Minify Release History
 
+Version 2.1.3
+    * HTTP fixes
+      * ETag generation now valid (different when gzipped)
+      * Vary header always sent when Accept-Encoding is sniffed
+      * Cache-Control no longer has "must-revalidate" due to webkit bug
+        See: http://mrclay.org/index.php/2009/02/24/safari-4-beta-cache-controlmust-revalidate-bug/
+      * Dropped deflate encoding. Browser and proxy support could be buggy.
+        See: http://stackoverflow.com/questions/883841/
+    * File cache now works w/o setting $min_cachePath
+    * Allow setting contentType in Minify_Source objects
+    * No more 5.3 deprecation warnings: split() removed
+
 Version 2.1.2
     * Javascript fixes
       * Debug mode no longer confused by "*/*" in strings/RegExps (jQuery)

min/builder/index.php

@@ -1,5 +1,9 @@
 <?php 
 
+if (phpversion() < 5) {
+    exit('Minify requires PHP5 or greater.');
+}
+
 // check for auto-encoding
 $encodeOutput = (function_exists('gzdeflate')
                  && !ini_get('zlib.output_compression'));

min/index.php

@@ -19,7 +19,7 @@ require 'Minify.php';
 
 Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
 Minify::setCache(
-    isset($min_cachePath) ? $min_cachePath : null
+    isset($min_cachePath) ? $min_cachePath : ''
     ,$min_cacheFileLocking
 );
 

min/lib/HTTP/ConditionalGet.php

@@ -150,7 +150,7 @@ class HTTP_ConditionalGet {
         } elseif (isset($spec['contentHash'])) { // Use the hash as the ETag
             $this->_setEtag($spec['contentHash'] . $etagAppend, $scope);
         }
-        $this->_headers['Cache-Control'] = "max-age={$maxAge}, {$scope}, must-revalidate";
+        $this->_headers['Cache-Control'] = "max-age={$maxAge}, {$scope}";
         // invalidate cache if disabled, otherwise check
         $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate'])
             ? false
@@ -166,7 +166,7 @@ class HTTP_ConditionalGet {
      * Otherwise something like: 
      * <code>
      * array(
-     *     'Cache-Control' => 'max-age=0, public, must-revalidate'
+     *     'Cache-Control' => 'max-age=0, public'
      *     ,'ETag' => '"foobar"'
      * )
      * </code>
@@ -306,7 +306,7 @@ class HTTP_ConditionalGet {
         $clientEtagList = get_magic_quotes_gpc()
             ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])
             : $_SERVER['HTTP_IF_NONE_MATCH'];
-        $clientEtags = split(',', $clientEtagList);
+        $clientEtags = explode(',', $clientEtagList);
         
         $compareTo = $this->normalizeEtag($this->_etag);
         foreach ($clientEtags as $clientEtag) {

min/lib/HTTP/Encoder.php

@@ -178,16 +178,19 @@ class HTTP_Encoder {
      * this will return ('', ''), the "identity" encoding.
      * 
      * A syntax-aware scan is done of the Accept-Encoding, so the method must
-     * be non 0. The methods are favored in order of deflate, gzip, then 
+     * be non 0. The methods are favored in order of gzip, deflate, then 
-     * compress. deflate is always smallest and generally faster!
+     * compress. Deflate is always smallest and generally faster, but is 
+     * rarely sent by servers, so client support could be buggier.
      * 
-     * @param bool $allowCompress allow the older compress encoding
+     * @param bool $allowCompress allow the older compress encoding
+     * 
+     * @param bool $allowDeflate allow the more recent deflate encoding
      * 
      * @return array two values, 1st is the actual encoding method, 2nd is the
      * alias of that method to use in the Content-Encoding header (some browsers
      * call gzip "x-gzip" etc.)
      */
-    public static function getAcceptedEncoding($allowCompress = true)
+    public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true)
     {
         // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
         
@@ -197,23 +200,31 @@ class HTTP_Encoder {
             return array('', '');
         }
         $ae = $_SERVER['HTTP_ACCEPT_ENCODING'];
-        $aeRev = strrev($ae);
+        // gzip checks (quick)
-        // Fast tests for common AEs. If these don't pass we have to do 
+        if (0 === strpos($ae, 'gzip,')             // most browsers
-        // slow regex parsing
+            || 0 === strpos($ae, 'deflate, gzip,') // opera
-        if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit
+        ) {
-            || 0 === strpos($aeRev, 'etalfed,') // gecko
+            return array('gzip', 'gzip');
-            || 0 === strpos($ae, 'deflate,') // opera 9.5b
-            // slow parsing
-            || preg_match(
-                '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) {
-            return array('deflate', 'deflate');
         }
+        // gzip checks (slow)
         if (preg_match(
                 '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
                 ,$ae
                 ,$m)) {
             return array('gzip', $m[1]);
         }
+        if ($allowDeflate) {
+            // deflate checks    
+            $aeRev = strrev($ae);
+            if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit
+                || 0 === strpos($aeRev, 'etalfed,') // gecko
+                || 0 === strpos($ae, 'deflate,') // opera
+                // slow parsing
+                || preg_match(
+                    '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) {
+                return array('deflate', 'deflate');
+            }
+        }
         if ($allowCompress && preg_match(
                 '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
                 ,$ae

min/lib/Minify.php

@@ -29,7 +29,7 @@ require_once 'Minify/Source.php';
  */
 class Minify {
     
-    const VERSION = '2.2.0';
+    const VERSION = '2.1.3';
     const TYPE_CSS = 'text/css';
     const TYPE_HTML = 'text/html';
     // there is some debate over the ideal JS Content-Type, but this is the
@@ -100,7 +100,7 @@ class Minify {
      * 
      * 'encodeMethod' : generally you should let this be determined by 
      * HTTP_Encoder (leave null), but you can force a particular encoding
-     * to be returned, by setting this to 'gzip', 'deflate', or '' (no encoding)
+     * to be returned, by setting this to 'gzip' or '' (no encoding)
      * 
      * 'encodeLevel' : level of encoding compression (0 to 9, default 9)
      * 
@@ -210,8 +210,8 @@ class Minify {
                 require_once 'HTTP/Encoder.php';
                 // depending on what the client accepts, $contentEncoding may be 
                 // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling
-                // getAcceptedEncoding() with false leaves out compress as an option.
+                // getAcceptedEncoding(false, false) leaves out compress and deflate as options.
-                list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false);
+                list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false, false);
             }
         } else {
             self::$_options['encodeMethod'] = ''; // identity (no encoding)
@@ -267,12 +267,9 @@ class Minify {
             // output the content, as they do not require ever loading the file into
             // memory.
             $cacheId = 'minify_' . self::_getCacheId();
-            $encodingExtension = self::$_options['encodeMethod']
+            $fullCacheId = (self::$_options['encodeMethod'])
-                ? ('deflate' === self::$_options['encodeMethod']
+                ? $cacheId . '.gz'
-                    ? '.zd'
+                : $cacheId;
-                    : '.zg')
-                : '';
-            $fullCacheId = $cacheId . $encodingExtension;
             // check cache for valid entry
             $cacheIsReady = self::$_cache->isValid($fullCacheId, self::$_options['lastModifiedTime']); 
             if ($cacheIsReady) {
@@ -281,9 +278,8 @@ class Minify {
                 // generate & cache content
                 $content = self::_combineMinify();
                 self::$_cache->store($cacheId, $content);
-                if (function_exists('gzdeflate')) {
+                if (function_exists('gzencode')) {
-                    self::$_cache->store($cacheId . '.zd', gzdeflate($content, self::$_options['encodeLevel']));
+                    self::$_cache->store($cacheId . '.gz', gzencode($content, self::$_options['encodeLevel']));
-                    self::$_cache->store($cacheId . '.zg', gzencode($content, self::$_options['encodeLevel']));
                 }
             }
         } else {
@@ -293,9 +289,7 @@ class Minify {
         }
         if (! $cacheIsReady && self::$_options['encodeMethod']) {
             // still need to encode
-            $content = ('deflate' === self::$_options['encodeMethod'])
+            $content = gzencode($content, self::$_options['encodeLevel']);
-                ? gzdeflate($content, self::$_options['encodeLevel'])
-                : gzencode($content, self::$_options['encodeLevel']);
         }
         
         // add headers
@@ -374,11 +368,11 @@ class Minify {
         if (isset($_SERVER['SERVER_SOFTWARE'])
             && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/')
         ) {
-            $_SERVER['DOCUMENT_ROOT'] = substr(
+            $_SERVER['DOCUMENT_ROOT'] = rtrim(substr(
                 $_SERVER['PATH_TRANSLATED']
                 ,0
                 ,strlen($_SERVER['PATH_TRANSLATED']) - strlen($_SERVER['SCRIPT_NAME'])
-            );
+            ), '\\');
             if ($unsetPathInfo) {
                 unset($_SERVER['PATH_INFO']);
             }

min/lib/Minify/CSS/UriRewriter.php

@@ -265,9 +265,6 @@ class Minify_CSS_UriRewriter {
         if ($realPath !== false) {
             $path = $realPath;
         }
-        $last = $path[strlen($path) - 1];
+        return rtrim($path, '/\\');
-        return ($last === '/' || $last === '\\')
-            ? substr($path, 0, strlen($path) - 1)
-            : $path;
     }
 }

min/lib/Minify/Cache/File.php

@@ -110,6 +110,16 @@ class Minify_Cache_File {
         }
     }
     
+    /**
+     * Fetch the cache path used
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->_path;
+    }
+    
     private $_path = null;
     private $_locking = null;
 }

min/lib/Minify/Source.php

@@ -35,6 +35,11 @@ class Minify_Source {
      */
     public $filepath = null;
     
+    /**
+     * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*)
+     */
+    public $contentType = null;
+    
     /**
      * Create a Minify_Source
      * 
@@ -54,6 +59,17 @@ class Minify_Source {
             if (0 === strpos($spec['filepath'], '//')) {
                 $spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1);
             }
+            $segments = explode('.', $spec['filepath']);
+            $ext = strtolower(array_pop($segments));
+            switch ($ext) {
+            case 'js'   : $this->contentType = 'application/x-javascript';
+                          break;
+            case 'css'  : $this->contentType = 'text/css';
+                          break;
+            case 'htm'  : // fallthrough
+            case 'html' : $this->contentType = 'text/html';
+                          break;
+            }
             $this->filepath = $spec['filepath'];
             $this->_id = $spec['filepath'];
             $this->lastModified = filemtime($spec['filepath'])
@@ -70,6 +86,9 @@ class Minify_Source {
                 ? $spec['lastModified']
                 : time();
         }
+        if (isset($spec['contentType'])) {
+            $this->contentType = $spec['contentType'];
+        }
         if (isset($spec['minifier'])) {
             $this->minifier = $spec['minifier'];
         }
@@ -143,7 +162,7 @@ class Minify_Source {
     }
     
     /**
-     * Guess content type from the first filename extension available
+     * Get content type from a group of sources
      * 
      * This is called if the user doesn't pass in a 'contentType' options  
      * 
@@ -153,18 +172,9 @@ class Minify_Source {
      */
     public static function getContentType($sources)
     {
-        $exts = array(
-            'css' => Minify::TYPE_CSS
-            ,'js' => Minify::TYPE_JS
-            ,'html' => Minify::TYPE_HTML
-        );
         foreach ($sources as $source) {
-            if (null !== $source->filepath) {
+            if ($source->contentType !== null) {
-                $segments = explode('.', $source->filepath);
+                return $source->contentType;
-                $ext = array_pop($segments);
-                if (isset($exts[$ext])) {
-                    return $exts[$ext];
-                }
             }
         }
         return 'text/plain';

min_unit_tests/test_HTTP_ConditionalGet.php

@@ -19,7 +19,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime}\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'_responseCode' => 'HTTP/1.0 304 Not Modified'
                 ,'isValid' => true
             )
@@ -32,7 +32,7 @@ function test_HTTP_ConditionalGet()
             	'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime}\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'_responseCode' => 'HTTP/1.0 304 Not Modified'
                 ,'isValid' => true
             )
@@ -45,7 +45,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime}\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'_responseCode' => 'HTTP/1.0 304 Not Modified'
                 ,'isValid' => true
             )
@@ -58,7 +58,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime};gz\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'_responseCode' => 'HTTP/1.0 304 Not Modified'
                 ,'isValid' => true
             )
@@ -71,7 +71,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime};gz\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'isValid' => false
             )
         )
@@ -83,7 +83,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime};gz\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'isValid' => false
             )
         )
@@ -95,7 +95,7 @@ function test_HTTP_ConditionalGet()
                 'Vary' => 'Accept-Encoding'
             	,'Last-Modified' => $gmtTime
                 ,'ETag' => "\"pri{$lmTime};gz\""
-                ,'Cache-Control' => 'max-age=0, private, must-revalidate'
+                ,'Cache-Control' => 'max-age=0, private'
                 ,'isValid' => false
             )
         )

min_unit_tests/test_HTTP_Encoder.php

@@ -36,7 +36,7 @@ function test_HTTP_Encoder()
         ,array(
             'ua' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)'
             ,'ae' => 'gzip, deflate'
-            ,'exp' => array('deflate', 'deflate')
+            ,'exp' => array('gzip', 'gzip')
             ,'desc' => 'IE6 w/ "enhanced security"'
         )
         ,array(
@@ -48,7 +48,7 @@ function test_HTTP_Encoder()
         ,array(
             'ua' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.25'
             ,'ae' => 'gzip,deflate'
-            ,'exp' => array('deflate', 'deflate')
+            ,'exp' => array('gzip', 'gzip')
             ,'desc' => 'Opera identifying as IE6'
         )
     );

min_unit_tests/test_Minify.php

@@ -29,7 +29,7 @@ function test_Minify()
             'Vary' => 'Accept-Encoding',
             'Last-Modified' => gmdate('D, d M Y H:i:s \G\M\T', $lastModified),
             'ETag' => "\"pub{$lastModified}\"",
-            'Cache-Control' => 'max-age=1800, public, must-revalidate',
+            'Cache-Control' => 'max-age=1800, public',
             '_responseCode' => 'HTTP/1.0 304 Not Modified',
         )
     );
@@ -70,7 +70,7 @@ function test_Minify()
             'Vary' => 'Accept-Encoding',
             'Last-Modified' => gmdate('D, d M Y H:i:s \G\M\T', $lastModified),
             'ETag' => "\"pub{$lastModified}\"",
-            'Cache-Control' => 'max-age=86400, public, must-revalidate',
+            'Cache-Control' => 'max-age=86400, public',
             'Content-Length' => strlen($content),
             'Content-Type' => 'application/x-javascript; charset=utf-8',
         )
@@ -185,7 +185,7 @@ function test_Minify()
             'Vary' => 'Accept-Encoding',
             'Last-Modified' => gmdate('D, d M Y H:i:s \G\M\T', $lastModified),
             'ETag' => "\"pub{$lastModified}\"",
-            'Cache-Control' => 'max-age=0, public, must-revalidate',
+            'Cache-Control' => 'max-age=0, public',
             'Content-Length' => strlen($expectedContent),
             'Content-Type' => 'text/css; charset=utf-8',
         )

min_unit_tests/test_Minify_Cache_File.php

@@ -13,6 +13,8 @@ function test_Minify_Cache_File()
     
     $cache = new Minify_Cache_File($minifyCachePath);
     
+    echo "NOTE: Minify_Cache_File : path is set to: '" . $cache->getPath() . "'.\n";
+    
     assertTrue(true === $cache->store($id, $data), $prefix . 'store');
     
     assertTrue(strlen($data) === $cache->getSize($id), $prefix . 'getSize');