Version 3.4.5

2025-12-19 00:38:12 -08:00
1 parent fb6b5baabc
commit e4478369d8
@@ -1,132 +1,64 @@
-The files in this directory represent the default Minify setup designed to ease
-integration with your site. This app will combine and minify your Javascript or
-CSS files and serve them with HTTP compression and cache headers.
+WELCOME TO MINIFY!
+
+Minify is an HTTP content server. It compresses sources of content 
+(usually files), combines the result and serves it with appropriate 
+HTTP headers. These headers can allow clients to perform conditional 
+GETs (serving content only when clients do not have a valid cache) 
+and tell clients to cache the file for a period of time. 
+More info: http://code.google.com/p/minify/


-RECOMMENDED
+WORDPRESS USER?

-It's recommended to edit config.php to set $min_cachePath to a writeable
-(by PHP) directory on your system. This will improve performance.
+These WP plugins integrate Minify into WordPress's style and script hooks to
+get you set up faster.
+  http://wordpress.org/extend/plugins/bwp-minify/
+  http://wordpress.org/extend/plugins/w3-total-cache/


-GETTING STARTED
+INSTALLATION

-The quickest way to get started is to use the Minify URI Builder application
-on your website: http://example.com/min/builder/
+Place the /min/ directory as a child of your DOCUMENT_ROOT
+directory: i.e. you will have: /home/example/www/min


-MINIFYING A SINGLE FILE
+CONFIGURATION & USAGE

-Let's say you want to serve this file:
-  http://example.com/wp-content/themes/default/default.css
+See the MIN.txt file and http://code.google.com/p/minify/wiki/UserGuide

-Here's the "Minify URL" for this file:
-  http://example.com/min/?f=wp-content/themes/default/default.css
+Minify also comes with a URI Builder application that can help you write URLs
+for use with Minify or configure groups of files.

-In other words, the "f" argument is set to the file path from root without the 
-initial "/". As CSS files may contain relative URIs, Minify will automatically
-"fix" these by rewriting them as root relative.
+To enable this, edit min/config.php, set $min_enableBuilder = true; and visit
+  http://example.org/min/builder/
+
+When you're finished with this, please set $min_enableBuilder = false;


-COMBINING MULTIPLE FILES IN ONE DOWNLOAD
+UPGRADING

-Separate the paths given to "f" with commas.
-
-Let's say you have CSS files at these URLs:
-  http://example.com/scripts/jquery-1.2.6.js
-  http://example.com/scripts/site.js
-
-You can combine these files through Minify by requesting this URL:
-  http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js
+See UPGRADING.txt for instructions.


-SIMPLIFYING URLS WITH A BASE PATH
+UNIT TESTING:

-If you're combining files that share the same ancestor directory, you can use
-the "b" argument to set the base directory for the "f" argument. Do not include
-the leading or trailing "/" characters.
+1. Place the /min_unit_tests/ directory as a child of your DOCUMENT_ROOT 
+directory: i.e. you will have: /home/example/www/min_unit_tests

-E.g., the following URLs will serve the exact same content:
-  http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js,scripts/home.js
-  http://example.com/min/?b=scripts&f=jquery-1.2.6.js,site.js,home.js
+2. To run unit tests, access: http://example.org/min_unit_tests/test_all.php
+
+(If you wish, the other test_*.php files can be run to test individual
+components with more verbose output.)
+
+3. Remove /min_unit_tests/ from your DOCUMENT_ROOT when you are done.


-MINIFY URLS IN HTML
+FILE ENCODINGS

-In (X)HTML files, don't forget to replace any "&" characters with "&amp;".
+Minify *should* work fine with files encoded in UTF-8 or other 8-bit 
+encodings like ISO 8859/Windows-1252. By default Minify appends
+";charset=utf-8" to the Content-Type headers it sends. 

+Leading UTF-8 BOMs are stripped from all sources to prevent 
+duplication in output files, and files are converted to Unix newlines.

-SPECIFYING ALLOWED DIRECTORIES
-
-By default, Minify will serve any *.css/*.js files within the DOCUMENT_ROOT. If
-you'd prefer to limit Minify's access to certain directories, set the 
-$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit 
-to the /js and /themes/default directories, use:
-
-$min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default');
-
-
-GROUPS: FASTER PERFORMANCE AND BETTER URLS
-
-For the best performance, edit groupsConfig.php to pre-specify groups of files 
-to be combined under preset keys. E.g., here's an example configuration in 
-groupsConfig.php:
-
-return array(
-    'js' => array('//js/Class.js', '//js/email.js')
-);
-
-This pre-selects the following files to be combined under the key "js":
-  http://example.com/js/Class.js
-  http://example.com/js/email.js
-  
-You can now serve these files with this simple URL:
-  http://example.com/min/?g=js
-  
-
-GROUPS: SPECIFYING FILES OUTSIDE THE DOC_ROOT
-
-In the groupsConfig.php array, the "//" in the file paths is a shortcut for
-the DOCUMENT_ROOT, but you can also specify paths from the root of the filesystem
-or relative to the DOC_ROOT: 
-
-return array(
-    'js' => array(
-        '//js/file.js'            // file within DOC_ROOT
-        ,'//../file.js'           // file in parent directory of DOC_ROOT
-        ,'C:/Users/Steve/file.js' // file anywhere on filesystem
-    )
-);
-
-
-FAR-FUTURE EXPIRES HEADERS
-
-Minify can send far-future (one year) Expires headers. To enable this you must
-add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234) 
-and alter it whenever a source file is changed. If you have a build process you 
-can use a build/source control revision number.
-
-If you serve files as a group, you can use the utility function Minify_groupUri()
-to get a "versioned" Minify URI for use in your HTML. E.g.:
-
-<?php
-// add /min/lib to your include_path first!
-require $_SERVER['DOCUMENT_ROOT'] . '/min/utils.php';
-
-$jsUri = Minify_groupUri('js'); 
-echo "<script type='text/javascript' src='{$jsUri}'></script>";
-
-
-DEBUG MODE
-
-In debug mode, instead of compressing files, Minify sends combined files with
-comments prepended to each line to show the line number in the original source
-file. To enable this, set $min_allowDebugFlag to true in config.php and append
-"&debug=1" to your URIs. E.g. /min/?f=script1.js,script2.js&debug=1
-
-Known issue: files with comment-like strings/regexps can cause problems in this mode.
-
-
-QUESTIONS?
-
-http://groups.google.com/group/minify
@@ -1,35 +1,38 @@
+/*!
+ * Minify URI Builder
+ */
 var MUB = {
-    _uid : 0
-    ,_minRoot : '/min/?'
-    ,checkRewrite : function () {
+    _uid : 0,
+    _minRoot : '/min/?',
+    checkRewrite : function () {
        var testUri = location.pathname.replace(/\/[^\/]*$/, '/rewriteTest.js').substr(1);
        function fail() {
            $('#minRewriteFailed')[0].className = 'topNote';
-        };
+        }
        $.ajax({
-            url : '../f=' + testUri + '&' + (new Date()).getTime()
-            ,success : function (data) {
+            url : '../f=' + testUri + '&' + (new Date()).getTime(),
+            success : function (data) {
                if (data === '1') {
                    MUB._minRoot = '/min/';
                    $('span.minRoot').html('/min/');
                } else
                    fail();                
-            }
-            ,error : fail
+            },
+            error : fail
        });
-    }
+    },
    /**
     * Get markup for new source LI element
     */
-    ,newLi : function () {
-        return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' 
-        + ' <button title="Remove">x</button> <button title="Include Earlier">&uarr;</button>'
-        + ' <button title="Include Later">&darr;</button> <span></span></li>';/*noLibHook*/
-    }
+    newLi : function () {
+        return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' +
+        ' <button title="Remove">x</button> <button title="Include Earlier">&uarr;</button>' +
+        ' <button title="Include Later">&darr;</button> <span></span></li>';
+    },
    /**
     * Add new empty source LI and attach handlers to buttons
     */
-    ,addLi : function () {
+    addLi : function () {
        $('#sources').append(MUB.newLi());
        var li = $('#li' + MUB._uid)[0];
        $('button[title=Remove]', li).click(function () {
@@ -58,22 +61,22 @@ var MUB = {
            });
        });
        ++MUB._uid;
-    }
+    },
    /**
     * In the context of a source LI element, this will analyze the URI in
     * the INPUT and check the URL on the site.
     */
-    ,liUpdateTestLink : function () { // call in context of li element
+    liUpdateTestLink : function () { // call in context of li element
        if (! $('input', this)[0].value) 
            return;
        var li = this;
        $('span', this).html('');
-        var url = 'http://' + location.host + '/' 
-                + $('input', this)[0].value.replace(/^\//, '');
+        var url = 'http://' + location.host + '/' +
+                $('input', this)[0].value.replace(/^\//, '');
        $.ajax({
-            url : url
-            ,complete : function (xhr, stat) {
-                if ('success' == stat)
+            url : url,
+            complete : function (xhr, stat) {
+                if ('success' === stat)
                    $('span', li).html('&#x2713;');
                else {
                    $('span', li).html('<button><b>404! </b> recheck</button>')
@@ -81,16 +84,16 @@ var MUB = {
                            MUB.liUpdateTestLink.call(li);
                        });
                }
-            }
-            ,dataType : 'text'
+            },
+            dataType : 'text'
        });
-    }
+    },
    /**
     * Check all source URLs
     */
-    ,updateAllTestLinks : function () {
+    updateAllTestLinks : function () {
        $('#sources li').each(MUB.liUpdateTestLink);
-    }
+    },
    /**
     * In a given array of strings, find the character they all have at
     * a particular index
@@ -98,25 +101,25 @@ var MUB = {
     * @param Number pos index to check
     * @return mixed a common char or '' if any do not match
     */
-    ,getCommonCharAtPos : function (arr, pos) {
-        var i
-           ,l = arr.length
-           ,c = arr[0].charAt(pos);
+    getCommonCharAtPos : function (arr, pos) {
+        var i,
+            l = arr.length,
+            c = arr[0].charAt(pos);
        if (c === '' || l === 1)
            return c;
        for (i = 1; i < l; ++i)
            if (arr[i].charAt(pos) !== c)
                return '';
        return c;
-    }
+    },
    /**
     * Get the shortest URI to minify the set of source files
     * @param Array sources URIs
     */
-    ,getBestUri : function (sources) {
-        var pos = 0
-           ,base = ''
-           ,c;
+    getBestUri : function (sources) {
+        var pos = 0,
+            base = '',
+            c;
        while (true) {
            c = MUB.getCommonCharAtPos(sources, pos);
            if (c === '')
@@ -129,29 +132,28 @@ var MUB = {
        var uri = MUB._minRoot + 'f=' + sources.join(',');
        if (base.charAt(base.length - 1) === '/') {
            // we have a base dir!
-            var basedSources = sources
-               ,i
-               ,l = sources.length;
+            var basedSources = sources,
+                i,
+                l = sources.length;
            for (i = 0; i < l; ++i) {
                basedSources[i] = sources[i].substr(base.length);
            }
            base = base.substr(0, base.length - 1);
            var bUri = MUB._minRoot + 'b=' + base + '&f=' + basedSources.join(',');
            //window.console && console.log([uri, bUri]);
-            uri = uri.length < bUri.length
-                ? uri
-                : bUri;
+            uri = uri.length < bUri.length ? uri : bUri;
        }
        return uri;
-    }
+    },
    /**
     * Create the Minify URI for the sources
     */
-    ,update : function () {
+    update : function () {
        MUB.updateAllTestLinks();
-        var sources = []
-           ,ext = false
-           ,fail = false;
+        var sources = [],
+            ext = false,
+            fail = false,
+            markup;
        $('#sources input').each(function () {
            var m, val;
            if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) {
@@ -163,7 +165,7 @@ var MUB = {
                    return alert('extensions must match!');
                }
                this.value = this.value.replace(/^\//, '');
-                if (-1 != $.inArray(this.value, sources)) {
+                if (-1 !== $.inArray(this.value, sources)) {
                    fail = true;
                    return alert('duplicate file!');
                }
@@ -173,35 +175,37 @@ var MUB = {
        if (fail || ! sources.length)
            return;
        $('#groupConfig').val("    'keyName' => array('//" + sources.join("', '//") + "'),");
-        var uri = MUB.getBestUri(sources)
-           ,uriH = uri.replace(/</, '&lt;').replace(/>/, '&gt;').replace(/&/, '&amp;');
+        var uri = MUB.getBestUri(sources),
+            uriH = uri.replace(/</, '&lt;').replace(/>/, '&gt;').replace(/&/, '&amp;');
        $('#uriA').html(uriH)[0].href = uri;
-        $('#uriHtml').val(
-            ext === 'js' 
-            ? '<script type="text/javascript" src="' + uriH + '"></script>'
-            : '<link type="text/css" rel="stylesheet" href="' + uriH + '" />'
-        );
+        if (ext === 'js') {
+            markup = '<script type="text/javascript" src="' + uriH + '"></script>';
+        } else {
+            markup = '<link type="text/css" rel="stylesheet" href="' + uriH + '" />';
+        }
+        $('#uriHtml').val(markup);
        $('#results').show();
-    }
+    },
    /**
     * Handler for the "Add file +" button
     */
-    ,addButtonClick : function () {
+    addButtonClick : function () {
        $('#results').hide();
        MUB.addLi();
        MUB.updateAllTestLinks();
        $('#update').show().click(MUB.update);
        $('#sources li:last input')[0].focus();
-    }
+    },
    /**
     * Runs on DOMready
     */
-    ,init : function () {
+    init : function () {
+        $('#jsDidntLoad').remove();
        $('#app').show();
        $('#sources').html('');
        $('#add button').click(MUB.addButtonClick);
        // make easier to copy text out of
-        $('#uriHtml, #groupConfig').click(function () {
+        $('#uriHtml, #groupConfig, #symlinkOpt').click(function () {
            this.select();
        }).focus(function () {
            this.select();
@@ -210,33 +214,47 @@ var MUB = {
        if (location.hash) {
            // make links out of URIs from bookmarklet
            $('#getBm').hide();
-            $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>'
-                + location.hash.substr(1).split(',').join('</a> | /<a href=#>')
-                + '</a></p>'
-            );
+            var i = 0, found = location.hash.substr(1).split(','), l = found.length;
+            $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /</p>');
+            var $p = $('#bmUris p');
+            for (; i < l; i++) {
+                $p.append($('<a href=#></a>').text(found[i])[0]);
+                if (i < (l - 1)) {
+                    $p.append(', /');
+                }
+            }
            $('#bmUris a').click(function () {
                MUB.addButtonClick();
-                $('#sources li:last input').val(this.innerHTML)
+                $('#sources li:last input').val(this.innerHTML);
                MUB.liUpdateTestLink.call($('#sources li:last')[0]);
                $('#results').hide();
                return false;
            }).attr({title:'Add file +'});
        } else {
-            // copy bookmarklet code into href
-            var bmUri = location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1);
+            // setup bookmarklet 1
            $.ajax({
-                url : '../?f=' + bmUri
-                ,success : function (code) {
+                url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1),
+                success : function (code) {
                    $('#bm')[0].href = code
                        .replace('%BUILDER_URL%', location.href)
                        .replace(/\n/g, ' ');
-                }
-                ,dataType : 'text'
+                },
+                dataType : 'text'
            });
-            $.browser.msie && $('#getBm p:last').append(' Sorry, not supported in MSIE!');
+            if ($.browser.msie) {
+                $('#getBm p:last').append(' Sorry, not supported in MSIE!');
+            }
            MUB.addButtonClick();
        }
+        // setup bookmarklet 2
+        $.ajax({
+            url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm2.js').substr(1),
+            success : function (code) {
+                $('#bm2')[0].href = code.replace(/\n/g, ' ');
+            },
+            dataType : 'text'
+        });
        MUB.checkRewrite();
    }
 };
-window.onload = MUB.init;
+$(MUB.init);
@@ -8,20 +8,55 @@ if (phpversion() < 5) {
 $encodeOutput = (function_exists('gzdeflate')
                 && !ini_get('zlib.output_compression'));

-require dirname(__FILE__) . '/../config.php';/*noLibHook*/
+// recommend $min_symlinks setting for Apache UserDir
+$symlinkOption = '';
+if (0 === strpos($_SERVER["SERVER_SOFTWARE"], 'Apache/')
+    && preg_match('@^/\\~(\\w+)/@', $_SERVER['REQUEST_URI'], $m)
+) {
+    $userDir = DIRECTORY_SEPARATOR . $m[1] . DIRECTORY_SEPARATOR;
+    if (false !== strpos(__FILE__, $userDir)) {
+        $sm = array();
+        $sm["//~{$m[1]}"] = dirname(dirname(__FILE__));
+        $array = str_replace('array (', 'array(', var_export($sm, 1));
+        $symlinkOption = "\$min_symlinks = $array;";
+    }
+}
+
+require dirname(__FILE__) . '/../config.php';

 if (! $min_enableBuilder) {
    header('Location: /');
    exit();
 }

+$setIncludeSuccess = set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path());
+// we do it this way because we want the builder to work after the user corrects
+// include_path. (set_include_path returning FALSE is OK).
+try {
+    require_once 'Minify/Cache/File.php';
+} catch (Exception $e) {
+    if (! $setIncludeSuccess) {
+        echo "Minify: set_include_path() failed. You may need to set your include_path "
+            ."outside of PHP code, e.g., in php.ini.";    
+    } else {
+        echo $e->getMessage();
+    }
+    exit();
+}
+require 'Minify.php';
+
+$cachePathCode = '';
+if (! isset($min_cachePath) && ! function_exists('sys_get_temp_dir')) {
+    $detectedTmp = Minify_Cache_File::tmp();
+    $cachePathCode = "\$min_cachePath = " . var_export($detectedTmp, 1) . ';';
+}
+
 ob_start();
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<head>
-    <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
-    <title>Minify URI Builder</title>
-    <style type="text/css">
+<!DOCTYPE html>
+<title>Minify URI Builder</title>
+<meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
+<style>
 body {margin:1em 60px;}
 h1, h2, h3 {margin-left:-25px; position:relative;}
 h1 {margin-top:0;}
@@ -37,12 +72,30 @@ h1 {margin-top:0;}
 b {color:#c00}
 .topNote {background: #ff9; display:inline-block; padding:.5em .6em; margin:0 0 1em;}
 .topWarning {background:#c00; color:#fff; padding:.5em .6em; margin:0 0 1em;}
-    </style>
-</head>
+.topWarning a {color:#fff;}
+#jsDidntLoad {display:none;}
+</style>
+<body>
+<?php if ($symlinkOption): ?>
+    <div class=topNote><strong>Note:</strong> It looks like you're running Minify in a user
+ directory. You may need the following option in /min/config.php to have URIs
+ correctly rewritten in CSS output:
+ <br><textarea id=symlinkOpt rows=3 cols=80 readonly><?php echo htmlspecialchars($symlinkOption); ?></textarea>
+</div>
+<?php endif; ?>

-<?php if (! isset($min_cachePath)): ?>
-<p class=topNote><strong>Note:</strong> Please set <code>$min_cachePath</code> 
-in /min/config.php to improve performance.</p>
+<p class=topWarning id=jsDidntLoad><strong>Uh Oh.</strong> Minify was unable to
+    serve Javascript for this app. To troubleshoot this,
+    <a href="http://code.google.com/p/minify/wiki/Debugging">enable FirePHP debugging</a>
+    and request the <a id=builderScriptSrc href=#>Minify URL</a> directly. Hopefully the
+    FirePHP console will report the cause of the error.
+</p>
+
+<?php if ($cachePathCode): ?>
+<p class=topNote><strong>Note:</strong> <code><?php echo
+    htmlspecialchars($detectedTmp); ?></code> was discovered as a usable temp directory.<br>To
+    slightly improve performance you can hardcode this in /min/config.php:
+    <code><?php echo htmlspecialchars($cachePathCode); ?></code></p>
 <?php endIf; ?>

 <p id=minRewriteFailed class="hide"><strong>Note:</strong> Your webserver does not seem to
@@ -107,76 +160,88 @@ in your list, and move any others to the top of the first file in your list
 <p>If you desire, you can use Minify URIs in imports and they will not be touched
 by Minify. E.g. <code>@import "<span class=minRoot>/min/?</span>g=css2";</code></p>

+<h3>Debug Mode</h3>
+<p>When /min/config.php has <code>$min_allowDebugFlag = <strong>true</strong>;</code>
+ you can get debug output by appending <code>&amp;debug</code> to a Minify URL, or
+ by sending the cookie <code>minDebug=&lt;match&gt;</code>, where <code>&lt;match&gt;</code>
+ should be a string in the Minify URIs you'd like to debug. This bookmarklet will allow you to
+ set this cookie.</p>
+<p><a id=bm2>Minify Debug</a> <small>(right-click, add to bookmarks)</small></p>
+
 </div><!-- #app -->

 <hr>
-<p>Need help? Search or post to the <a class=ext 
-href="http://groups.google.com/group/minify">Minify discussion list</a>.</p>
-<p><small>This app is minified :) <a class=ext 
-href="http://code.google.com/p/minify/source/browse/trunk/min/builder/index.php">view 
-source</a></small></p>
+<p>Need help? Check the <a href="http://code.google.com/p/minify/w/list?can=3">wiki</a>,
+ or post to the <a class=ext href="http://groups.google.com/group/minify">discussion
+ list</a>.</p>
+ <p><small>Powered by Minify <?php echo Minify::VERSION; ?></small></p>

-<script type="text/javascript" 
-src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js"></script>
+<script>window.jQuery || document.write('<script src="jquery-1.6.3.min.js"><\/script>')</script>
+<script>
+(function () {
+    // workaround required to test when /min isn't child of web root
+    var src = "../?f=" + location.pathname.replace(/\/[^\/]*$/, '/_index.js').substr(1);
+    // load script immediately
+    document.write('<\script src="' + src + '"><\/script>');
+    $(function () {
+        $('#builderScriptSrc')[0].href = src;
+        // give Minify a few seconds to serve _index.js before showing scary red warning
+        setTimeout(function () {
+            if (! window.MUB) {
+                // Minify didn't load
+                $('#jsDidntLoad').css({display:'block'});
+            }
+        }, 3000);

-<script type="text/javascript">
-$(function () {
-    // detection of double output encoding
-    var msg = '<\p class=topWarning><\strong>Warning:<\/strong> ';
-    var url = 'ocCheck.php?' + (new Date()).getTime();
-    $.get(url, function (ocStatus) {
-        $.get(url + '&hello=1', function (ocHello) {
-            if (ocHello != 'World!') {
-                msg += 'It appears output is being automatically compressed, interfering ' 
-                     + ' with Minify\'s own compression. ';
-                if (ocStatus == '1')
-                    msg += 'The option "zlib.output_compression" is enabled in your PHP configuration. '
-                         + 'Minify set this to "0", but it had no effect. This option must be disabled ' 
-                         + 'in php.ini or .htaccess.';
-                else
-                    msg += 'The option "zlib.output_compression" is disabled in your PHP configuration '
-                         + 'so this behavior is likely due to a server option.';
-                $(document.body).prepend(msg + '<\/p>');
-            } else
-                if (ocStatus == '1')
-                    $(document.body).prepend('<\p class=topNote><\strong>Note:</\strong> The option '
-                        + '"zlib.output_compression" is enabled in your PHP configuration, but has been '
-                        + 'successfully disabled via ini_set(). If you experience mangled output you '
-                        + 'may want to consider disabling this option in your PHP configuration.<\/p>'
-                    );
+        // detection of double output encoding
+        var msg = '<\p class=topWarning><\strong>Warning:<\/strong> ';
+        var url = 'ocCheck.php?' + (new Date()).getTime();
+        $.get(url, function (ocStatus) {
+            $.get(url + '&hello=1', function (ocHello) {
+                if (ocHello != 'World!') {
+                    msg += 'It appears output is being automatically compressed, interfering '
+                         + ' with Minify\'s own compression. ';
+                    if (ocStatus == '1')
+                        msg += 'The option "zlib.output_compression" is enabled in your PHP configuration. '
+                             + 'Minify set this to "0", but it had no effect. This option must be disabled '
+                             + 'in php.ini or .htaccess.';
+                    else
+                        msg += 'The option "zlib.output_compression" is disabled in your PHP configuration '
+                             + 'so this behavior is likely due to a server option.';
+                    $(document.body).prepend(msg + '<\/p>');
+                } else
+                    if (ocStatus == '1')
+                        $(document.body).prepend('<\p class=topNote><\strong>Note:</\strong> The option '
+                            + '"zlib.output_compression" is enabled in your PHP configuration, but has been '
+                            + 'successfully disabled via ini_set(). If you experience mangled output you '
+                            + 'may want to consider disabling this option in your PHP configuration.<\/p>'
+                        );
+            });
        });
    });
-});
+})();
 </script>
-<script type="text/javascript">
-    // workaround required to test when /min isn't child of web root
-    var src = location.pathname.replace(/\/[^\/]*$/, '/_index.js').substr(1);
-    document.write('<\script type="text/javascript" src="../?f=' + src + '"><\/script>');
-</script>
-
+</body>
 <?php
+$content = ob_get_clean();

-$serveOpts = array(
-    'content' => ob_get_contents()
+// setup Minify
+Minify::setCache(
+    isset($min_cachePath) ? $min_cachePath : ''
+    ,$min_cacheFileLocking
+);
+Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
+
+Minify::serve('Page', array(
+    'content' => $content
    ,'id' => __FILE__
    ,'lastModifiedTime' => max(
-        // regenerate cache if either of these change
+        // regenerate cache if any of these change
        filemtime(__FILE__)
        ,filemtime(dirname(__FILE__) . '/../config.php')
+        ,filemtime(dirname(__FILE__) . '/../lib/Minify.php')
    )
    ,'minifyAll' => true
    ,'encodeOutput' => $encodeOutput
-);
-ob_end_clean();
-
-set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path());
-
-require 'Minify.php';/*noLibHook*/
-
-if (0 === stripos(PHP_OS, 'win')) {
-    Minify::setDocRoot(); // we may be on IIS
-}
-Minify::setCache(isset($min_cachePath) ? $min_cachePath : null);
-Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
-
-Minify::serve('Page', $serveOpts);
+));
@@ -8,7 +8,7 @@
 $_oc = ini_get('zlib.output_compression');
 
 // allow access only if builder is enabled
-require dirname(__FILE__) . '/../config.php';/*noLibHook*/
+require dirname(__FILE__) . '/../config.php';
 if (! $min_enableBuilder) {
    header('Location: /');
    exit();
@@ -20,7 +20,7 @@ if (isset($_GET['hello'])) {
    // try to prevent double encoding (may not have an effect)
    ini_set('zlib.output_compression', '0');
    
-    require $min_libPath . '/HTTP/Encoder.php';/*noLibHook*/
+    require $min_libPath . '/HTTP/Encoder.php';
    HTTP_Encoder::$encodeToIe6  = true; // just in case
    $he = new HTTP_Encoder(array(
        'content' => 'World!'
@@ -82,7 +82,7 @@ $min_serveOptions['bubbleCssImports'] = false;
 $min_serveOptions['encodeOutput'] = 1;

 /* Tiny hack for IN_DEV */
-if ( isset( $_GET['f'] ) )
+if ( isset( $_GET['f'] ) && is_string( $_GET['f'] ) )
 {
 	if ( strstr( $_GET['f'], '/master_css' ) )
 	{
@@ -10,12 +10,12 @@
 define('MINIFY_MIN_DIR', dirname(__FILE__));

 // load config
-require MINIFY_MIN_DIR . '/config.php';/*noLibHook*/
+require MINIFY_MIN_DIR . '/config.php';

 // setup include path
-set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());/*noLibHook*/
+set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());

-require 'Minify.php';/*noLibHook*/
+require 'Minify.php';

 Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
 Minify::setCache(
@@ -25,24 +25,27 @@ Minify::setCache(

 if ($min_documentRoot) {
    $_SERVER['DOCUMENT_ROOT'] = $min_documentRoot;
-} elseif (0 === stripos(PHP_OS, 'win')) {
-    Minify::setDocRoot(); // IIS may need help
+    Minify::$isDocRootSet = true;
 }

 $min_serveOptions['minifierOptions']['text/css']['symlinks'] = $min_symlinks;
+// auto-add targets to allowDirs
+foreach ($min_symlinks as $uri => $target) {
+    $min_serveOptions['minApp']['allowDirs'][] = $target;
+}

-if ($min_allowDebugFlag && isset($_GET['debug'])) {
-    $min_serveOptions['debug'] = true;
+if ($min_allowDebugFlag) {
+    require_once 'Minify/DebugDetector.php';
+    $min_serveOptions['debug'] = Minify_DebugDetector::shouldDebugRequest($_COOKIE, $_GET, $_SERVER['REQUEST_URI']);
 }

 if ($min_errorLogger) {
-    require_once 'Minify/Logger.php';/*noLibHook*/
+    require_once 'Minify/Logger.php';
    if (true === $min_errorLogger) {
-        require_once 'FirePHP.php';/*noLibHook*/
-        Minify_Logger::setLogger(FirePHP::getInstance(true));
-    } else {
-        Minify_Logger::setLogger($min_errorLogger);
+        require_once 'FirePHP.php';
+        $min_errorLogger = FirePHP::getInstance(true);
    }
+    Minify_Logger::setLogger($min_errorLogger);
 }

 // check for URI versioning
@@ -51,11 +54,16 @@ if (preg_match('/&\\d/', $_SERVER['QUERY_STRING'])) {
 }
 if (isset($_GET['g'])) {
    // well need groups config
-    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');/*noLibHook*/
+    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');
 }
 if (isset($_GET['f']) || isset($_GET['g'])) {
    // serve!   
-    Minify::serve('MinApp', $min_serveOptions);
+
+    if (! isset($min_serveController)) {
+        require 'Minify/Controller/MinApp.php';
+        $min_serveController = new Minify_Controller_MinApp();
+    }
+    Minify::serve($min_serveController, $min_serveOptions);
        
 } elseif ($min_enableBuilder) {
    header('Location: builder/');
@@ -63,4 +71,4 @@ if (isset($_GET['f']) || isset($_GET['g'])) {
 } else {
    header("Location: /");
    exit();
-}
+}
@@ -202,7 +202,7 @@ class FirePHP {
   * @return array
   */  
  public function __sleep() {
-    return array('options','objectFilters','enabled');/*noLibHook*/
+    return array('options','objectFilters','enabled');
  }
    
  /**
@@ -272,7 +272,7 @@ class FirePHP {
   * @return void
   */
  public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);/*noLibHook*/
+    $this->options = array_merge($this->options,$Options);
  }
  
  /**
@@ -929,7 +929,7 @@ class FirePHP {
        // but exist in the object
        foreach( $members as $raw_name => $value ) {
          
-          $name = $raw_name;/*noLibHook*/
+          $name = $raw_name;
          
          if ($name{0} == "\0") {
            $parts = explode("\0", $name);
@@ -1065,7 +1065,7 @@ class FirePHP {
   * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
   * @author      Christoph Dorn <christoph@christophdorn.com>
   * @copyright   2005 Michal Migurski
-   * @version     CVS: $Id: FirePHP.php 8229 2011-03-31 10:17:44Z ips_terabyte $
+   * @version     CVS: $Id: FirePHP.php 11976 2013-02-11 22:46:08Z bfarber $
   * @license     http://www.opensource.org/licenses/bsd-license.php
   * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
   */
@@ -75,9 +75,8 @@ class HTTP_ConditionalGet {
    /**
     * @param array $spec options
     * 
-     * 'isPublic': (bool) if true, the Cache-Control header will contain 
-     * "public", allowing proxies to cache the content. Otherwise "private" will 
-     * be sent, allowing only browser caching. (default false)
+     * 'isPublic': (bool) if false, the Cache-Control header will contain
+     * "private", allowing only browser caching. (default false)
     * 
     * 'lastModifiedTime': (int) if given, both ETag AND Last-Modified headers
     * will be sent with content. This is recommended.
@@ -106,8 +105,6 @@ class HTTP_ConditionalGet {
     * seconds, and also set the Expires header to the equivalent GMT date. 
     * After the max-age period has passed, the browser will again send a 
     * conditional GET to revalidate its cache.
-     * 
-     * @return null
     */
    public function __construct($spec)
    {
@@ -150,7 +147,10 @@ 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}";
+        $privacy = ($scope === 'private')
+            ? ', private'
+            : '';
+        $this->_headers['Cache-Control'] = "max-age={$maxAge}{$privacy}";
        // invalidate cache if disabled, otherwise check
        $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate'])
            ? false
@@ -209,7 +209,9 @@ class HTTP_ConditionalGet {
    {
        $headers = $this->_headers;
        if (array_key_exists('_responseCode', $headers)) {
-            header($headers['_responseCode']);
+            // FastCGI environments require 3rd arg to header() to be set
+            list(, $code) = explode(' ', $headers['_responseCode'], 3);
+            header($headers['_responseCode'], true, $code);
            unset($headers['_responseCode']);
        }
        foreach ($headers as $name => $val) {
@@ -230,8 +232,6 @@ class HTTP_ConditionalGet {
     * "private" will be sent, allowing only browser caching.
     *
     * @param array $options (default empty) additional options for constructor
-     *
-     * @return null     
     */
    public static function check($lastModifiedTime = null, $isPublic = false, $options = array())
    {
@@ -267,13 +267,21 @@ class HTTP_ConditionalGet {
    protected $_lmTime = null;
    protected $_etag = null;
    protected $_stripEtag = false;
-    
+
+    /**
+     * @param string $hash
+     *
+     * @param string $scope
+     */
    protected function _setEtag($hash, $scope)
    {
        $this->_etag = '"' . substr($scope, 0, 3) . $hash . '"';
        $this->_headers['ETag'] = $this->_etag;
    }

+    /**
+     * @param int $time
+     */
    protected function _setLastModified($time)
    {
        $this->_lmTime = (int)$time;
@@ -282,6 +290,8 @@ class HTTP_ConditionalGet {

    /**
     * Determine validity of client cache and queue 304 header if valid
+     *
+     * @return bool
     */
    protected function _isCacheValid()
    {
@@ -298,6 +308,9 @@ class HTTP_ConditionalGet {
        return $isValid;
    }

+    /**
+     * @return bool
+     */
    protected function resourceMatchedEtag()
    {
        if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
@@ -319,7 +332,12 @@ class HTTP_ConditionalGet {
        }
        return false;
    }
-    
+
+    /**
+     * @param string $etag
+     *
+     * @return string
+     */
    protected function normalizeEtag($etag) {
        $etag = trim($etag);
        return $this->_stripEtag
@@ -327,17 +345,17 @@ class HTTP_ConditionalGet {
            : $etag;
    }

+    /**
+     * @return bool
+     */
    protected function resourceNotModified()
    {
        if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
            return false;
        }
-        $ifModifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-        if (false !== ($semicolon = strrpos($ifModifiedSince, ';'))) {
-            // IE has tacked on extra data to this header, strip it
-            $ifModifiedSince = substr($ifModifiedSince, 0, $semicolon);
-        }
-        if ($ifModifiedSince == self::gmtDate($this->_lmTime)) {
+        // strip off IE's extra data (semicolon)
+        list($ifModifiedSince) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE'], 2);
+        if (strtotime($ifModifiedSince) >= $this->_lmTime) {
            // Apache 2.2's behavior. If there was no ETag match, send the 
            // non-encoded version of the ETag value.
            $this->_headers['ETag'] = $this->normalizeEtag($this->_etag);
@@ -33,11 +33,11 @@
 * </code>
 *
 * For more control over headers, use getHeaders() and getData() and send your
- * own output.
- * 
- * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, 
- * and gzcompress functions for gzip, deflate, and compress-encoding
- * respectively.
+ * own output.
+ * 
+ * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, 
+ * and gzcompress functions for gzip, deflate, and compress-encoding
+ * respectively.
 * 
 * @package Minify
 * @subpackage HTTP
@@ -59,7 +59,7 @@ class HTTP_Encoder {
     * 
     * @var bool
     */
-    public static $encodeToIe6 = false;
+    public static $encodeToIe6 = true;
    
    
    /**
@@ -85,13 +85,16 @@ class HTTP_Encoder {
     * method. If not set, the best method will be chosen by getAcceptedEncoding()
     * The available methods are 'gzip', 'deflate', 'compress', and '' (no
     * encoding)
-     * 
-     * @return null
     */
-    public function __construct($spec) 
+    public function __construct($spec) 
    {
+        $this->_useMbStrlen = (function_exists('mb_strlen')
+                               && (ini_get('mbstring.func_overload') !== '')
+                               && ((int)ini_get('mbstring.func_overload') & 2));
        $this->_content = $spec['content'];
-        $this->_headers['Content-Length'] = (string)strlen($this->_content);
+        $this->_headers['Content-Length'] = $this->_useMbStrlen
+            ? (string)mb_strlen($this->_content, '8bit')
+            : (string)strlen($this->_content);
        if (isset($spec['type'])) {
            $this->_headers['Content-Type'] = $spec['type'];
        }
@@ -109,9 +112,9 @@ class HTTP_Encoder {
     * 
     * Call after encode() for encoded content.
     * 
-     * return string
+     * @return string
     */
-    public function getContent() 
+    public function getContent() 
    {
        return $this->_content;
    }
@@ -130,7 +133,7 @@ class HTTP_Encoder {
     *
     * @return array 
     */
-    public function getHeaders()
+    public function getHeaders()
    {
        return $this->_headers;
    }
@@ -143,10 +146,8 @@ class HTTP_Encoder {
     * not handled purposefully.
     * 
     * @see getHeaders()
-     * 
-     * @return null
     */
-    public function sendHeaders()
+    public function sendHeaders()
    {
        foreach ($this->_headers as $name => $val) {
            header($name . ': ' . $val);
@@ -161,10 +162,8 @@ class HTTP_Encoder {
     * You must call this before headers are sent and it probably cannot be
     * used in conjunction with zlib output buffering / mod_gzip. Errors are
     * not handled purposefully.
-     * 
-     * @return null
     */
-    public function sendAll()
+    public function sendAll()
    {
        $this->sendHeaders();
        echo $this->_content;
@@ -181,21 +180,21 @@ class HTTP_Encoder {
     * be non 0. The methods are favored in order of gzip, deflate, then 
     * 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 $allowDeflate allow the more recent deflate 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, $allowDeflate = true)
+    public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true)
    {
        // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
        
        if (! isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-            || self::_isBuggyIe())
+            || self::isBuggyIe())
        {
            return array('', '');
        }
@@ -244,16 +243,18 @@ class HTTP_Encoder {
     * this fails, false is returned.
     * 
     * The header "Vary: Accept-Encoding" is added. If encoding is successful, 
-     * the Content-Length header is updated, and Content-Encoding is also added.
-     * 
+     * the Content-Length header is updated, and Content-Encoding is also added.
+     * 
     * @param int $compressionLevel given to zlib functions. If not given, the
     * class default will be used.
     * 
     * @return bool success true if the content was actually compressed
     */
-    public function encode($compressionLevel = null)
+    public function encode($compressionLevel = null)
    {
-        $this->_headers['Vary'] = 'Accept-Encoding';
+        if (! self::isBuggyIe()) {
+            $this->_headers['Vary'] = 'Accept-Encoding';
+        }
        if (null === $compressionLevel) {
            $compressionLevel = self::$compressionLevel;
        }
@@ -262,9 +263,9 @@ class HTTP_Encoder {
            || !extension_loaded('zlib'))
        {
            return false;
-        }
-        if ($this->_encodeMethod[0] === 'deflate') {
-            $encoded = gzdeflate($this->_content, $compressionLevel);
+        }
+        if ($this->_encodeMethod[0] === 'deflate') {
+            $encoded = gzdeflate($this->_content, $compressionLevel);
        } elseif ($this->_encodeMethod[0] === 'gzip') {
            $encoded = gzencode($this->_content, $compressionLevel);
        } else {
@@ -273,7 +274,9 @@ class HTTP_Encoder {
        if (false === $encoded) {
            return false;
        }
-        $this->_headers['Content-Length'] = strlen($encoded);
+        $this->_headers['Content-Length'] = $this->_useMbStrlen
+            ? (string)mb_strlen($encoded, '8bit')
+            : (string)strlen($encoded);
        $this->_headers['Content-Encoding'] = $this->_encodeMethod[1];
        $this->_content = $encoded;
        return true;
@@ -285,7 +288,7 @@ class HTTP_Encoder {
     * This is a convenience method for common use of the class
     * 
     * @param string $content
-     * 
+     * 
     * @param int $compressionLevel given to zlib functions. If not given, the
     * class default will be used.
     * 
@@ -296,21 +299,22 @@ class HTTP_Encoder {
        if (null === $compressionLevel) {
            $compressionLevel = self::$compressionLevel;
        }
-        $he = new HTTP_Encoder(array('content' => $content));
-        $ret = $he->encode($compressionLevel);
+        $he = new HTTP_Encoder(array('content' => $content));
+        $ret = $he->encode($compressionLevel);
        $he->sendAll();
        return $ret;
-    }
-    
-    protected $_content = '';
-    protected $_headers = array();
-    protected $_encodeMethod = array('', '');
+    }

    /**
-     * Is the browser an IE version earlier than 6 SP2?  
+     * Is the browser an IE version earlier than 6 SP2?
+     *
+     * @return bool
     */
-    protected static function _isBuggyIe()
+    public static function isBuggyIe()
    {
+        if (empty($_SERVER['HTTP_USER_AGENT'])) {
+            return false;
+        }
        $ua = $_SERVER['HTTP_USER_AGENT'];
        // quick escape for non-IEs
        if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ')
@@ -318,9 +322,14 @@ class HTTP_Encoder {
            return false;
        }
        // no regex = faaast
-        $version = (float)substr($ua, 30); 
+        $version = (float)substr($ua, 30);
        return self::$encodeToIe6
            ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1')))
            : ($version < 7);
    }
+    
+    protected $_content = '';
+    protected $_headers = array();
+    protected $_encodeMethod = array('', '');
+    protected $_useMbStrlen = false;
 }
@@ -1,16 +1,20 @@
 <?php
 /**
- * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
+ * JSMin.php - modified PHP implementation of Douglas Crockford's JSMin.
 *
- * This is a direct port of jsmin.c to PHP with a few PHP performance tweaks and
- * modifications to preserve some comments (see below). Also, rather than using
- * stdin/stdout, JSMin::minify() accepts a string as input and returns another
- * string as output.
+ * <code>
+ * $minifiedJs = JSMin::minify($js);
+ * </code>
+ *
+ * This is a modified port of jsmin.c. Improvements:
 * 
- * Comments containing IE conditional compilation are preserved, as are multi-line
- * comments that begin with "/*!" (for documentation purposes). In the latter case
- * newlines are inserted around the comment to enhance readability.
+ * Does not choke on some regexp literals containing quote characters. E.g. /'/
+ * 
+ * Spaces are preserved after some add/sub operators, so they are not mistakenly 
+ * converted to post-inc/dec. E.g. a + ++b -> a+ ++b
 *
+ * Preserves multi-line comments that begin with /*!
+ * 
 * PHP 5 or higher is required.
 *
 * Permission is hereby granted to use this version of the library under the
@@ -56,7 +60,7 @@ class JSMin {
    const ACTION_KEEP_A     = 1;
    const ACTION_DELETE_A   = 2;
    const ACTION_DELETE_A_B = 3;
-    
+
    protected $a           = "\n";
    protected $b           = '';
    protected $input       = '';
@@ -64,11 +68,13 @@ class JSMin {
    protected $inputLength = 0;
    protected $lookAhead   = null;
    protected $output      = '';
-    
+    protected $lastByteOut  = '';
+
    /**
-     * Minify Javascript
+     * Minify Javascript.
     *
     * @param string $js Javascript to be minified
+     *
     * @return string
     */
    public static function minify($js)
@@ -76,38 +82,55 @@ class JSMin {
        $jsmin = new JSMin($js);
        return $jsmin->min();
    }
-    
+
    /**
-     * Setup process
+     * @param string $input
     */
    public function __construct($input)
    {
-        $this->input       = str_replace("\r\n", "\n", $input);
-        $this->inputLength = strlen($this->input);
+        $this->input = $input;
    }
-    
+
    /**
     * Perform minification, return result
+     *
+     * @return string
     */
    public function min()
    {
        if ($this->output !== '') { // min already run
            return $this->output;
        }
+
+        $mbIntEnc = null;
+        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+            $mbIntEnc = mb_internal_encoding();
+            mb_internal_encoding('8bit');
+        }
+        $this->input = str_replace("\r\n", "\n", $this->input);
+        $this->inputLength = strlen($this->input);
+
        $this->action(self::ACTION_DELETE_A_B);
-        
+
        while ($this->a !== null) {
            // determine next command
            $command = self::ACTION_KEEP_A; // default
            if ($this->a === ' ') {
-                if (! $this->isAlphaNum($this->b)) {
+                if (($this->lastByteOut === '+' || $this->lastByteOut === '-') 
+                    && ($this->b === $this->lastByteOut)) {
+                    // Don't delete this space. If we do, the addition/subtraction
+                    // could be parsed as a post-increment
+                } elseif (! $this->isAlphaNum($this->b)) {
                    $command = self::ACTION_DELETE_A;
                }
            } elseif ($this->a === "\n") {
                if ($this->b === ' ') {
                    $command = self::ACTION_DELETE_A_B;
-                } elseif (false === strpos('{[(+-', $this->b) 
-                          && ! $this->isAlphaNum($this->b)) {
+                // in case of mbstring.func_overload & 2, must check for null b,
+                // otherwise mb_strpos will give WARNING
+                } elseif ($this->b === null
+                          || (false === strpos('{[(+-', $this->b)
+                              && ! $this->isAlphaNum($this->b))) {
                    $command = self::ACTION_DELETE_A;
                }
            } elseif (! $this->isAlphaNum($this->a)) {
@@ -120,19 +143,38 @@ class JSMin {
            $this->action($command);
        }
        $this->output = trim($this->output);
+
+        if ($mbIntEnc !== null) {
+            mb_internal_encoding($mbIntEnc);
+        }
        return $this->output;
    }
-    
+
    /**
     * ACTION_KEEP_A = Output A. Copy B to A. Get the next B.
     * ACTION_DELETE_A = Copy B to A. Get the next B.
     * ACTION_DELETE_A_B = Get the next B.
+     *
+     * @param int $command
+     * @throws JSMin_UnterminatedRegExpException|JSMin_UnterminatedStringException
     */
    protected function action($command)
    {
+        if ($command === self::ACTION_DELETE_A_B 
+            && $this->b === ' '
+            && ($this->a === '+' || $this->a === '-')) {
+            // Note: we're at an addition/substraction operator; the inputIndex
+            // will certainly be a valid index
+            if ($this->input[$this->inputIndex] === $this->a) {
+                // This is "+ +" or "- -". Don't delete the space.
+                $command = self::ACTION_KEEP_A;
+            }
+        }
        switch ($command) {
            case self::ACTION_KEEP_A:
                $this->output .= $this->a;
+                $this->lastByteOut = $this->a;
+                
                // fallthrough
            case self::ACTION_DELETE_A:
                $this->a = $this->b;
@@ -140,17 +182,22 @@ class JSMin {
                    $str = $this->a; // in case needed for exception
                    while (true) {
                        $this->output .= $this->a;
+                        $this->lastByteOut = $this->a;
+                        
                        $this->a       = $this->get();
                        if ($this->a === $this->b) { // end quote
                            break;
                        }
                        if (ord($this->a) <= self::ORD_LF) {
                            throw new JSMin_UnterminatedStringException(
-                                'Unterminated String: ' . var_export($str, true));
+                                "JSMin: Unterminated String at byte "
+                                . $this->inputIndex . ": {$str}");
                        }
                        $str .= $this->a;
                        if ($this->a === '\\') {
                            $this->output .= $this->a;
+                            $this->lastByteOut = $this->a;
+                            
                            $this->a       = $this->get();
                            $str .= $this->a;
                        }
@@ -173,16 +220,21 @@ class JSMin {
                            $pattern      .= $this->a;
                        } elseif (ord($this->a) <= self::ORD_LF) {
                            throw new JSMin_UnterminatedRegExpException(
-                                'Unterminated RegExp: '. var_export($pattern, true));
+                                "JSMin: Unterminated RegExp at byte "
+                                . $this->inputIndex .": {$pattern}");
                        }
                        $this->output .= $this->a;
+                        $this->lastByteOut = $this->a;
                    }
                    $this->b = $this->next();
                }
            // end case ACTION_DELETE_A_B
        }
    }
-    
+
+    /**
+     * @return bool
+     */
    protected function isRegexpLiteral()
    {
        if (false !== strpos("\n{;(,=:[!&|?", $this->a)) { // we aren't dividing
@@ -207,9 +259,11 @@ class JSMin {
        }
        return false;
    }
-    
+
    /**
     * Get next char. Convert ctrl char to space.
+     *
+     * @return string
     */
    protected function get()
    {
@@ -231,24 +285,33 @@ class JSMin {
        }
        return $c;
    }
-    
+
    /**
     * Get next char. If is ctrl character, translate to a space or newline.
+     *
+     * @return string
     */
    protected function peek()
    {
        $this->lookAhead = $this->get();
        return $this->lookAhead;
    }
-    
+
    /**
     * Is $c a letter, digit, underscore, dollar sign, escape, or non-ASCII?
+     *
+     * @param string $c
+     *
+     * @return bool
     */
    protected function isAlphaNum($c)
    {
        return (preg_match('/^[0-9a-zA-Z_\\$\\\\]$/', $c) || ord($c) > 126);
    }
-    
+
+    /**
+     * @return string
+     */
    protected function singleLineComment()
    {
        $comment = '';
@@ -264,7 +327,11 @@ class JSMin {
            }
        }
    }
-    
+
+    /**
+     * @return string
+     * @throws JSMin_UnterminatedCommentException
+     */
    protected function multipleLineComment()
    {
        $this->get();
@@ -276,7 +343,7 @@ class JSMin {
                    $this->get();
                    // if comment preserved by YUI Compressor
                    if (0 === strpos($comment, '!')) {
-                        return "\n/*" . substr($comment, 1) . "*/\n";
+                        return "\n/*!" . substr($comment, 1) . "*/\n";
                    }
                    // if IE conditional comment
                    if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
@@ -285,15 +352,19 @@ class JSMin {
                    return ' ';
                }
            } elseif ($get === null) {
-                throw new JSMin_UnterminatedCommentException('Unterminated Comment: ' . var_export('/*' . $comment, true));
+                throw new JSMin_UnterminatedCommentException(
+                    "JSMin: Unterminated comment at byte "
+                    . $this->inputIndex . ": /*{$comment}");
            }
            $comment .= $get;
        }
    }
-    
+
    /**
     * Get the next character, skipping over comments.
     * Some comments may be preserved.
+     *
+     * @return string
     */
    protected function next()
    {
@@ -7,7 +7,7 @@
 /**
 * Minify_Source
 */
-require_once 'Minify/Source.php';/*noLibHook*/
+require_once 'Minify/Source.php';
 
 /**
 * Minify - Combines, minifies, and caches JavaScript and CSS files on demand.
@@ -29,12 +29,13 @@ require_once 'Minify/Source.php';/*noLibHook*/
 */
 class Minify {
    
-    const VERSION = '2.1.3';
+    const VERSION = '2.1.5';
    const TYPE_CSS = 'text/css';
    const TYPE_HTML = 'text/html';
    // there is some debate over the ideal JS Content-Type, but this is the
    // Apache default and what Yahoo! uses..
    const TYPE_JS = 'application/x-javascript';
+    const URL_DEBUG = 'http://code.google.com/p/minify/wiki/Debugging';
    
    /**
     * How many hours behind are the file modification times of uploaded files?
@@ -58,7 +59,14 @@ class Minify {
     * @var string $importWarning
     */
    public static $importWarning = "/* See http://code.google.com/p/minify/wiki/CommonProblems#@imports_can_appear_in_invalid_locations_in_combined_CSS_files */\n";
-    
+
+    /**
+     * Has the DOCUMENT_ROOT been set in user code?
+     * 
+     * @var bool
+     */
+    public static $isDocRootSet = false;
+
    /**
     * Specify a cache object (with identical interface as Minify_Cache_File) or
     * a path to use with Minify_Cache_File.
@@ -77,7 +85,7 @@ class Minify {
    public static function setCache($cache = '', $fileLocking = true)
    {
        if (is_string($cache)) {
-            require_once 'Minify/Cache/File.php';/*noLibHook*/
+            require_once 'Minify/Cache/File.php';
            self::$_cache = new Minify_Cache_File($cache, $fileLocking);
        } else {
            self::$_cache = $cache;
@@ -148,8 +156,8 @@ class Minify {
     * 
     * Any controller options are documented in that controller's setupSources() method.
     * 
-     * @param mixed instance of subclass of Minify_Controller_Base or string name of
-     * controller. E.g. 'Files'
+     * @param mixed $controller instance of subclass of Minify_Controller_Base or string
+     * name of controller. E.g. 'Files'
     * 
     * @param array $options controller/serve options
     * 
@@ -159,14 +167,19 @@ class Minify {
     */
    public static function serve($controller, $options = array())
    {
+        if (! self::$isDocRootSet && 0 === stripos(PHP_OS, 'win')) {
+            self::setDocRoot();
+        }
+
        if (is_string($controller)) {
            // make $controller into object
            $class = 'Minify_Controller_' . $controller;
            if (! class_exists($class, false)) {
                require_once "Minify/Controller/" 
-                    . str_replace('_', '/', $controller) . ".php";/*noLibHook*/
+                    . str_replace('_', '/', $controller) . ".php";    
            }
            $controller = new $class();
+            /* @var Minify_Controller_Base $controller */
        }
        
        // set up controller sources and mix remaining options with
@@ -179,9 +192,7 @@ class Minify {
        if (! $controller->sources) {
            // invalid request!
            if (! self::$_options['quiet']) {
-                header(self::$_options['badRequestHeader']);
-                echo self::$_options['badRequestHeader'];
-                return;
+                self::_errorExit(self::$_options['badRequestHeader'], self::URL_DEBUG);
            } else {
                list(,$statusCode) = explode(' ', self::$_options['badRequestHeader']);
                return array(
@@ -202,23 +213,25 @@ class Minify {
        
        // determine encoding
        if (self::$_options['encodeOutput']) {
+            $sendVary = true;
            if (self::$_options['encodeMethod'] !== null) {
                // controller specifically requested this
                $contentEncoding = self::$_options['encodeMethod'];
            } else {
                // sniff request header
-                require_once 'HTTP/Encoder.php';/*noLibHook*/
+                require_once 'HTTP/Encoder.php';
                // depending on what the client accepts, $contentEncoding may be 
                // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling
                // getAcceptedEncoding(false, false) leaves out compress and deflate as options.
                list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false, false);
+                $sendVary = ! HTTP_Encoder::isBuggyIe();
            }
        } else {
            self::$_options['encodeMethod'] = ''; // identity (no encoding)
        }
        
        // check client cache
-        require_once 'HTTP/ConditionalGet.php';/*noLibHook*/
+        require_once 'HTTP/ConditionalGet.php';
        $cgOptions = array(
            'lastModifiedTime' => self::$_options['lastModifiedTime']
            ,'isPublic' => self::$_options['isPublic']
@@ -226,6 +239,8 @@ class Minify {
        );
        if (self::$_options['maxAge'] > 0) {
            $cgOptions['maxAge'] = self::$_options['maxAge'];
+        } elseif (self::$_options['debug']) {
+            $cgOptions['invalidate'] = true;
        }
        $cg = new HTTP_ConditionalGet($cgOptions);
        if ($cg->cacheIsValid) {
@@ -249,8 +264,7 @@ class Minify {
        
        if (self::$_options['contentType'] === self::TYPE_CSS
            && self::$_options['rewriteCssUris']) {
-            reset($controller->sources);
-            while (list($key, $source) = each($controller->sources)) {
+            foreach($controller->sources as $key => $source) {
                if ($source->filepath 
                    && !isset($source->minifyOptions['currentDir'])
                    && !isset($source->minifyOptions['prependRelativePath'])
@@ -261,12 +275,12 @@ class Minify {
        }
        
        // check server cache
-        if (null !== self::$_cache) {
+        if (null !== self::$_cache && ! self::$_options['debug']) {
            // using cache
            // the goal is to use only the cache methods to sniff the length and 
            // output the content, as they do not require ever loading the file into
            // memory.
-            $cacheId = 'minify_' . self::_getCacheId();/*noLibHook*/
+            $cacheId = self::_getCacheId();
            $fullCacheId = (self::$_options['encodeMethod'])
                ? $cacheId . '.gz'
                : $cacheId;
@@ -276,7 +290,15 @@ class Minify {
                $cacheContentLength = self::$_cache->getSize($fullCacheId);    
            } else {
                // generate & cache content
-                $content = self::_combineMinify();
+                try {
+                    $content = self::_combineMinify();
+                } catch (Exception $e) {
+                    self::$_controller->log($e->getMessage());
+                    if (! self::$_options['quiet']) {
+                        self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
+                    }
+                    throw $e;
+                }
                self::$_cache->store($cacheId, $content);
                if (function_exists('gzencode')) {
                    self::$_cache->store($cacheId . '.gz', gzencode($content, self::$_options['encodeLevel']));
@@ -285,7 +307,15 @@ class Minify {
        } else {
            // no cache
            $cacheIsReady = false;
-            $content = self::_combineMinify();
+            try {
+                $content = self::_combineMinify();
+            } catch (Exception $e) {
+                self::$_controller->log($e->getMessage());
+                if (! self::$_options['quiet']) {
+                    self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
+                }
+                throw $e;
+            }
        }
        if (! $cacheIsReady && self::$_options['encodeMethod']) {
            // still need to encode
@@ -295,14 +325,17 @@ class Minify {
        // add headers
        $headers['Content-Length'] = $cacheIsReady
            ? $cacheContentLength
-            : strlen($content);
+            : ((function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
+                ? mb_strlen($content, '8bit')
+                : strlen($content)
+            );
        $headers['Content-Type'] = self::$_options['contentTypeCharset']
            ? self::$_options['contentType'] . '; charset=' . self::$_options['contentTypeCharset']
            : self::$_options['contentType'];
        if (self::$_options['encodeMethod'] !== '') {
            $headers['Content-Encoding'] = $contentEncoding;
        }
-        if (self::$_options['encodeOutput']) {
+        if (self::$_options['encodeOutput'] && $sendVary) {
            $headers['Vary'] = 'Accept-Encoding';
        }

@@ -356,52 +389,69 @@ class Minify {
    }
    
    /**
-     * On IIS, create $_SERVER['DOCUMENT_ROOT']
+     * Set $_SERVER['DOCUMENT_ROOT']. On IIS, the value is created from SCRIPT_FILENAME and SCRIPT_NAME.
     * 
-     * @param bool $unsetPathInfo (default false) if true, $_SERVER['PATH_INFO']
-     * will be unset (it is inconsistent with Apache's setting)
-     * 
-     * @return null
+     * @param string $docRoot value to use for DOCUMENT_ROOT
     */
-    public static function setDocRoot($unsetPathInfo = false)
+    public static function setDocRoot($docRoot = '')
    {
-        if (isset($_SERVER['SERVER_SOFTWARE'])
-            && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/')
-        ) {
-            $_SERVER['DOCUMENT_ROOT'] = rtrim(substr(
-                $_SERVER['PATH_TRANSLATED']
+        self::$isDocRootSet = true;
+        if ($docRoot) {
+            $_SERVER['DOCUMENT_ROOT'] = $docRoot;
+        } elseif (isset($_SERVER['SERVER_SOFTWARE'])
+                  && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/')) {
+            $_SERVER['DOCUMENT_ROOT'] = substr(
+                $_SERVER['SCRIPT_FILENAME']
                ,0
-                ,strlen($_SERVER['PATH_TRANSLATED']) - strlen($_SERVER['SCRIPT_NAME'])
-            ), '\\');
-            if ($unsetPathInfo) {
-                unset($_SERVER['PATH_INFO']);
-            }
-            require_once 'Minify/Logger.php';/*noLibHook*/
-            Minify_Logger::log("setDocRoot() set DOCUMENT_ROOT to \"{$_SERVER['DOCUMENT_ROOT']}\"");
+                ,strlen($_SERVER['SCRIPT_FILENAME']) - strlen($_SERVER['SCRIPT_NAME']));
+            $_SERVER['DOCUMENT_ROOT'] = rtrim($_SERVER['DOCUMENT_ROOT'], '\\');
        }
    }
    
    /**
-     * @var mixed Minify_Cache_* object or null (i.e. no server cache is used)
+     * Any Minify_Cache_* object or null (i.e. no server cache is used)
+     *
+     * @var Minify_Cache_File
     */
    private static $_cache = null;
    
    /**
-     * @var Minify_Controller active controller for current request
+     * Active controller for current request
+     *
+     * @var Minify_Controller_Base
     */
    protected static $_controller = null;
    
    /**
-     * @var array options for current request
+     * Options for current request
+     *
+     * @var array
     */
    protected static $_options = null;
-    
+
+    /**
+     * @param string $header
+     *
+     * @param string $url
+     */
+    protected static function _errorExit($header, $url)
+    {
+        $url = htmlspecialchars($url, ENT_QUOTES);
+        list(,$h1) = explode(' ', $header, 2);
+        $h1 = htmlspecialchars($h1);
+        // FastCGI environments require 3rd arg to header() to be set
+        list(, $code) = explode(' ', $header, 3);
+        header($header, true, $code);
+        header('Content-Type: text/html; charset=utf-8');
+        echo "<h1>$h1</h1>";
+        echo "<p>Please see <a href='$url'>$url</a>.</p>";
+        exit();
+    }
+
    /**
     * Set up sources to use Minify_Lines
     *
     * @param array $sources Minify_Source instances
-     *
-     * @return null
     */
    protected static function _setupDebug($sources)
    {
@@ -439,21 +489,22 @@ class Minify {
        $defaultMinifier = isset(self::$_options['minifiers'][$type])
            ? self::$_options['minifiers'][$type]
            : false;
-       
-        if (Minify_Source::haveNoMinifyPrefs(self::$_controller->sources)) {
-            // all source have same options/minifier, better performance
-            // to combine, then minify once
-            foreach (self::$_controller->sources as $source) {
-                $pieces[] = $source->getContent();
-            }
-            $content = implode($implodeSeparator, $pieces);
-            if ($defaultMinifier) {
-                self::$_controller->loadMinifier($defaultMinifier);
-                $content = call_user_func($defaultMinifier, $content, $defaultOptions);    
-            }
-        } else {
-            // minify each source with its own options and minifier, then combine
-            foreach (self::$_controller->sources as $source) {
+
+        // process groups of sources with identical minifiers/options
+        $content = array();
+        $i = 0;
+        $l = count(self::$_controller->sources);
+        $groupToProcessTogether = array();
+        $lastMinifier = null;
+        $lastOptions = null;
+        do {
+            // get next source
+            $source = null;
+            if ($i < $l) {
+                $source = self::$_controller->sources[$i];
+                /* @var Minify_Source $source */
+                $sourceContent = $source->getContent();
+
                // allow the source to override our minifier and options
                $minifier = (null !== $source->minifier)
                    ? $source->minifier
@@ -461,16 +512,40 @@ class Minify {
                $options = (null !== $source->minifyOptions)
                    ? array_merge($defaultOptions, $source->minifyOptions)
                    : $defaultOptions;
-                if ($minifier) {
-                    self::$_controller->loadMinifier($minifier);
-                    // get source content and minify it
-                    $pieces[] = call_user_func($minifier, $source->getContent(), $options);     
+            }
+            // do we need to process our group right now?
+            if ($i > 0                               // yes, we have at least the first group populated
+                && (
+                    ! $source                        // yes, we ran out of sources
+                    || $type === self::TYPE_CSS      // yes, to process CSS individually (avoiding PCRE bugs/limits)
+                    || $minifier !== $lastMinifier   // yes, minifier changed
+                    || $options !== $lastOptions)    // yes, options changed
+                )
+            {
+                // minify previous sources with last settings
+                $imploded = implode($implodeSeparator, $groupToProcessTogether);
+                $groupToProcessTogether = array();
+                if ($lastMinifier) {
+                    self::$_controller->loadMinifier($lastMinifier);
+                    try {
+                        $content[] = call_user_func($lastMinifier, $imploded, $lastOptions);
+                    } catch (Exception $e) {
+                        throw new Exception("Exception in minifier: " . $e->getMessage());
+                    }
                } else {
-                    $pieces[] = $source->getContent();     
+                    $content[] = $imploded;
                }
            }
-            $content = implode($implodeSeparator, $pieces);
-        }
+            // add content to the group
+            if ($source) {
+                $groupToProcessTogether[] = $sourceContent;
+                $lastMinifier = $minifier;
+                $lastOptions = $options;
+            }
+            $i++;
+        } while ($source);
+
+        $content = implode($implodeSeparator, $content);
        
        if ($type === self::TYPE_CSS && false !== strpos($content, '@import')) {
            $content = self::_handleCssImports($content);
@@ -478,7 +553,7 @@ class Minify {
        
        // do any post-processing (esp. for editing build URIs)
        if (self::$_options['postprocessorRequire']) {
-            require_once self::$_options['postprocessorRequire'];/*noLibHook*/
+            require_once self::$_options['postprocessorRequire'];
        }
        if (self::$_options['postprocessor']) {
            $content = call_user_func(self::$_options['postprocessor'], $content, $type);
@@ -491,28 +566,38 @@ class Minify {
     * 
     * Any settings that could affect output are taken into consideration  
     *
+     * @param string $prefix
+     *
     * @return string
     */
-    protected static function _getCacheId()
+    protected static function _getCacheId($prefix = 'minify')
    {
-        return md5(serialize(array(
+        $name = preg_replace('/[^a-zA-Z0-9\\.=_,]/', '', self::$_controller->selectionId);
+        $name = preg_replace('/\\.+/', '.', $name);
+        $name = substr($name, 0, 200 - 34 - strlen($prefix));
+        $md5 = md5(serialize(array(
            Minify_Source::getDigest(self::$_controller->sources)
            ,self::$_options['minifiers'] 
            ,self::$_options['minifierOptions']
            ,self::$_options['postprocessor']
            ,self::$_options['bubbleCssImports']
+            ,self::VERSION
        )));
+        return "{$prefix}_{$name}_{$md5}";
    }
    
    /**
-     * Bubble CSS @imports to the top or prepend a warning if an
-     * @import is detected not at the top.
+     * Bubble CSS @imports to the top or prepend a warning if an import is detected not at the top.
+     *
+     * @param string $css
+     *
+     * @return string
     */
    protected static function _handleCssImports($css)
    {
        if (self::$_options['bubbleCssImports']) {
            // bubble CSS imports
-            preg_match_all('/@import.*?;/', $css, $imports);
+            preg_match_all('/@import.*?;/', $css, $imports);
            $css = implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css);
        } else if ('' !== self::$importWarning) {
            // remove comments so we don't mistake { in a comment as a block
@@ -4,7 +4,7 @@
 * @package Minify
 */

-require_once 'Minify/Source.php';/*noLibHook*/
+require_once 'Minify/Source.php';

 /**
 * Maintain a single last modification time for a group of Minify sources to
@@ -26,6 +26,8 @@ class Minify_CSS {
     * 'preserveComments': (default true) multi-line comments that begin
     * with "/*!" will be preserved with newlines before and after to
     * enhance readability.
+     *
+     * 'removeCharsets': (default true) remove all @charset at-rules
     * 
     * 'prependRelativePath': (default null) if given, this string will be
     * prepended to all relative URIs in import/url declarations
@@ -36,42 +38,56 @@ class Minify_CSS {
     * the desired files. For this to work, the files *must* exist and be
     * visible by the PHP process.
     *
-     * 'symlinks': (default = array()) If the CSS file is stored in 
-     * a symlink-ed directory, provide an array of link paths to
-     * target paths, where the link paths are within the document root. Because 
-     * paths need to be normalized for this to work, use "//" to substitute 
-     * the doc root in the link paths (the array keys). E.g.:
-     * <code>
-     * array('//symlink' => '/real/target/path') // unix
-     * array('//static' => 'D:\\staticStorage')  // Windows
+     * 'symlinks': (default = array()) If the CSS file is stored in 
+     * a symlink-ed directory, provide an array of link paths to
+     * target paths, where the link paths are within the document root. Because 
+     * paths need to be normalized for this to work, use "//" to substitute 
+     * the doc root in the link paths (the array keys). E.g.:
+     * <code>
+     * array('//symlink' => '/real/target/path') // unix
+     * array('//static' => 'D:\\staticStorage')  // Windows
     * </code>
+     *
+     * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])
+     * see Minify_CSS_UriRewriter::rewrite
     * 
     * @return string
     */
    public static function minify($css, $options = array()) 
    {
-        require_once 'Minify/CSS/Compressor.php';/*noLibHook*/
-        if (isset($options['preserveComments']) 
-            && !$options['preserveComments']) {
+        $options = array_merge(array(
+            'removeCharsets' => true,
+            'preserveComments' => true,
+            'currentDir' => null,
+            'docRoot' => $_SERVER['DOCUMENT_ROOT'],
+            'prependRelativePath' => null,
+            'symlinks' => array(),
+        ), $options);
+        
+        if ($options['removeCharsets']) {
+            $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);
+        }
+        require_once 'Minify/CSS/Compressor.php';
+        if (! $options['preserveComments']) {
            $css = Minify_CSS_Compressor::process($css, $options);
        } else {
-            require_once 'Minify/CommentPreserver.php';/*noLibHook*/
+            require_once 'Minify/CommentPreserver.php';
            $css = Minify_CommentPreserver::process(
                $css
                ,array('Minify_CSS_Compressor', 'process')
                ,array($options)
            );
        }
-        if (! isset($options['currentDir']) && ! isset($options['prependRelativePath'])) {
+        if (! $options['currentDir'] && ! $options['prependRelativePath']) {
            return $css;
        }
-        require_once 'Minify/CSS/UriRewriter.php';/*noLibHook*/
-        if (isset($options['currentDir'])) {
+        require_once 'Minify/CSS/UriRewriter.php';
+        if ($options['currentDir']) {
            return Minify_CSS_UriRewriter::rewrite(
                $css
                ,$options['currentDir']
-                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
-                ,isset($options['symlinks']) ? $options['symlinks'] : array()
+                ,$options['docRoot']
+                ,$options['symlinks']
            );  
        } else {
            return Minify_CSS_UriRewriter::prepend(
@@ -36,14 +36,14 @@ class Minify_CSS_Compressor {
    }
    
    /**
-     * @var array options
+     * @var array
     */
    protected $_options = null;
    
    /**
-     * @var bool Are we "in" a hack?
-     * 
-     * I.e. are some browsers targetted until the next comment?
+     * Are we "in" a hack? I.e. are some browsers targetted until the next comment?
+     *
+     * @var bool
     */
    protected $_inHack = false;
    
@@ -52,8 +52,6 @@ class Minify_CSS_Compressor {
     * Constructor
     * 
     * @param array $options (currently ignored)
-     * 
-     * @return null
     */
    private function __construct($options) {
        $this->_options = $options;
@@ -108,7 +106,7 @@ class Minify_CSS_Compressor {
                \\s*
                :
                \\s*
-                (\\b|[#\'"])        # 3 = first character of a value
+                (\\b|[#\'"-])        # 3 = first character of a value
            /x', '$1$2:$3', $css);
        
        // remove ws in selectors
@@ -236,15 +234,16 @@ class Minify_CSS_Compressor {
     */
    protected function _fontFamilyCB($m)
    {
-        $m[1] = preg_replace('/
-                \\s*
-                (
-                    "[^"]+"      # 1 = family in double qutoes
-                    |\'[^\']+\'  # or 1 = family in single quotes
-                    |[\\w\\-]+   # or 1 = unquoted family
-                )
-                \\s*
-            /x', '$1', $m[1]);
-        return 'font-family:' . $m[1] . $m[2];
+        // Issue 210: must not eliminate WS between words in unquoted families
+        $pieces = preg_split('/(\'[^\']+\'|"[^"]+")/', $m[1], null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $out = 'font-family:';
+        while (null !== ($piece = array_shift($pieces))) {
+            if ($piece[0] !== '"' && $piece[0] !== "'") {
+                $piece = preg_replace('/\\s+/', ' ', $piece);
+                $piece = preg_replace('/\\s?,\\s?/', ',', $piece);
+            }
+            $out .= $piece;
+        }
+        return $out . $m[2];
    }
 }
@@ -12,21 +12,15 @@
 */
 class Minify_CSS_UriRewriter {
    
-    /**
-     * Defines which class to call as part of callbacks, change this
-     * if you extend Minify_CSS_UriRewriter
-     * @var string
-     */
-    protected static $className = 'Minify_CSS_UriRewriter';
-    
    /**
     * rewrite() and rewriteRelative() append debugging information here
+     *
     * @var string
     */
    public static $debugText = '';
    
    /**
-     * Rewrite file relative URIs as root relative in CSS files
+     * In CSS content, rewrite file relative URIs as root relative
     * 
     * @param string $css
     * 
@@ -83,7 +77,7 @@ class Minify_CSS_UriRewriter {
    }
    
    /**
-     * Prepend a path to relative URIs in CSS files
+     * In CSS content, prepend a path to relative URIs
     * 
     * @param string $css
     * 
@@ -107,73 +101,8 @@ class Minify_CSS_UriRewriter {
        return $css;
    }
    
-    
    /**
-     * @var string directory of this stylesheet
-     */
-    private static $_currentDir = '';
-    
-    /**
-     * @var string DOC_ROOT
-     */
-    private static $_docRoot = '';
-    
-    /**
-     * @var array directory replacements to map symlink targets back to their
-     * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath'
-     */
-    private static $_symlinks = array();
-    
-    /**
-     * @var string path to prepend
-     */
-    private static $_prependPath = null;
-    
-    private static function _trimUrls($css)
-    {
-        return preg_replace('/
-            url\\(      # url(
-            \\s*
-            ([^\\)]+?)  # 1 = URI (assuming does not contain ")")
-            \\s*
-            \\)         # )
-        /x', 'url($1)', $css);
-    }
-    
-    private static function _processUriCB($m)
-    {
-        // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-        $isImport = ($m[0][0] === '@');
-        // determine URI and the quote character (if any)
-        if ($isImport) {
-            $quoteChar = $m[1];
-            $uri = $m[2];
-        } else {
-            // $m[1] is either quoted or not
-            $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"')
-                ? $m[1][0]
-                : '';
-            $uri = ($quoteChar === '')
-                ? $m[1]
-                : substr($m[1], 1, strlen($m[1]) - 2);
-        }
-        // analyze URI
-        if ('/' !== $uri[0]                  // root-relative
-            && false === strpos($uri, '//')  // protocol (non-data)
-            && 0 !== strpos($uri, 'data:')   // data protocol
-        ) {
-            // URI is file-relative: rewrite depending on options
-            $uri = (self::$_prependPath !== null)
-                ? (self::$_prependPath . $uri)
-                : self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks);
-        }
-        return $isImport
-            ? "@import {$quoteChar}{$uri}{$quoteChar}"
-            : "url({$quoteChar}{$uri}{$quoteChar})";
-    }
-    
-    /**
-     * Rewrite a file relative URI as root relative
+     * Get a root relative URI from a file relative URI
     *
     * <code>
     * Minify_CSS_UriRewriter::rewriteRelative(
@@ -219,16 +148,16 @@ class Minify_CSS_UriRewriter {
        self::$debugText .= "file-relative URI  : {$uri}\n"
                          . "path prepended     : {$path}\n";
        
-        // "unresolve" a symlink back to doc root
-        foreach ($symlinks as $link => $target) {
-            if (0 === strpos($path, $target)) {
-                // replace $target with $link
+        // "unresolve" a symlink back to doc root
+        foreach ($symlinks as $link => $target) {
+            if (0 === strpos($path, $target)) {
+                // replace $target with $link
                $path = $link . substr($path, strlen($target));
                
-                self::$debugText .= "symlink unresolved : {$path}\n";
+                self::$debugText .= "symlink unresolved : {$path}\n";
                
-                break;
-            }
+                break;
+            }
        }
        // strip doc root
        $path = substr($path, strlen($realDocRoot));
@@ -236,21 +165,39 @@ class Minify_CSS_UriRewriter {
        self::$debugText .= "docroot stripped   : {$path}\n";
        
        // fix to root-relative URI
-
        $uri = strtr($path, '/\\', '//');
-
-        // remove /./ and /../ where possible
-        $uri = str_replace('/./', '/', $uri);
-        // inspired by patch from Oleg Cherniy
-        do {
-            $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed);
-        } while ($changed);
+        $uri = self::removeDots($uri);
      
        self::$debugText .= "traversals removed : {$uri}\n\n";
        
        return $uri;
    }
+
+    /**
+     * Remove instances of "./" and "../" where possible from a root-relative URI
+     *
+     * @param string $uri
+     *
+     * @return string
+     */
+    public static function removeDots($uri)
+    {
+        $uri = str_replace('/./', '/', $uri);
+        // inspired by patch from Oleg Cherniy
+        do {
+            $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed);
+        } while ($changed);
+        return $uri;
+    }
    
+    /**
+     * Defines which class to call as part of callbacks, change this
+     * if you extend Minify_CSS_UriRewriter
+     *
+     * @var string
+     */
+    protected static $className = 'Minify_CSS_UriRewriter';
+
    /**
     * Get realpath with any trailing slash removed. If realpath() fails,
     * just remove the trailing slash.
@@ -267,4 +214,97 @@ class Minify_CSS_UriRewriter {
        }
        return rtrim($path, '/\\');
    }
+
+    /**
+     * Directory of this stylesheet
+     *
+     * @var string
+     */
+    private static $_currentDir = '';
+
+    /**
+     * DOC_ROOT
+     *
+     * @var string
+     */
+    private static $_docRoot = '';
+
+    /**
+     * directory replacements to map symlink targets back to their
+     * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath'
+     *
+     * @var array
+     */
+    private static $_symlinks = array();
+
+    /**
+     * Path to prepend
+     *
+     * @var string
+     */
+    private static $_prependPath = null;
+
+    /**
+     * @param string $css
+     *
+     * @return string
+     */
+    private static function _trimUrls($css)
+    {
+        return preg_replace('/
+            url\\(      # url(
+            \\s*
+            ([^\\)]+?)  # 1 = URI (assuming does not contain ")")
+            \\s*
+            \\)         # )
+        /x', 'url($1)', $css);
+    }
+
+    /**
+     * @param array $m
+     *
+     * @return string
+     */
+    private static function _processUriCB($m)
+    {
+        // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+        $isImport = ($m[0][0] === '@');
+        // determine URI and the quote character (if any)
+        if ($isImport) {
+            $quoteChar = $m[1];
+            $uri = $m[2];
+        } else {
+            // $m[1] is either quoted or not
+            $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"')
+                ? $m[1][0]
+                : '';
+            $uri = ($quoteChar === '')
+                ? $m[1]
+                : substr($m[1], 1, strlen($m[1]) - 2);
+        }
+        // analyze URI
+        if ('/' !== $uri[0]                  // root-relative
+            && false === strpos($uri, '//')  // protocol (non-data)
+            && 0 !== strpos($uri, 'data:')   // data protocol
+        ) {
+            // URI is file-relative: rewrite depending on options
+            if (self::$_prependPath === null) {
+                $uri = self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks);
+            } else {
+                $uri = self::$_prependPath . $uri;
+                if ($uri[0] === '/') {
+                    $root = '';
+                    $rootRelative = $uri;
+                    $uri = $root . self::removeDots($rootRelative);
+                } elseif (preg_match('@^((https?\:)?//([^/]+))/@', $uri, $m) && (false !== strpos($m[3], '.'))) {
+                    $root = $m[1];
+                    $rootRelative = substr($uri, strlen($root));
+                    $uri = $root . self::removeDots($rootRelative);
+                }
+            }
+        }
+        return $isImport
+            ? "@import {$quoteChar}{$uri}{$quoteChar}"
+            : "url({$quoteChar}{$uri}{$quoteChar})";
+    }
 }
@@ -54,9 +54,12 @@ class Minify_Cache_APC {
     */
    public function getSize($id)
    {
-        return $this->_fetch($id)
-            ? strlen($this->_data)
-            : false;
+        if (! $this->_fetch($id)) {
+            return false;
+        }
+        return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
+            ? mb_strlen($this->_data, '8bit')
+            : strlen($this->_data);
    }

    /**
@@ -9,13 +9,12 @@ class Minify_Cache_File {
    public function __construct($path = '', $fileLocking = false)
    {
        if (! $path) {
-            require_once 'Solar/Dir.php';/*noLibHook*/
-            $path = rtrim(Solar_Dir::tmp(), DIRECTORY_SEPARATOR);
-        }
+            $path = self::tmp();
+        }
        $this->_locking = $fileLocking;
        $this->_path = $path;
    }
-    
+
    /**
     * Write data to cache.
     *
@@ -27,20 +26,19 @@ class Minify_Cache_File {
     */
    public function store($id, $data)
    {
-        $flag = $this->_locking
-            ? LOCK_EX
-            : null;
-        if (is_file($this->_path . '/' . $id)) {
-            @unlink($this->_path . '/' . $id);
-        }
-        if (! @file_put_contents($this->_path . '/' . $id, $data, $flag)) {
-            return false;
+        $flag = $this->_locking
+            ? LOCK_EX
+            : null;
+        $file = $this->_path . '/' . $id;
+        if (! @file_put_contents($file, $data, $flag)) {
+            $this->_log("Minify_Cache_File: Write failed to '$file'");
+        }
+        // write control
+        if ($data !== $this->fetch($id)) {
+            @unlink($file);
+            $this->_log("Minify_Cache_File: Post-write read failed for '$file'");
+            return false;
        }
-        // write control
-        if ($data !== $this->fetch($id)) {
-            @unlink($file);
-            return false;
-        }
        return true;
    }
    
@@ -78,15 +76,15 @@ class Minify_Cache_File {
     */
    public function display($id)
    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            flock($fp, LOCK_SH);
-            fpassthru($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-        } else {
-            readfile($this->_path . '/' . $id);            
-        }
+        if ($this->_locking) {
+            $fp = fopen($this->_path . '/' . $id, 'rb');
+            flock($fp, LOCK_SH);
+            fpassthru($fp);
+            flock($fp, LOCK_UN);
+            fclose($fp);
+        } else {
+            readfile($this->_path . '/' . $id);            
+        }
    }
    
 	/**
@@ -98,15 +96,15 @@ class Minify_Cache_File {
     */
    public function fetch($id)
    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            flock($fp, LOCK_SH);
-            $ret = stream_get_contents($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-            return $ret;
-        } else {
-            return file_get_contents($this->_path . '/' . $id);
+        if ($this->_locking) {
+            $fp = fopen($this->_path . '/' . $id, 'rb');
+            flock($fp, LOCK_SH);
+            $ret = stream_get_contents($fp);
+            flock($fp, LOCK_UN);
+            fclose($fp);
+            return $ret;
+        } else {
+            return file_get_contents($this->_path . '/' . $id);
        }
    }
    
@@ -119,7 +117,79 @@ class Minify_Cache_File {
    {
        return $this->_path;
    }
+
+    /**
+     * Get a usable temp directory
+     *
+     * Adapted from Solar/Dir.php
+     * @author Paul M. Jones <pmjones@solarphp.com>
+     * @license http://opensource.org/licenses/bsd-license.php BSD
+     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
+     *
+     * @return string
+     */
+    public static function tmp()
+    {
+        static $tmp = null;
+        if (! $tmp) {
+            $tmp = function_exists('sys_get_temp_dir')
+                ? sys_get_temp_dir()
+                : self::_tmp();
+            $tmp = rtrim($tmp, DIRECTORY_SEPARATOR);
+        }
+        return $tmp;
+    }
+
+    /**
+     * Returns the OS-specific directory for temporary files
+     *
+     * @author Paul M. Jones <pmjones@solarphp.com>
+     * @license http://opensource.org/licenses/bsd-license.php BSD
+     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
+     *
+     * @return string
+     */
+    protected static function _tmp()
+    {
+        // non-Windows system?
+        if (strtolower(substr(PHP_OS, 0, 3)) != 'win') {
+            $tmp = empty($_ENV['TMPDIR']) ? getenv('TMPDIR') : $_ENV['TMPDIR'];
+            if ($tmp) {
+                return $tmp;
+            } else {
+                return '/tmp';
+            }
+        }
+        // Windows 'TEMP'
+        $tmp = empty($_ENV['TEMP']) ? getenv('TEMP') : $_ENV['TEMP'];
+        if ($tmp) {
+            return $tmp;
+        }
+        // Windows 'TMP'
+        $tmp = empty($_ENV['TMP']) ? getenv('TMP') : $_ENV['TMP'];
+        if ($tmp) {
+            return $tmp;
+        }
+        // Windows 'windir'
+        $tmp = empty($_ENV['windir']) ? getenv('windir') : $_ENV['windir'];
+        if ($tmp) {
+            return $tmp;
+        }
+        // final fallback for Windows
+        return getenv('SystemRoot') . '\\temp';
+    }
+
+    /**
+     * Send message to the Minify logger
+     * @param string $msg
+     * @return null
+     */
+    protected function _log($msg)
+    {
+        require_once 'Minify/Logger.php';
+        Minify_Logger::log($msg);
+    }
    
    private $_path = null;
-    private $_locking = null;
+    private $_locking = null;
 }
@@ -60,9 +60,12 @@ class Minify_Cache_Memcache {
     */
    public function getSize($id)
    {
-        return $this->_fetch($id)
-            ? strlen($this->_data)
-            : false;
+        if (! $this->_fetch($id)) {
+            return false;
+        }
+        return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
+            ? mb_strlen($this->_data, '8bit')
+            : strlen($this->_data);
    }
    
    /**
@@ -30,8 +30,7 @@ class Minify_CommentPreserver {
     * Process a string outside of C-style comments that begin with "/*!"
     *
     * On each non-empty string outside these comments, the given processor 
-     * function will be called. The first "!" will be removed from the 
-     * preserved comments, and the comments will be surrounded by 
+     * function will be called. The comments will be surrounded by 
     * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append.
     * 
     * @param string $content
@@ -65,7 +64,7 @@ class Minify_CommentPreserver {
     * @param string $in input
     * 
     * @return array 3 elements are returned. If a YUI comment is found, the
-     * 2nd element is the comment and the 1st and 2nd are the surrounding
+     * 2nd element is the comment and the 1st and 3rd are the surrounding
     * strings. If no comment is found, the entire string is returned as the 
     * 1st element and the other two are false.
     */
@@ -79,7 +78,7 @@ class Minify_CommentPreserver {
        }
        $ret = array(
            substr($in, 0, $start)
-            ,self::$prepend . '/*' . substr($in, $start + 3, $end - $start - 1) . self::$append
+            ,self::$prepend . '/*!' . substr($in, $start + 3, $end - $start - 1) . self::$append
        );
        $endChars = (strlen($in) - $end - 2);
        $ret[] = (0 === $endChars)
@@ -27,7 +27,7 @@ abstract class Minify_Controller_Base {
     * 
     * @param array $options controller and Minify options
     * 
-     * return array $options Minify::serve options
+     * @return array $options Minify::serve options
     */
    abstract public function setupSources($options);
    
@@ -52,15 +52,16 @@ abstract class Minify_Controller_Base {
            ,'quiet' => false // serve() will send headers and output
            ,'debug' => false
            
-            // if you override this, the response code MUST be directly after 
+            // if you override these, the response codes MUST be directly after
            // the first space.
            ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request'
+            ,'errorHeader'      => 'HTTP/1.0 500 Internal Server Error'
            
            // callback function to see/modify content of all sources
            ,'postprocessor' => null
            // file to require to load preprocessor
            ,'postprocessorRequire' => null
-        );/*noLibHook*/
+        );
    }  

    /**
@@ -100,7 +101,7 @@ abstract class Minify_Controller_Base {
            && is_string($minifierCallback[0])
            && !class_exists($minifierCallback[0], false)) {
            
-            require str_replace('_', '/', $minifierCallback[0]) . '.php';/*noLibHook*/
+            require str_replace('_', '/', $minifierCallback[0]) . '.php';
        }
    }
    
@@ -117,6 +118,8 @@ abstract class Minify_Controller_Base {
     * be in subdirectories of these directories.
     * 
     * @return bool file is safe
+     *
+     * @deprecated use checkAllowDirs, checkNotHidden instead
     */
    public static function _fileIsSafe($file, $safeDirs)
    {
@@ -134,15 +137,58 @@ abstract class Minify_Controller_Base {
        list($revExt) = explode('.', strrev($base));
        return in_array(strrev($revExt), array('js', 'css', 'html', 'txt'));
    }
-    
+
    /**
-     * @var array instances of Minify_Source, which provide content and
-     * any individual minification needs.
+     * @param string $file
+     * @param array $allowDirs
+     * @param string $uri
+     * @return bool
+     * @throws Exception
+     */
+    public static function checkAllowDirs($file, $allowDirs, $uri)
+    {
+        foreach ((array)$allowDirs as $allowDir) {
+            if (strpos($file, $allowDir) === 0) {
+                return true;
+            }
+        }
+        throw new Exception("File '$file' is outside \$allowDirs. If the path is"
+            . " resolved via an alias/symlink, look into the \$min_symlinks option."
+            . " E.g. \$min_symlinks['/" . dirname($uri) . "'] = '" . dirname($file) . "';");
+    }
+
+    /**
+     * @param string $file
+     * @throws Exception
+     */
+    public static function checkNotHidden($file)
+    {
+        $b = basename($file);
+        if (0 === strpos($b, '.')) {
+            throw new Exception("Filename '$b' starts with period (may be hidden)");
+        }
+    }
+
+    /**
+     * instances of Minify_Source, which provide content and any individual minification needs.
+     *
+     * @var array
     * 
     * @see Minify_Source
     */
    public $sources = array();
    
+    /**
+     * Short name to place inside cache id
+     *
+     * The setupSources() method may choose to set this, making it easier to
+     * recognize a particular set of sources/settings in the cache folder. It
+     * will be filtered and truncated to make the final cache id <= 250 bytes.
+     * 
+     * @var string
+     */
+    public $selectionId = '';
+
    /**
     * Mix in default controller options with user-given options
     * 
@@ -192,11 +238,13 @@ abstract class Minify_Controller_Base {

    /**
     * Send message to the Minify logger
+     *
     * @param string $msg
+     *
     * @return null
     */
-    protected function log($msg) {
-        require_once 'Minify/Logger.php';/*noLibHook*/
+    public function log($msg) {
+        require_once 'Minify/Logger.php';
        Minify_Logger::log($msg);
    }
 }
@@ -4,7 +4,7 @@
 * @package Minify
 */

-require_once 'Minify/Controller/Base.php';/*noLibHook*/
+require_once 'Minify/Controller/Base.php';

 /**
 * Controller class for minifying a set of files
@@ -4,7 +4,7 @@
 * @package Minify
 */

-require_once 'Minify/Controller/Base.php';/*noLibHook*/
+require_once 'Minify/Controller/Base.php';

 /**
 * Controller class for serving predetermined groups of minimized sets, selected
@@ -34,12 +34,11 @@ class Minify_Controller_Groups extends Minify_Controller_Base {
     * Set up groups of files as sources
     * 
     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     * Controller options:
-     * 
+     *
     * 'groups': (required) array mapping PATH_INFO strings to arrays
-     * of complete file paths. @see Minify_Controller_Groups 
+     * of complete file paths. @see Minify_Controller_Groups
+     *
+     * @return array Minify options
     */
    public function setupSources($options) {
        // strip controller options
@@ -4,7 +4,7 @@
 * @package Minify
 */

-require_once 'Minify/Controller/Base.php';/*noLibHook*/
+require_once 'Minify/Controller/Base.php';

 /**
 * Controller class for requests to /min/index.php
@@ -18,8 +18,8 @@ class Minify_Controller_MinApp extends Minify_Controller_Base {
     * Set up groups of files as sources
     * 
     * @param array $options controller and Minify options
+     *
     * @return array Minify options
-     * 
     */
    public function setupSources($options) {
        // filter controller options
@@ -28,64 +28,94 @@ class Minify_Controller_MinApp extends Minify_Controller_Base {
                'allowDirs' => '//'
                ,'groupsOnly' => false
                ,'groups' => array()
-                ,'maxFiles' => 10                
+                ,'noMinPattern' => '@[-\\.]min\\.(?:js|css)$@i' // matched against basename
            )
            ,(isset($options['minApp']) ? $options['minApp'] : array())
        );
        unset($options['minApp']);
        $sources = array();
+        $this->selectionId = '';
+        $firstMissingResource = null;
+        
        if (isset($_GET['g'])) {
-            // try groups
-            if (! isset($cOptions['groups'][$_GET['g']])) {
-                $this->log("A group configuration for \"{$_GET['g']}\" was not set");
+            // add group(s)
+            $this->selectionId .= 'g=' . $_GET['g'];
+            $keys = explode(',', $_GET['g']);
+            if ($keys != array_unique($keys)) {
+                $this->log("Duplicate group key found.");
                return $options;
            }
-            
-            $files = $cOptions['groups'][$_GET['g']];
-            // if $files is a single object, casting will break it
-            if (is_object($files)) {
-                $files = array($files);
-            } elseif (! is_array($files)) {
-                $files = (array)$files;
-            }
-            foreach ($files as $file) {
-                if ($file instanceof Minify_Source) {
-                    $sources[] = $file;
-                    continue;
-                }
-                if (0 === strpos($file, '//')) {
-                    $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-                }
-                $file = realpath($file);
-                if (is_file($file)) {
-                    $sources[] = new Minify_Source(array(
-                        'filepath' => $file
-                    ));    
-                } else {
-                    $this->log("The path \"{$file}\" could not be found (or was not a file)");
+            $keys = explode(',', $_GET['g']);
+            foreach ($keys as $key) {
+                if (! isset($cOptions['groups'][$key])) {
+                    $this->log("A group configuration for \"{$key}\" was not found");
                    return $options;
                }
+                $files = $cOptions['groups'][$key];
+                // if $files is a single object, casting will break it
+                if (is_object($files)) {
+                    $files = array($files);
+                } elseif (! is_array($files)) {
+                    $files = (array)$files;
+                }
+                foreach ($files as $file) {
+                    if ($file instanceof Minify_Source) {
+                        $sources[] = $file;
+                        continue;
+                    }
+                    if (0 === strpos($file, '//')) {
+                        $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
+                    }
+                    $realpath = realpath($file);
+                    if ($realpath && is_file($realpath)) {
+                        $sources[] = $this->_getFileSource($realpath, $cOptions);
+                    } else {
+                        $this->log("The path \"{$file}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
+                        if (null === $firstMissingResource) {
+                            $firstMissingResource = basename($file);
+                            continue;
+                        } else {
+                            $secondMissingResource = basename($file);
+                            $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource'");
+                            return $options;
+                        }
+                    }
+                }
+                if ($sources) {
+                    try {
+                        $this->checkType($sources[0]);
+                    } catch (Exception $e) {
+                        $this->log($e->getMessage());
+                        return $options;
+                    }
+                }
            }
-        } elseif (! $cOptions['groupsOnly'] && isset($_GET['f'])) {
+        }
+        if (! $cOptions['groupsOnly'] && isset($_GET['f'])) {
            // try user files
            // The following restrictions are to limit the URLs that minify will
-            // respond to. Ideally there should be only one way to reference a file.
+            // respond to.
            if (// verify at least one file, files are single comma separated, 
                // and are all same extension
-                ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f'])
+                ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f'], $m)
                // no "//"
                || strpos($_GET['f'], '//') !== false
                // no "\"
                || strpos($_GET['f'], '\\') !== false
-                // no "./"
-                || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['f'])
            ) {
-                $this->log("GET param 'f' invalid (see MinApp.php line 63)");
+                $this->log("GET param 'f' was invalid");
+                return $options;
+            }
+            $ext = ".{$m[1]}";
+            try {
+                $this->checkType($m[1]);
+            } catch (Exception $e) {
+                $this->log($e->getMessage());
                return $options;
            }
            $files = explode(',', $_GET['f']);
-            if (count($files) > $cOptions['maxFiles'] || $files != array_unique($files)) {
-                $this->log("Too many or duplicate files specified");
+            if ($files != array_unique($files)) {
+                $this->log("Duplicate files were specified");
                return $options;
            }
            if (isset($_GET['b'])) {
@@ -96,7 +126,7 @@ class Minify_Controller_MinApp extends Minify_Controller_Base {
                    // valid base
                    $base = "/{$_GET['b']}/";       
                } else {
-                    $this->log("GET param 'b' invalid (see MinApp.php line 84)");
+                    $this->log("GET param 'b' was invalid");
                    return $options;
                }
            } else {
@@ -106,27 +136,96 @@ class Minify_Controller_MinApp extends Minify_Controller_Base {
            foreach ((array)$cOptions['allowDirs'] as $allowDir) {
                $allowDirs[] = realpath(str_replace('//', $_SERVER['DOCUMENT_ROOT'] . '/', $allowDir));
            }
+            $basenames = array(); // just for cache id
            foreach ($files as $file) {
-                $path = $_SERVER['DOCUMENT_ROOT'] . $base . $file;
-                $file = realpath($path);
-                if (false === $file) {
-                    $this->log("Path \"{$path}\" failed realpath()");
-                    return $options;
-                } elseif (! parent::_fileIsSafe($file, $allowDirs)) {
-                    $this->log("Path \"{$path}\" failed Minify_Controller_Base::_fileIsSafe()");
-                    return $options;
-                } else {
-                    $sources[] = new Minify_Source(array(
-                        'filepath' => $file
-                    ));
+                $uri = $base . $file;
+                $path = $_SERVER['DOCUMENT_ROOT'] . $uri;
+                $realpath = realpath($path);
+                if (false === $realpath || ! is_file($realpath)) {
+                    $this->log("The path \"{$path}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
+                    if (null === $firstMissingResource) {
+                        $firstMissingResource = $uri;
+                        continue;
+                    } else {
+                        $secondMissingResource = $uri;
+                        $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource`'");
+                        return $options;
+                    }
                }
+                try {
+                    parent::checkNotHidden($realpath);
+                    parent::checkAllowDirs($realpath, $allowDirs, $uri);
+                } catch (Exception $e) {
+                    $this->log($e->getMessage());
+                    return $options;
+                }
+                $sources[] = $this->_getFileSource($realpath, $cOptions);
+                $basenames[] = basename($realpath, $ext);
            }
+            if ($this->selectionId) {
+                $this->selectionId .= '_f=';
+            }
+            $this->selectionId .= implode(',', $basenames) . $ext;
        }
        if ($sources) {
+            if (null !== $firstMissingResource) {
+                array_unshift($sources, new Minify_Source(array(
+                    'id' => 'missingFile'
+                    // should not cause cache invalidation
+                    ,'lastModified' => 0
+                    // due to caching, filename is unreliable.
+                    ,'content' => "/* Minify: at least one missing file. See " . Minify::URL_DEBUG . " */\n"
+                    ,'minifier' => ''
+                )));
+            }
            $this->sources = $sources;
        } else {
            $this->log("No sources to serve");
        }
        return $options;
    }
+
+    /**
+     * @param string $file
+     *
+     * @param array $cOptions
+     *
+     * @return Minify_Source
+     */
+    protected function _getFileSource($file, $cOptions)
+    {
+        $spec['filepath'] = $file;
+        if ($cOptions['noMinPattern']
+            && preg_match($cOptions['noMinPattern'], basename($file))) {
+            $spec['minifier'] = '';
+        }
+        return new Minify_Source($spec);
+    }
+
+    protected $_type = null;
+
+    /**
+     * Make sure that only source files of a single type are registered
+     *
+     * @param string $sourceOrExt
+     *
+     * @throws Exception
+     */
+    public function checkType($sourceOrExt)
+    {
+        if ($sourceOrExt === 'js') {
+            $type = Minify::TYPE_JS;
+        } elseif ($sourceOrExt === 'css') {
+            $type = Minify::TYPE_CSS;
+        } elseif ($sourceOrExt->contentType !== null) {
+            $type = $sourceOrExt->contentType;
+        } else {
+            return;
+        }
+        if ($this->_type === null) {
+            $this->_type = $type;
+        } elseif ($this->_type !== $type) {
+            throw new Exception('Content-Type mismatch');
+        }
+    }
 }
@@ -4,7 +4,7 @@
 * @package Minify
 */

-require_once 'Minify/Controller/Base.php';/*noLibHook*/
+require_once 'Minify/Controller/Base.php';

 /**
 * Controller class for serving a single HTML page
@@ -40,14 +40,19 @@ class Minify_Controller_Page extends Minify_Controller_Base {
            $sourceSpec = array(
                'filepath' => $options['file']
            );
+            $f = $options['file'];
        } else {
            // strip controller options
            $sourceSpec = array(
                'content' => $options['content']
                ,'id' => $options['id']
            );
+            $f = $options['id'];
            unset($options['content'], $options['id']);
        }
+        // something like "builder,index.php" or "directory,file.html"
+        $this->selectionId = strtr(substr($f, 1 + strlen(dirname(dirname($f)))), '/\\', ',,');
+
        if (isset($options['minifyAll'])) {
            // this will be the 2nd argument passed to Minify_HTML::minify()
            $sourceSpec['minifyOptions'] = array(
@@ -73,8 +78,8 @@ class Minify_Controller_Page extends Minify_Controller_Base {
        if ($this->_loadCssJsMinifiers) {
            // Minify will not call for these so we must manually load
            // them when Minify/HTML.php is called for.
-            require_once 'Minify/CSS.php';/*noLibHook*/
-            require_once 'JSMin.php';/*noLibHook*/
+            require_once 'Minify/CSS.php';
+            require_once 'JSMin.php';
        }
        parent::loadMinifier($minifierCallback); // load Minify/HTML.php
    }
@@ -4,10 +4,10 @@
 * @package Minify
 */

-require_once 'Minify/Controller/Base.php';/*noLibHook*/
+require_once 'Minify/Controller/Base.php';

 /**
- * Controller class for emulating version 1 of minify.php
+ * Controller class for emulating version 1 of minify.php (mostly a proof-of-concept)
 * 
 * <code>
 * Minify::serve('Version1');
@@ -1,245 +1,246 @@
-<?php
-/**
- * Class Minify_HTML  
- * @package Minify
- */
-
-/**
- * Compress HTML
- *
- * This is a heavy regex-based removal of whitespace, unnecessary comments and 
- * tokens. IE conditional comments are preserved. There are also options to have
- * STYLE and SCRIPT blocks compressed by callback functions. 
- * 
- * A test suite is available.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_HTML {
-
-    /**
-     * "Minify" an HTML page
-     *
-     * @param string $html
-     *
-     * @param array $options
-     *
-     * 'cssMinifier' : (optional) callback function to process content of STYLE
-     * elements.
-     * 
-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT
-     * elements. Note: the type attribute is ignored.
-     * 
-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
-     * unset, minify will sniff for an XHTML doctype.
-     * 
-     * @return string
-     */
-    public static function minify($html, $options = array()) {
-        $min = new Minify_HTML($html, $options);
-        return $min->process();
-    }
-    
-    
-    /**
-     * Create a minifier object
-     *
-     * @param string $html
-     *
-     * @param array $options
-     *
-     * 'cssMinifier' : (optional) callback function to process content of STYLE
-     * elements.
-     * 
-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT
-     * elements. Note: the type attribute is ignored.
-     * 
-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
-     * unset, minify will sniff for an XHTML doctype.
-     * 
-     * @return null
-     */
-    public function __construct($html, $options = array())
-    {
-        $this->_html = str_replace("\r\n", "\n", trim($html));
-        if (isset($options['xhtml'])) {
-            $this->_isXhtml = (bool)$options['xhtml'];
-        }
-        if (isset($options['cssMinifier'])) {
-            $this->_cssMinifier = $options['cssMinifier'];
-        }
-        if (isset($options['jsMinifier'])) {
-            $this->_jsMinifier = $options['jsMinifier'];
-        }
-    }
-    
-    
-    /**
-     * Minify the markeup given in the constructor
-     * 
-     * @return string
-     */
-    public function process()
-    {
-        if ($this->_isXhtml === null) {
-            $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
-        }
-        
-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
-        $this->_placeholders = array();
-        
-        // replace SCRIPTs (and minify) with placeholders
-        $this->_html = preg_replace_callback(
-            '/(\\s*)(<script\\b[^>]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i'
-            ,array($this, '_removeScriptCB')
-            ,$this->_html);
-        
-        // replace STYLEs (and minify) with placeholders
-        $this->_html = preg_replace_callback(
-            '/\\s*(<style\\b[^>]*?>)([\\s\\S]*?)<\\/style>\\s*/i'
-            ,array($this, '_removeStyleCB')
-            ,$this->_html);
-        
-        // remove HTML comments (not containing IE conditional comments).
-        $this->_html = preg_replace_callback(
-            '/<!--([\\s\\S]*?)-->/'
-            ,array($this, '_commentCB')
-            ,$this->_html);
-        
-        // replace PREs with placeholders
-        $this->_html = preg_replace_callback('/\\s*(<pre\\b[^>]*?>[\\s\\S]*?<\\/pre>)\\s*/i'
-            ,array($this, '_removePreCB')
-            ,$this->_html);
-        
-        // replace TEXTAREAs with placeholders
-        $this->_html = preg_replace_callback(
-            '/\\s*(<textarea\\b[^>]*?>[\\s\\S]*?<\\/textarea>)\\s*/i'
-            ,array($this, '_removeTextareaCB')
-            ,$this->_html);
-        
-        // trim each line.
-        // @todo take into account attribute values that span multiple lines.
-        $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html);
-        
-        // remove ws around block/undisplayed elements
-        $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body'
-            .'|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form'
-            .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta'
-            .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)'
-            .'|ul)\\b[^>]*>)/i', '$1', $this->_html);
-        
-        // remove ws outside of all elements
-        $this->_html = preg_replace_callback(
-            '/>([^<]+)</'
-            ,array($this, '_outsideTagCB')
-            ,$this->_html);
-        
-        // use newlines before 1st attribute in open tags (to limit line lengths)
-        $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
-        
-        // fill placeholders
-        $this->_html = str_replace(
-            array_keys($this->_placeholders)
-            ,array_values($this->_placeholders)
-            ,$this->_html
-        );
-        return $this->_html;
-    }
-    
-    protected function _commentCB($m)
-    {
-        return (0 === strpos($m[1], '[') || false !== strpos($m[1], '<!['))
-            ? $m[0]
-            : '';
-    }
-    
-    protected function _reservePlace($content)
-    {
-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
-        $this->_placeholders[$placeholder] = $content;
-        return $placeholder;
-    }
-
-    protected $_isXhtml = null;
-    protected $_replacementHash = null;
-    protected $_placeholders = array();
-    protected $_cssMinifier = null;
-    protected $_jsMinifier = null;
-
-    protected function _outsideTagCB($m)
-    {
-        return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<';
-    }
-    
-    protected function _removePreCB($m)
-    {
-        return $this->_reservePlace($m[1]);
-    }
-    
-    protected function _removeTextareaCB($m)
-    {
-        return $this->_reservePlace($m[1]);
-    }
-
-    protected function _removeStyleCB($m)
-    {
-        $openStyle = $m[1];
-        $css = $m[2];
-        // remove HTML comments
-        $css = preg_replace('/(?:^\\s*<!--|-->\\s*$)/', '', $css);
-        
-        // remove CDATA section markers
-        $css = $this->_removeCdata($css);
-        
-        // minify
-        $minifier = $this->_cssMinifier
-            ? $this->_cssMinifier
-            : 'trim';
-        $css = call_user_func($minifier, $css);
-        
-        return $this->_reservePlace($this->_needsCdata($css)
-            ? "{$openStyle}/*<![CDATA[*/{$css}/*]]>*/</style>"
-            : "{$openStyle}{$css}</style>"
-        );
-    }
-
-    protected function _removeScriptCB($m)
-    {
-        $openScript = $m[2];
-        $js = $m[3];
-        
-        // whitespace surrounding? preserve at least one space
-        $ws1 = ($m[1] === '') ? '' : ' ';
-        $ws2 = ($m[4] === '') ? '' : ' ';
- 
-        // remove HTML comments (and ending "//" if present)
-        $js = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $js);
-            
-        // remove CDATA section markers
-        $js = $this->_removeCdata($js);
-        
-        // minify
-        $minifier = $this->_jsMinifier
-            ? $this->_jsMinifier
-            : 'trim'; 
-        $js = call_user_func($minifier, $js);
-        
-        return $this->_reservePlace($this->_needsCdata($js)
-            ? "{$ws1}{$openScript}/*<![CDATA[*/{$js}/*]]>*/</script>{$ws2}"
-            : "{$ws1}{$openScript}{$js}</script>{$ws2}"
-        );
-    }
-
-    protected function _removeCdata($str)
-    {
-        return (false !== strpos($str, '<![CDATA['))
-            ? str_replace(array('<![CDATA[', ']]>'), '', $str)
-            : $str;
-    }
-    
-    protected function _needsCdata($str)
-    {
-        return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str));
-    }
-}
+<?php
+/**
+ * Class Minify_HTML  
+ * @package Minify
+ */
+
+/**
+ * Compress HTML
+ *
+ * This is a heavy regex-based removal of whitespace, unnecessary comments and 
+ * tokens. IE conditional comments are preserved. There are also options to have
+ * STYLE and SCRIPT blocks compressed by callback functions. 
+ * 
+ * A test suite is available.
+ * 
+ * @package Minify
+ * @author Stephen Clay <steve@mrclay.org>
+ */
+class Minify_HTML {
+
+    /**
+     * "Minify" an HTML page
+     *
+     * @param string $html
+     *
+     * @param array $options
+     *
+     * 'cssMinifier' : (optional) callback function to process content of STYLE
+     * elements.
+     * 
+     * 'jsMinifier' : (optional) callback function to process content of SCRIPT
+     * elements. Note: the type attribute is ignored.
+     * 
+     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
+     * unset, minify will sniff for an XHTML doctype.
+     * 
+     * @return string
+     */
+    public static function minify($html, $options = array()) {
+        $min = new Minify_HTML($html, $options);
+        return $min->process();
+    }
+    
+    
+    /**
+     * Create a minifier object
+     *
+     * @param string $html
+     *
+     * @param array $options
+     *
+     * 'cssMinifier' : (optional) callback function to process content of STYLE
+     * elements.
+     * 
+     * 'jsMinifier' : (optional) callback function to process content of SCRIPT
+     * elements. Note: the type attribute is ignored.
+     * 
+     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
+     * unset, minify will sniff for an XHTML doctype.
+     * 
+     * @return null
+     */
+    public function __construct($html, $options = array())
+    {
+        $this->_html = str_replace("\r\n", "\n", trim($html));
+        if (isset($options['xhtml'])) {
+            $this->_isXhtml = (bool)$options['xhtml'];
+        }
+        if (isset($options['cssMinifier'])) {
+            $this->_cssMinifier = $options['cssMinifier'];
+        }
+        if (isset($options['jsMinifier'])) {
+            $this->_jsMinifier = $options['jsMinifier'];
+        }
+    }
+    
+    
+    /**
+     * Minify the markeup given in the constructor
+     * 
+     * @return string
+     */
+    public function process()
+    {
+        if ($this->_isXhtml === null) {
+            $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
+        }
+        
+        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
+        $this->_placeholders = array();
+        
+        // replace SCRIPTs (and minify) with placeholders
+        $this->_html = preg_replace_callback(
+            '/(\\s*)<script(\\b[^>]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i'
+            ,array($this, '_removeScriptCB')
+            ,$this->_html);
+        
+        // replace STYLEs (and minify) with placeholders
+        $this->_html = preg_replace_callback(
+            '/\\s*<style(\\b[^>]*>)([\\s\\S]*?)<\\/style>\\s*/i'
+            ,array($this, '_removeStyleCB')
+            ,$this->_html);
+        
+        // remove HTML comments (not containing IE conditional comments).
+        $this->_html = preg_replace_callback(
+            '/<!--([\\s\\S]*?)-->/'
+            ,array($this, '_commentCB')
+            ,$this->_html);
+        
+        // replace PREs with placeholders
+        $this->_html = preg_replace_callback('/\\s*<pre(\\b[^>]*?>[\\s\\S]*?<\\/pre>)\\s*/i'
+            ,array($this, '_removePreCB')
+            ,$this->_html);
+        
+        // replace TEXTAREAs with placeholders
+        $this->_html = preg_replace_callback(
+            '/\\s*<textarea(\\b[^>]*?>[\\s\\S]*?<\\/textarea>)\\s*/i'
+            ,array($this, '_removeTextareaCB')
+            ,$this->_html);
+        
+        // trim each line.
+        // @todo take into account attribute values that span multiple lines.
+        $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html);
+        
+        // remove ws around block/undisplayed elements
+        $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body'
+            .'|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form'
+            .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta'
+            .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)'
+            .'|ul)\\b[^>]*>)/i', '$1', $this->_html);
+        
+        // remove ws outside of all elements
+        $this->_html = preg_replace(
+            '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?</'
+            ,'>$1$2$3<'
+            ,$this->_html);
+        
+        // use newlines before 1st attribute in open tags (to limit line lengths)
+        $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
+        
+        // fill placeholders
+        $this->_html = str_replace(
+            array_keys($this->_placeholders)
+            ,array_values($this->_placeholders)
+            ,$this->_html
+        );
+        // issue 229: multi-pass to catch scripts that didn't get replaced in textareas
+        $this->_html = str_replace(
+            array_keys($this->_placeholders)
+            ,array_values($this->_placeholders)
+            ,$this->_html
+        );
+        return $this->_html;
+    }
+    
+    protected function _commentCB($m)
+    {
+        return (0 === strpos($m[1], '[') || false !== strpos($m[1], '<!['))
+            ? $m[0]
+            : '';
+    }
+    
+    protected function _reservePlace($content)
+    {
+        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
+        $this->_placeholders[$placeholder] = $content;
+        return $placeholder;
+    }
+
+    protected $_isXhtml = null;
+    protected $_replacementHash = null;
+    protected $_placeholders = array();
+    protected $_cssMinifier = null;
+    protected $_jsMinifier = null;
+
+    protected function _removePreCB($m)
+    {
+        return $this->_reservePlace("<pre{$m[1]}");
+    }
+    
+    protected function _removeTextareaCB($m)
+    {
+        return $this->_reservePlace("<textarea{$m[1]}");
+    }
+
+    protected function _removeStyleCB($m)
+    {
+        $openStyle = "<style{$m[1]}";
+        $css = $m[2];
+        // remove HTML comments
+        $css = preg_replace('/(?:^\\s*<!--|-->\\s*$)/', '', $css);
+        
+        // remove CDATA section markers
+        $css = $this->_removeCdata($css);
+        
+        // minify
+        $minifier = $this->_cssMinifier
+            ? $this->_cssMinifier
+            : 'trim';
+        $css = call_user_func($minifier, $css);
+        
+        return $this->_reservePlace($this->_needsCdata($css)
+            ? "{$openStyle}/*<![CDATA[*/{$css}/*]]>*/</style>"
+            : "{$openStyle}{$css}</style>"
+        );
+    }
+
+    protected function _removeScriptCB($m)
+    {
+        $openScript = "<script{$m[2]}";
+        $js = $m[3];
+        
+        // whitespace surrounding? preserve at least one space
+        $ws1 = ($m[1] === '') ? '' : ' ';
+        $ws2 = ($m[4] === '') ? '' : ' ';
+ 
+        // remove HTML comments (and ending "//" if present)
+        $js = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $js);
+            
+        // remove CDATA section markers
+        $js = $this->_removeCdata($js);
+        
+        // minify
+        $minifier = $this->_jsMinifier
+            ? $this->_jsMinifier
+            : 'trim'; 
+        $js = call_user_func($minifier, $js);
+        
+        return $this->_reservePlace($this->_needsCdata($js)
+            ? "{$ws1}{$openScript}/*<![CDATA[*/{$js}/*]]>*/</script>{$ws2}"
+            : "{$ws1}{$openScript}{$js}</script>{$ws2}"
+        );
+    }
+
+    protected function _removeCdata($str)
+    {
+        return (false !== strpos($str, '<![CDATA['))
+            ? str_replace(array('<![CDATA[', ']]>'), '', $str)
+            : $str;
+    }
+    
+    protected function _needsCdata($str)
+    {
+        return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str));
+    }
+}
@@ -1,157 +1,216 @@
-<?php
-/**
- * Class Minify_ImportProcessor  
- * @package Minify
- */
-
-/**
- * Linearize a CSS/JS file by including content specified by CSS import
- * declarations. In CSS files, relative URIs are fixed.
- * 
- * @imports will be processed regardless of where they appear in the source 
- * files; i.e. @imports commented out or in string content will still be
- * processed!
- * 
- * This has a unit test but should be considered "experimental".
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_ImportProcessor {
-    
-    public static $filesIncluded = array();
-    
-    public static function process($file)
-    {
-        self::$filesIncluded = array();
-        self::$_isCss = (strtolower(substr($file, -4)) === '.css');
-        $obj = new Minify_ImportProcessor(dirname($file));
-        return $obj->_getContent($file);
-    }
-    
-    // allows callback funcs to know the current directory
-    private $_currentDir = null;
-    
-    // allows _importCB to write the fetched content back to the obj
-    private $_importedContent = '';
-    
-    private static $_isCss = null;
-    
-    private function __construct($currentDir)
-    {
-        $this->_currentDir = $currentDir;
-    }
-    
-    private function _getContent($file)
-    {
-        $file = realpath($file);
-        if (! $file
-            || in_array($file, self::$filesIncluded)
-            || false === ($content = @file_get_contents($file))
-        ) {
-            // file missing, already included, or failed read
-            return '';
-        }
-        self::$filesIncluded[] = realpath($file);
-        $this->_currentDir = dirname($file);
-        
-        // remove UTF-8 BOM if present
-        if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) {
-            $content = substr($content, 3);
-        }
-        // ensure uniform EOLs
-        $content = str_replace("\r\n", "\n", $content);
-        
-        // process @imports
-        $content = preg_replace_callback(
-            '/
-                @import\\s+
-                (?:url\\(\\s*)?      # maybe url(
-                [\'"]?               # maybe quote
-                (.*?)                # 1 = URI
-                [\'"]?               # maybe end quote
-                (?:\\s*\\))?         # maybe )
-                ([a-zA-Z,\\s]*)?     # 2 = media list
-                ;                    # end token
-            /x'
-            ,array($this, '_importCB')
-            ,$content
-        );
-        
-        if (self::$_isCss) {
-            // rewrite remaining relative URIs
-            $content = preg_replace_callback(
-                '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-                ,array($this, '_urlCB')
-                ,$content
-            );
-        }
-        
-        return $this->_importedContent . $content;
-    }
-    
-    private function _importCB($m)
-    {
-        $url = $m[1];
-        $mediaList = preg_replace('/\\s+/', '', $m[2]);
-        
-        if (strpos($url, '://') > 0) {
-            // protocol, leave in place for CSS, comment for JS
-            return self::$_isCss
-                ? $m[0]
-                : "/* Minify_ImportProcessor will not include remote content */";/*noLibHook*/
-        }
-        if ('/' === $url[0]) {
-            // protocol-relative or root path
-            $url = ltrim($url, '/');
-            $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR
-                . strtr($url, '/', DIRECTORY_SEPARATOR);
-        } else {
-            // relative to current path
-            $file = $this->_currentDir . DIRECTORY_SEPARATOR 
-                . strtr($url, '/', DIRECTORY_SEPARATOR);
-        }
-        $obj = new Minify_ImportProcessor(dirname($file));
-        $content = $obj->_getContent($file);
-        if ('' === $content) {
-            // failed. leave in place for CSS, comment for JS
-            return self::$_isCss
-                ? $m[0]
-                : "/* Minify_ImportProcessor could not fetch '{$file}' */";;
-        }
-        return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList))
-            ? $content
-            : "@media {$mediaList} {\n{$content}\n}\n";
-    }
-    
-    private function _urlCB($m)
-    {
-        // $m[1] is either quoted or not
-        $quote = ($m[1][0] === "'" || $m[1][0] === '"')
-            ? $m[1][0]
-            : '';
-        $url = ($quote === '')
-            ? $m[1]
-            : substr($m[1], 1, strlen($m[1]) - 2);
-        if ('/' !== $url[0]) {
-            if (strpos($url, '//') > 0) {
-                // probably starts with protocol, do not alter
-            } else {
-                // prepend path with current dir separator (OS-independent)
-                $path = $this->_currentDir 
-                    . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);
-                // strip doc root
-                $path = substr($path, strlen(realpath($_SERVER['DOCUMENT_ROOT'])));
-                // fix to absolute URL
-                $url = strtr($path, '/\\', '//');
-                // remove /./ and /../ where possible
-                $url = str_replace('/./', '/', $url);
-                // inspired by patch from Oleg Cherniy
-                do {
-                    $url = preg_replace('@/[^/]+/\\.\\./@', '/', $url, 1, $changed);
-                } while ($changed);
-            }
-        }
-        return "url({$quote}{$url}{$quote})";
-    }
-}
+<?php
+/**
+ * Class Minify_ImportProcessor
+ * @package Minify
+ */
+
+/**
+ * Linearize a CSS/JS file by including content specified by CSS import
+ * declarations. In CSS files, relative URIs are fixed.
+ *
+ * @imports will be processed regardless of where they appear in the source
+ * files; i.e. @imports commented out or in string content will still be
+ * processed!
+ *
+ * This has a unit test but should be considered "experimental".
+ *
+ * @package Minify
+ * @author Stephen Clay <steve@mrclay.org>
+ * @author Simon Schick <simonsimcity@gmail.com>
+ */
+class Minify_ImportProcessor {
+
+    public static $filesIncluded = array();
+
+    public static function process($file)
+    {
+        self::$filesIncluded = array();
+        self::$_isCss = (strtolower(substr($file, -4)) === '.css');
+        $obj = new Minify_ImportProcessor(dirname($file));
+        return $obj->_getContent($file);
+    }
+
+    // allows callback funcs to know the current directory
+    private $_currentDir = null;
+
+    // allows callback funcs to know the directory of the file that inherits this one
+    private $_previewsDir = null;
+
+    // allows _importCB to write the fetched content back to the obj
+    private $_importedContent = '';
+
+    private static $_isCss = null;
+
+    /**
+     * @param String $currentDir
+     * @param String $previewsDir Is only used internally
+     */
+    private function __construct($currentDir, $previewsDir = "")
+    {
+        $this->_currentDir = $currentDir;
+        $this->_previewsDir = $previewsDir;
+    }
+
+    private function _getContent($file, $is_imported = false)
+    {
+        $file = realpath($file);
+        if (! $file
+            || in_array($file, self::$filesIncluded)
+            || false === ($content = @file_get_contents($file))
+        ) {
+            // file missing, already included, or failed read
+            return '';
+        }
+        self::$filesIncluded[] = realpath($file);
+        $this->_currentDir = dirname($file);
+
+        // remove UTF-8 BOM if present
+        if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) {
+            $content = substr($content, 3);
+        }
+        // ensure uniform EOLs
+        $content = str_replace("\r\n", "\n", $content);
+
+        // process @imports
+        $content = preg_replace_callback(
+            '/
+                @import\\s+
+                (?:url\\(\\s*)?      # maybe url(
+                [\'"]?               # maybe quote
+                (.*?)                # 1 = URI
+                [\'"]?               # maybe end quote
+                (?:\\s*\\))?         # maybe )
+                ([a-zA-Z,\\s]*)?     # 2 = media list
+                ;                    # end token
+            /x'
+            ,array($this, '_importCB')
+            ,$content
+        );
+
+        // You only need to rework the import-path if the script is imported
+        if (self::$_isCss && $is_imported) {
+            // rewrite remaining relative URIs
+            $content = preg_replace_callback(
+                '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+                ,array($this, '_urlCB')
+                ,$content
+            );
+        }
+
+        return $this->_importedContent . $content;
+    }
+
+    private function _importCB($m)
+    {
+        $url = $m[1];
+        $mediaList = preg_replace('/\\s+/', '', $m[2]);
+
+        if (strpos($url, '://') > 0) {
+            // protocol, leave in place for CSS, comment for JS
+            return self::$_isCss
+                ? $m[0]
+                : "/* Minify_ImportProcessor will not include remote content */";
+        }
+        if ('/' === $url[0]) {
+            // protocol-relative or root path
+            $url = ltrim($url, '/');
+            $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR
+                . strtr($url, '/', DIRECTORY_SEPARATOR);
+        } else {
+            // relative to current path
+            $file = $this->_currentDir . DIRECTORY_SEPARATOR
+                . strtr($url, '/', DIRECTORY_SEPARATOR);
+        }
+        $obj = new Minify_ImportProcessor(dirname($file), $this->_currentDir);
+        $content = $obj->_getContent($file, true);
+        if ('' === $content) {
+            // failed. leave in place for CSS, comment for JS
+            return self::$_isCss
+                ? $m[0]
+                : "/* Minify_ImportProcessor could not fetch '{$file}' */";
+        }
+        return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList))
+            ? $content
+            : "@media {$mediaList} {\n{$content}\n}\n";
+    }
+
+    private function _urlCB($m)
+    {
+        // $m[1] is either quoted or not
+        $quote = ($m[1][0] === "'" || $m[1][0] === '"')
+            ? $m[1][0]
+            : '';
+        $url = ($quote === '')
+            ? $m[1]
+            : substr($m[1], 1, strlen($m[1]) - 2);
+        if ('/' !== $url[0]) {
+            if (strpos($url, '//') > 0) {
+                // probably starts with protocol, do not alter
+            } else {
+                // prepend path with current dir separator (OS-independent)
+                $path = $this->_currentDir
+                    . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);
+                // update the relative path by the directory of the file that imported this one
+                $url = self::getPathDiff(realpath($this->_previewsDir), $path);
+            }
+        }
+        return "url({$quote}{$url}{$quote})";
+    }
+
+    /**
+     * @param string $from
+     * @param string $to
+     * @param string $ps
+     * @return string
+     */
+    private function getPathDiff($from, $to, $ps = DIRECTORY_SEPARATOR)
+    {
+        $realFrom = $this->truepath($from);
+        $realTo = $this->truepath($to);
+
+        $arFrom = explode($ps, rtrim($realFrom, $ps));
+        $arTo = explode($ps, rtrim($realTo, $ps));
+        while (count($arFrom) && count($arTo) && ($arFrom[0] == $arTo[0]))
+        {
+            array_shift($arFrom);
+            array_shift($arTo);
+        }
+        return str_pad("", count($arFrom) * 3, '..' . $ps) . implode($ps, $arTo);
+    }
+
+    /**
+     * This function is to replace PHP's extremely buggy realpath().
+     * @param string $path The original path, can be relative etc.
+     * @return string The resolved path, it might not exist.
+     * @see http://stackoverflow.com/questions/4049856/replace-phps-realpath
+     */
+    function truepath($path)
+    {
+        // whether $path is unix or not
+        $unipath = strlen($path) == 0 || $path{0} != '/';
+        // attempts to detect if path is relative in which case, add cwd
+        if (strpos($path, ':') === false && $unipath)
+            $path = $this->_currentDir . DIRECTORY_SEPARATOR . $path;
+
+        // resolve path parts (single dot, double dot and double delimiters)
+        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
+        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
+        $absolutes = array();
+        foreach ($parts as $part) {
+            if ('.' == $part)
+                continue;
+            if ('..' == $part) {
+                array_pop($absolutes);
+            } else {
+                $absolutes[] = $part;
+            }
+        }
+        $path = implode(DIRECTORY_SEPARATOR, $absolutes);
+        // resolve any symlinks
+        if (file_exists($path) && linkinfo($path) > 0)
+            $path = readlink($path);
+        // put initial separator that could have been lost
+        $path = !$unipath ? '/' . $path : $path;
+        return $path;
+    }
+}
@@ -26,9 +26,9 @@ class Minify_Lines {
     * 
     * 'id': (optional) string to identify file. E.g. file name/path
     *
-     * 'currentDir': (default null) if given, this is assumed to be the
-     * directory of the current CSS file. Using this, minify will rewrite
-     * all relative URIs in import/url declarations to correctly point to
+     * 'currentDir': (default null) if given, this is assumed to be the
+     * directory of the current CSS file. Using this, minify will rewrite
+     * all relative URIs in import/url declarations to correctly point to
     * the desired files, and prepend a comment with debugging information about
     * this process.
     * 
@@ -40,10 +40,16 @@ class Minify_Lines {
            ? $options['id']
            : '';
        $content = str_replace("\r\n", "\n", $content);
+
+        // Hackily rewrite strings with XPath expressions that are
+        // likely to throw off our dumb parser (for Prototype 1.6.1).
+        $content = str_replace('"/*"', '"/"+"*"', $content);
+        $content = preg_replace('@([\'"])(\\.?//?)\\*@', '$1$2$1+$1*', $content);
+
        $lines = explode("\n", $content);
        $numLines = count($lines);
        // determine left padding
-        $padTo = strlen($numLines);
+        $padTo = strlen((string) $numLines); // e.g. 103 lines = 3 digits
        $inComment = false;
        $i = 0;
        $newLines = array();
@@ -59,12 +65,12 @@ class Minify_Lines {
        
        // check for desired URI rewriting
        if (isset($options['currentDir'])) {
-            require_once 'Minify/CSS/UriRewriter.php';/*noLibHook*/
+            require_once 'Minify/CSS/UriRewriter.php';
            Minify_CSS_UriRewriter::$debugText = '';
            $content = Minify_CSS_UriRewriter::rewrite(
                 $content
                ,$options['currentDir']
-                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
+                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
                ,isset($options['symlinks']) ? $options['symlinks'] : array()
            );
            $content = "/* Minify_CSS_UriRewriter::\$debugText\n\n" 
@@ -82,7 +88,7 @@ class Minify_Lines {
     * 
     * @param bool $inComment was the parser in a comment at the
     * beginning of the line?
-     * 
+     *
     * @return bool
     */
    private static function _eolInComment($line, $inComment)
@@ -9,6 +9,8 @@
 * 
 * @package Minify
 * @author Stephen Clay <steve@mrclay.org>
+ *
+ * @todo lose this singleton! pass log object in Minify::serve and distribute to others
 */
 class Minify_Logger {

@@ -19,7 +19,7 @@ if (false === (@include 'class.JavaScriptPacker.php')) {
        'The script "class.JavaScriptPacker.php" is required. Please see: http:'
        .'//code.google.com/p/minify/source/browse/trunk/min/lib/Minify/Packer.php'
        ,E_USER_ERROR
-    );/*noLibHook*/
+    );
 }

 /**
@@ -90,8 +90,11 @@ class Minify_YUICompressor {
            throw new Exception('Minify_YUICompressor : could not create temp file.');
        }
        file_put_contents($tmpFile, $content);
-        exec(self::_getCmd($options, $type, $tmpFile), $output);
+        exec(self::_getCmd($options, $type, $tmpFile), $output, $result_code);
        unlink($tmpFile);
+        if ($result_code != 0) {
+            throw new Exception('Minify_YUICompressor : YUI compressor execution failed.');
+        }
        return implode("\n", $output);
    }
    
@@ -110,7 +113,7 @@ class Minify_YUICompressor {
        );
        $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile)
             . " --type {$type}"
-             . (preg_match('/^[a-zA-Z\\-]+$/', $o['charset']) 
+             . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
                ? " --charset {$o['charset']}" 
                : '')
             . (is_numeric($o['line-break']) && $o['line-break'] >= 0
@@ -128,11 +131,17 @@ class Minify_YUICompressor {
    
    private static function _prepare()
    {
-        if (! is_file(self::$jarFile) 
-            || ! is_dir(self::$tempDir)
-            || ! is_writable(self::$tempDir)
-        ) {
-            throw new Exception('Minify_YUICompressor : $jarFile and $tempDir must be set.');
+        if (! is_file(self::$jarFile)) {
+            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not a valid file.');
+        }
+        if (! is_executable(self::$jarFile)) {
+            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not executable.');
+        }
+        if (! is_dir(self::$tempDir)) {
+            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.');
+        }
+        if (! is_writable(self::$tempDir)) {
+            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not writable.');
        }
    }
 }
@@ -1,90 +1,74 @@
 <?php
 /**
- * Utility functions for generating group URIs in HTML files
+ * Utility functions for generating URIs in HTML files
 *
- * Before including this file, /min/lib must be in your include_path.
- * 
 * @package Minify
 */

-require_once 'Minify/Build.php';/*noLibHook*/
+require_once dirname(__FILE__) . '/lib/Minify/HTML/Helper.php';


-/**
- * Get a timestamped URI to a minified resource using the default Minify install
+/*
+ * Get an HTML-escaped Minify URI for a group or set of files. By default, URIs
+ * will contain timestamps to allow far-future Expires headers.
 *
 * <code>
- * <link rel="stylesheet" type="text/css" href="<?php echo Minify_groupUri('css'); ?>" />
- * <script type="text/javascript" src="<?php echo Minify_groupUri('js'); ?>"></script>
+ * <link rel="stylesheet" type="text/css" href="<?= Minify_getUri('css'); ?>" />
+ * <script src="<?= Minify_getUri('js'); ?>"></script>
+ * <script src="<?= Minify_getUri(array(
+ *      '//scripts/file1.js'
+ *      ,'//scripts/file2.js'
+ * )); ?>"></script>
 * </code>
 *
- * If you do not want ampersands as HTML entities, set Minify_Build::$ampersand = "&" 
- * before using this function.
- *
- * @param string $group a key from groupsConfig.php
- * @param boolean $forceAmpersand (default false) Set to true if the RewriteRule
- * directives in .htaccess are functional. This will remove the "?" from URIs, making them
- * more cacheable by proxies.
+ * @param mixed $keyOrFiles a group key or array of file paths/URIs
+ * @param array $opts options:
+ *   'farExpires' : (default true) append a modified timestamp for cache revving
+ *   'debug' : (default false) append debug flag
+ *   'charset' : (default 'UTF-8') for htmlspecialchars
+ *   'minAppUri' : (default '/min') URI of min directory
+ *   'rewriteWorks' : (default true) does mod_rewrite work in min app?
+ *   'groupsConfigFile' : specify if different
 * @return string
- */ 
-function Minify_groupUri($group, $forceAmpersand = false)
-{
-    $path = $forceAmpersand
-        ? "/g={$group}"
-        : "/?g={$group}";
-    return _Minify_getBuild($group)->uri(
-        '/' . basename(dirname(__FILE__)) . $path
-        ,$forceAmpersand
-    );
-}
-
-
-/**
- * Get the last modification time of the source js/css files used by Minify to
- * build the page.
- * 
- * If you're caching the output of Minify_groupUri(), you'll want to rebuild 
- * the cache if it's older than this timestamp.
- * 
- * <code>
- * // simplistic HTML cache system
- * $file = '/path/to/cache/file';
- * if (! file_exists($file) || filemtime($file) < Minify_groupsMtime(array('js', 'css'))) {
- *     // (re)build cache
- *     $page = buildPage(); // this calls Minify_groupUri() for js and css
- *     file_put_contents($file, $page);
- *     echo $page;
- *     exit();
- * }
- * readfile($file);
- * </code>
- *
- * @param array $groups an array of keys from groupsConfig.php
- * @return int Unix timestamp of the latest modification
- */ 
-function Minify_groupsMtime($groups)
-{
-    $max = 0;
-    foreach ((array)$groups as $group) {
-        $max = max($max, _Minify_getBuild($group)->lastModified);
-    }
-    return $max;
-}
-
-/**
- * @param string $group a key from groupsConfig.php
- * @return Minify_Build
- * @private
 */
-function _Minify_getBuild($group)
+function Minify_getUri($keyOrFiles, $opts = array())
 {
-    static $builds = array();
-    static $gc = false;
-    if (false === $gc) {
-        $gc = (require dirname(__FILE__) . '/groupsConfig.php');/*noLibHook*/
+    return Minify_HTML_Helper::getUri($keyOrFiles, $opts);
+}
+
+
+/**
+ * Get the last modification time of several source js/css files. If you're
+ * caching the output of Minify_getUri(), you might want to know if one of the
+ * dependent source files has changed so you can update the HTML.
+ *
+ * Since this makes a bunch of stat() calls, you might not want to check this
+ * on every request.
+ * 
+ * @param array $keysAndFiles group keys and/or file paths/URIs.
+ * @return int latest modification time of all given keys/files
+ */
+function Minify_mtime($keysAndFiles, $groupsConfigFile = null)
+{
+    $gc = null;
+    if (! $groupsConfigFile) {
+        $groupsConfigFile = dirname(__FILE__) . '/groupsConfig.php';
    }
-    if (! isset($builds[$group])) {
-        $builds[$group] = new Minify_Build($gc[$group]);
+    $sources = array();
+    foreach ($keysAndFiles as $keyOrFile) {
+        if (is_object($keyOrFile)
+            || 0 === strpos($keyOrFile, '/')
+            || 1 === strpos($keyOrFile, ':\\')) {
+            // a file/source obj
+            $sources[] = $keyOrFile;
+        } else {
+            if (! $gc) {
+                $gc = (require $groupsConfigFile);
+            }
+            foreach ($gc[$keyOrFile] as $source) {
+                $sources[] = $source;
+            }
+        }
    }
-    return $builds[$group];
+    return Minify_HTML_Helper::getLastModified($sources);
 }