From 6dffb5e10e8cb8d92adcf48ea0a011df649e64e4 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Tue, 7 Oct 2008 20:47:15 +0000
Subject: [PATCH] + unit tests for sensing server/PHP auto-HTTP-encoding and
 zlib.output_compression moved ini_set('zlib.output_compression', '0') to
 config.php so extras and ab tests should work when this is set in
 php.ini/.htaccess. builder/index.php : added escapes to JS strings for valid
 HTML

---
 min/builder/index.php               |  8 ++--
 min/builder/ocCheck.php             |  4 +-
 min/config.php                      |  3 ++
 min/index.php                       |  3 --
 min_unit_tests/test_all.php         |  1 +
 min_unit_tests/test_environment.php | 63 +++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 min_unit_tests/test_environment.php

diff --git a/min/builder/index.php b/min/builder/index.php
index 4715d79..36735e8 100644
--- a/min/builder/index.php
+++ b/min/builder/index.php
@@ -117,7 +117,7 @@ src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
 <script type="text/javascript">
 $(function () {
     // detection of double output encoding
-    var msg = '<p class=topWarning><strong>Warning:</strong> ';
+    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) {
@@ -131,13 +131,13 @@ $(function () {
                 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>');
+                $(document.body).prepend(msg + '<\/p>');
             } else
                 if (ocStatus == '1')
-                    $(document.body).prepend('<p class=topNote><strong>Note:</strong> The option '
+                    $(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.'
+                        + 'may want to consider disabling this option in your PHP configuration.<\/p>'
                     );
         });
     });
diff --git a/min/builder/ocCheck.php b/min/builder/ocCheck.php
index b6e82bc..c47baa3 100644
--- a/min/builder/ocCheck.php
+++ b/min/builder/ocCheck.php
@@ -5,6 +5,8 @@
  * @package Minify
  */
 
+$_oc = ini_get('zlib.output_compression');
+ 
 // allow access only if builder is enabled
 require dirname(__FILE__) . '/../config.php';
 if (! $min_enableBuilder) {
@@ -30,5 +32,5 @@ if (isset($_GET['hello'])) {
 } else {
     // echo status "0" or "1"
     header('Content-Type: text/plain');
-    echo (int)ini_get('zlib.output_compression');
+    echo (int)$_oc;
 }
diff --git a/min/config.php b/min/config.php
index d299410..04941ac 100644
--- a/min/config.php
+++ b/min/config.php
@@ -94,3 +94,6 @@ $min_serveOptions['minApp']['maxFiles'] = 10;
  */
 $min_uploaderHoursBehind = 0;
 
+
+// try to disable output_compression (may not have an effect)
+ini_set('zlib.output_compression', '0');
diff --git a/min/index.php b/min/index.php
index c544c7b..9673d54 100644
--- a/min/index.php
+++ b/min/index.php
@@ -9,9 +9,6 @@
 
 define('MINIFY_MIN_DIR', dirname(__FILE__));
 
-// try to disable output_compression (may not have an effect)
-ini_set('zlib.output_compression', '0');
-
 // load config
 require MINIFY_MIN_DIR . '/config.php';
 
diff --git a/min_unit_tests/test_all.php b/min_unit_tests/test_all.php
index b4dcdf8..608a1e2 100644
--- a/min_unit_tests/test_all.php
+++ b/min_unit_tests/test_all.php
@@ -13,3 +13,4 @@ require 'test_Minify_Javascript.php';
 require 'test_Minify_Lines.php';
 require 'test_HTTP_Encoder.php';
 require 'test_HTTP_ConditionalGet.php';
+require 'test_environment.php';
diff --git a/min_unit_tests/test_environment.php b/min_unit_tests/test_environment.php
new file mode 100644
index 0000000..c7d267a
--- /dev/null
+++ b/min_unit_tests/test_environment.php
@@ -0,0 +1,63 @@
+<?php
+
+if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
+    // called directly
+    if (isset($_GET['getOutputCompression'])) {
+        echo (int)ini_get('zlib.output_compression');
+        exit();
+    }
+    if (isset($_GET['hello'])) {
+        // try to disable (may not work)
+        ini_set('zlib.output_compression', '0');
+        echo 'World!';
+        exit();
+    }
+}
+
+require_once '_inc.php';
+
+function test_environment()
+{
+    global $thisDir;
+    
+    $thisUrl = 'http://' 
+        . $_SERVER['SERVER_NAME']
+        . ('80' === $_SERVER['SERVER_PORT'] ? '' : ":{$_SERVER['SERVER_PORT']}")
+        . dirname($_SERVER['REQUEST_URI']) 
+        . '/test_environment.php';
+    
+    $oc = @file_get_contents($thisUrl . '?getOutputCompression=1');
+    
+    if (false === $oc || ! preg_match('/^[01]$/', $oc)) {
+        echo "!WARN: environment : Local HTTP request failed. Testing cannot continue.\n";
+        return;
+    }
+    if ('1' === $oc) {
+        echo "!WARN: environment : zlib.output_compression is enabled in php.ini or .htaccess.\n";
+    }
+    
+    $fp = fopen($thisUrl . '?hello=1', 'r', false, stream_context_create(array(
+        'http' => array(
+            'method' => "GET",
+            'header' => "Accept-Encoding: deflate, gzip\r\n"
+        )
+    )));
+    
+    $meta = stream_get_meta_data($fp);
+    
+    $passed = assertTrue(
+        false !== strpos(serialize($meta), '"Content-Length: 6"')
+        ,'environment : PHP/server does not auto-HTTP-encode content'
+    );
+    fclose($fp);
+    
+    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
+        if (! $passed) {
+            echo "\nReturned content should be 6 bytes and not HTTP encoded.\n"
+               . "Headers returned by: {$thisUrl}?hello=1\n\n";
+            var_export($meta['wrapper_data']);
+        }
+    }
+}
+
+test_environment();