Commit:    b7596eaa1b406f7d768e49c53f03bb7cdfa25cab
Author:    Anatoliy Belsky <a...@php.net>         Tue, 27 Mar 2012 18:16:02 
+0200
Parents:   8d7a489b97eb436a5e99c008e57fdb068c86ec67 
bcfcfb2fc5f358ebfdc76a773b20b3fc056b20c0
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=b7596eaa1b406f7d768e49c53f03bb7cdfa25cab

Log:
Merge branch '5.3' into 5.4

* 5.3:
  Fix bug #61519        test fails, should pass - ext/zlib/tests/bug60761.phpt

Conflicts:
        ext/zlib/tests/bug60761.phpt

Bugs:
https://bugs.php.net/61519
https://bugs.php.net/60761
https://bugs.php.net/60761

Changed paths:
  MM  ext/zlib/tests/bug60761.phpt


Diff:
b7596eaa1b406f7d768e49c53f03bb7cdfa25cab
diff --combined ext/zlib/tests/bug60761.phpt
index 823173e,340d878..1e9fe69
--- a/ext/zlib/tests/bug60761.phpt
+++ b/ext/zlib/tests/bug60761.phpt
@@@ -1,35 -1,54 +1,54 @@@
 ---TEST--
 -checks zlib compression output size is always the same
 ---SKIPIF--
 -<?php if (!extension_loaded("zlib")) print "skip"; ?>
 ---CGI--
 -1
 ---FILE--
 -<?php
 -
 -// the INI directives from bug #60761 report
 -ini_set('zlib.output_compression', '4096');
 -ini_set('zlib.output_compression_level', '9');
 -
 -// try to duplicate the original bug by running this as a CGI
 -// test using ob_start and zlib.output_compression(or ob_gzhandler)
 -// so it follows more of the original code-path than just calling
 -// gzcompress on CLI or CGI
 -
 -$lens = array();
 -
 -for ( $i=0 ; $i < 100 ; $i++ ) {
 -
 -      // can't use ob_gzhandler with zlib.output_compression
 -      ob_start();//"ob_gzhandler");
 -      phpinfo();
 -      $html = ob_get_clean();
 -
 -      $len = strlen($html);
 -
 -      $lens[$len] = $len;
 -} 
 - 
 -$lens = array_values($lens);
 -
 -echo "Compressed Lengths\n";
 -
 -// pass == only ONE length for all iterations
 -//         (length didn't change during run)
 -// 
 -// hard to anticipate what 'correct' length should be since
 -// return value of phpinfo() will vary between installations...
 -// just check that there is only one length
 -// 
 -var_dump($lens); // show lengths to help triage in case of failure
 - 
 -// expected headers since its CGI
 -
 -?>
 ---EXPECTF--
 -%s
 -array(1) {
 -  [0]=>
 -  int(%d)
 -}
 +--TEST--
- checks zlib compression size is always the same no matter how many times its 
run
++checks zlib compression output size is always the same
 +--SKIPIF--
 +<?php if (!extension_loaded("zlib")) print "skip"; ?>
++--CGI--
++1
 +--FILE--
 +<?php
 +
- ob_start();
- phpinfo();
- $html = ob_get_clean();
++// the INI directives from bug #60761 report
++ini_set('zlib.output_compression', '4096');
++ini_set('zlib.output_compression_level', '9');
++
++// try to duplicate the original bug by running this as a CGI
++// test using ob_start and zlib.output_compression(or ob_gzhandler)
++// so it follows more of the original code-path than just calling
++// gzcompress on CLI or CGI
 +
 +$lens = array();
 +
- for ( $i=0 ; $i < 200 ; $i++ ) {
-       //zlib.output_compression = On
-       //zlib.output_compression_level = 9
-       $compressed = gzcompress($html, 9);
-       
-       $len = strlen($compressed);
++for ( $i=0 ; $i < 100 ; $i++ ) {
++
++      // can't use ob_gzhandler with zlib.output_compression
++      ob_start();//"ob_gzhandler");
++      phpinfo();
++      $html = ob_get_clean();
++
++      $len = strlen($html);
 +
 +      $lens[$len] = $len;
 +} 
 + 
 +$lens = array_values($lens);
 +
- echo "Compressed lengths\n";
- var_dump($lens);
++echo "Compressed Lengths\n";
++
++// pass == only ONE length for all iterations
++//         (length didn't change during run)
++// 
++// hard to anticipate what 'correct' length should be since
++// return value of phpinfo() will vary between installations...
++// just check that there is only one length
++// 
++var_dump($lens); // show lengths to help triage in case of failure
++ 
++// expected headers since its CGI
 +
 +?>
 +--EXPECTF--
- Compressed lengths
++%s
 +array(1) {
 +  [0]=>
 +  int(%d)
 +}


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to