upgrade the rest of the functions to Unicode (except ob_gzhandler, that I leave for...

also update tests to force binary data to be passed

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 6548d79e11602895c887870f77a18dde8de886b5..45e6734f1ed2aec5020d8319f2f75efbbfe07b4e 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -54,9 +54,6 @@ PHP_FUNCTION(gzencode);
 PHP_FUNCTION(ob_gzhandler);
 PHP_FUNCTION(zlib_get_coding_type);
 
-int php_enable_output_compression(int buffer_size TSRMLS_DC);
-int php_ob_gzhandler_check(zval *handler_name TSRMLS_DC);
-
 php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
 extern php_stream_ops php_stream_gzio_ops;
 extern php_stream_wrapper php_stream_gzip_wrapper;

diff --git a/ext/zlib/tests/001.phpt b/ext/zlib/tests/001.phpt
index 4850a65a5a03bf81d0cd46c808a7ff8508f56b04..36c7a10eaa0a2bc017ba3b0868a3c38e95df2cf6 100644 (file)
--- a/ext/zlib/tests/001.phpt
+++ b/ext/zlib/tests/001.phpt
@@ -5,19 +5,19 @@ gzdeflate()/gzinflate()
 --FILE--
 <?php /* $Id$ */
 $original = str_repeat("hallo php",4096);
-$packed=gzdeflate($original);
+$packed=gzdeflate((binary)$original);
 echo strlen($packed)." ".strlen($original)."\n";
 $unpacked=gzinflate($packed);
 if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";
 
 /* with explicit compression level, length */
 $original = str_repeat("hallo php",4096);
-$packed=gzdeflate($original, 9);
+$packed=gzdeflate((binary)$original, 9);
 echo strlen($packed)." ".strlen($original)."\n";
 $unpacked=gzinflate($packed, 40000);
 if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";
 
-$original = 'aaaaaaaaaaaaaaa';
+$original = b'aaaaaaaaaaaaaaa';
 $packed=gzdeflate($original);
 echo strlen($packed)." ".strlen($original)."\n";
 $unpacked=gzinflate($packed);

diff --git a/ext/zlib/tests/002.phpt b/ext/zlib/tests/002.phpt
index 9844a1b93d82b49b02ca4e3efa1d4578323d2cc7..320dbe8ee6fd2976fe3f4d741feb9bcc2cf239e2 100644 (file)
--- a/ext/zlib/tests/002.phpt
+++ b/ext/zlib/tests/002.phpt
@@ -5,14 +5,14 @@ gzcompress()/gzuncompress()
 --FILE--
 <?php /* $Id$ */
 $original = str_repeat("hallo php",4096);
-$packed=gzcompress($original);
+$packed=gzcompress((binary)$original);
 echo strlen($packed)." ".strlen($original)."\n";
 $unpacked=gzuncompress($packed);
 if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";
 
 /* with explicit compression level, length */
 $original = str_repeat("hallo php",4096);
-$packed=gzcompress($original, 9);
+$packed=gzcompress((binary)$original, 9);
 echo strlen($packed)." ".strlen($original)."\n";
 $unpacked=gzuncompress($packed, 40000);
 if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";

diff --git a/ext/zlib/tests/003.phpt b/ext/zlib/tests/003.phpt
index 2732d4cea651d919174120851fe3de44cf6e1b40..b2cc105030d40b59feb7377e249d0a7d1f0259de 100644 (file)
--- a/ext/zlib/tests/003.phpt
+++ b/ext/zlib/tests/003.phpt
@@ -4,7 +4,7 @@ gzencode()/base64_encode()
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
 --FILE--
 <?php
-$original = str_repeat("hallo php",4096);
+$original = (binary)str_repeat("hallo php",4096);
 $packed=gzencode($original);
 echo strlen($packed)." ".strlen($original)."\n";
 if (strcmp(base64_encode($packed),"H4sIAAAAAAAAA+3GoQ0AQAgEsFV+NdwJEthf/R6kVU11z9tsRERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERETu5gPlQAe9AJAAAA==")==0) echo "Strings are equal";

diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index f43985b1b10c5240124eeca6c068d5049600b728..0589e0eae06ef46954b280cb8fab104222744ffb 100644 (file)
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -6,13 +6,13 @@ gzcompress()/gzuncompress() and invalid params
 <?php
 
 var_dump(gzcompress());
-var_dump(gzcompress("", 1000));
-var_dump(gzcompress("", -1));
+var_dump(gzcompress(b"", 1000));
+var_dump(gzcompress(b"", -1));
 
-var_dump(gzcompress(""));
-var_dump(gzcompress("", 9));
+var_dump(gzcompress(b""));
+var_dump(gzcompress(b"", 9));
 
-$string = "Answer me, it can't be so hard
+$string = b"Answer me, it can't be so hard
 Cry to relieve what's in your heart
 Desolation, grief and agony";
 
@@ -20,16 +20,16 @@ var_dump($data1 = gzcompress($string));
 var_dump($data2 = gzcompress($string, 9));
 
 var_dump(gzuncompress());
-var_dump(gzuncompress("", 1000));
-var_dump(gzuncompress("", -1));
+var_dump(gzuncompress(b"", 1000));
+var_dump(gzuncompress(b"", -1));
 
-var_dump(gzuncompress(""));
-var_dump(gzuncompress("", 9));
+var_dump(gzuncompress(b""));
+var_dump(gzuncompress(b"", 9));
 
 var_dump(gzuncompress($data1));
 var_dump(gzuncompress($data2));
 $data2{4} = 0;
-var_dump(gzuncompress($data2));
+var_dump(gzuncompress((binary)$data2));
 
 echo "Done\n";
 ?>

diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index 1ddb563784f5948578c23318419a21d2ade90c70..62d466030bcc6510e90e99b7c8b4c3331219fd1f 100644 (file)
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -6,13 +6,13 @@ gzdeflate()/gzinflate() and invalid params
 <?php
 
 var_dump(gzdeflate());
-var_dump(gzdeflate("", 1000));
-var_dump(gzdeflate("", -1));
+var_dump(gzdeflate(b"", 1000));
+var_dump(gzdeflate(b"", -1));
 
-var_dump(gzdeflate(""));
-var_dump(gzdeflate("", 9));
+var_dump(gzdeflate(b""));
+var_dump(gzdeflate(b"", 9));
 
-$string = "Answer me, it can't be so hard
+$string = b"Answer me, it can't be so hard
 Cry to relieve what's in your heart
 Desolation, grief and agony";
 
@@ -20,17 +20,17 @@ var_dump($data1 = gzdeflate($string));
 var_dump($data2 = gzdeflate($string, 9));
 
 var_dump(gzinflate());
-var_dump(gzinflate(""));
-var_dump(gzinflate("asfwe", 1000));
-var_dump(gzinflate("asdf", -1));
+var_dump(gzinflate(b""));
+var_dump(gzinflate(b"asfwe", 1000));
+var_dump(gzinflate(b"asdf", -1));
 
-var_dump(gzinflate("asdf"));
-var_dump(gzinflate("asdf", 9));
+var_dump(gzinflate(b"asdf"));
+var_dump(gzinflate(b"asdf", 9));
 
 var_dump(gzinflate($data1));
 var_dump(gzinflate($data2));
 $data2{4} = 0;
-var_dump(gzinflate($data2));
+var_dump(gzinflate((binary)$data2));
 
 echo "Done\n";
 ?>

diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index ec37b99de696a626591623f75cb19edc83e92574..4b0f892d2a667c6ae507149b996ebb879aee7c6d 100644 (file)
--- a/ext/zlib/tests/007.phpt
+++ b/ext/zlib/tests/007.phpt
@@ -7,14 +7,14 @@ gzencode() and invalid params
 
 var_dump(gzencode());
 var_dump(gzencode(1,1,1,1));
-var_dump(gzencode("", -10));
-var_dump(gzencode("", 100));
-var_dump(gzencode("", 1, 100));
+var_dump(gzencode(b"", -10));
+var_dump(gzencode(b"", 100));
+var_dump(gzencode(b"", 1, 100));
 
-var_dump(gzencode("", -1, 1));
-var_dump(gzencode("", 9, 2));
+var_dump(gzencode(b"", -1, 1));
+var_dump(gzencode(b"", 9, 2));
 
-$string = "Light of my sun
+$string = b"Light of my sun
 Light in this temple
 Light in my truth
 Lies in the darkness";

diff --git a/ext/zlib/tests/bug_34821.phpt b/ext/zlib/tests/bug_34821.phpt
index ff845c6df7605686e6c7d9ebcb53ebe7f5eb79b9..8554638095f3ca04dde64b155feb9e7e33686852 100644 (file)
--- a/ext/zlib/tests/bug_34821.phpt
+++ b/ext/zlib/tests/bug_34821.phpt
@@ -21,9 +21,9 @@ foreach ($b as $size) {
        for ($i = 0; $i <= $size; ++$i) {
                $s .= chr(rand(0,255));
        }
-       var_dump($s == gzinflate(gzdeflate($s)));
-       var_dump($s == gzuncompress(gzcompress($s)));
-       var_dump($s == gzinflate(substr(gzencode($s), 10, -8)));
+       var_dump($s == gzinflate(gzdeflate((binary)$s)));
+       var_dump($s == gzuncompress(gzcompress((binary)$s)));
+       var_dump($s == gzinflate(substr(gzencode((binary)$s), 10, -8)));
 }
 ?>
 --EXPECT--

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 60ff45f4b8539a38c63cbffd0db38e1f8192365c..0337834f555b055270d0d5da9bd94e907ca3c1aa 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -83,6 +83,9 @@
 /* True globals, no need for thread safety */
 static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
+static int php_enable_output_compression(int buffer_size TSRMLS_DC);
+static int php_ob_gzhandler_check(zval *handler_name TSRMLS_DC);
+
 /* {{{ php_zlib_functions[]
  */
 zend_function_entry php_zlib_functions[] = {
@@ -395,7 +398,7 @@ PHP_FUNCTION(readgzfile)
 }
 /* }}} */
 
-/* {{{ proto string gzcompress(string data [, int level]) 
+/* {{{ proto string gzcompress(string data [, int level]) U
    Gzip-compress a string */
 PHP_FUNCTION(gzcompress)
 {
@@ -404,7 +407,7 @@ PHP_FUNCTION(gzcompress)
        unsigned long l2;
        char *data, *s2;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &data, &data_len, &level) == FAILURE) {
                return;
        }
 
@@ -437,7 +440,7 @@ PHP_FUNCTION(gzcompress)
 }
 /* }}} */
 
-/* {{{ proto string gzuncompress(string data [, int length]) 
+/* {{{ proto string gzuncompress(string data [, int length]) U
    Unzip a gzip-compressed string */
 PHP_FUNCTION(gzuncompress)
 {
@@ -447,7 +450,7 @@ PHP_FUNCTION(gzuncompress)
        unsigned long plength=0, length;
        char *data, *s1=NULL, *s2=NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &limit) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &data, &data_len, &limit) == FAILURE) {
                return;
        }
 
@@ -483,7 +486,7 @@ PHP_FUNCTION(gzuncompress)
 }
 /* }}} */
 
-/* {{{ proto string gzdeflate(string data [, int level]) 
+/* {{{ proto string gzdeflate(string data [, int level]) U
    Gzip-compress a string */
 PHP_FUNCTION(gzdeflate)
 {
@@ -492,7 +495,7 @@ PHP_FUNCTION(gzdeflate)
        z_stream stream;
        char *data, *s2;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &level) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &data, &data_len, &level) == FAILURE) {
                return;
        }
 
@@ -544,7 +547,7 @@ PHP_FUNCTION(gzdeflate)
 }
 /* }}} */
 
-/* {{{ proto string gzinflate(string data [, int length]) 
+/* {{{ proto string gzinflate(string data [, int length]) U
    Unzip a gzip-compressed string */
 PHP_FUNCTION(gzinflate)
 {
@@ -555,7 +558,7 @@ PHP_FUNCTION(gzinflate)
        char *data, *s1=NULL, *s2=NULL;
        z_stream stream;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &limit) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &data, &data_len, &limit) == FAILURE) {
                return;
        }
 
@@ -758,7 +761,7 @@ static int php_deflate_string(const char *str, uint str_length, char **newstr, u
 }
 /* }}} */
 
-/* {{{ proto string gzencode(string data [, int level [, int encoding_mode]])
+/* {{{ proto string gzencode(string data [, int level [, int encoding_mode]]) U
    GZ encode a string */
 PHP_FUNCTION(gzencode)
 {
@@ -768,7 +771,7 @@ PHP_FUNCTION(gzencode)
        int status;
        z_stream stream;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &data, &data_len, &level, &coding) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|ll", &data, &data_len, &level, &coding) == FAILURE) {
                return;
        }
 
@@ -862,7 +865,7 @@ PHP_FUNCTION(gzencode)
 
 /* {{{ php_ob_gzhandler_check
  */
-int php_ob_gzhandler_check(zval *handler_name TSRMLS_DC)
+static int php_ob_gzhandler_check(zval *handler_name TSRMLS_DC)
 {
        /* check for wrong usages */
        if (php_output_get_level(TSRMLS_C) > 0) {
@@ -1012,7 +1015,7 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle
 
 /* {{{ php_enable_output_compression
  */
-int php_enable_output_compression(int buffer_size TSRMLS_DC)
+static int php_enable_output_compression(int buffer_size TSRMLS_DC)
 {
        zval **a_encoding, *output_handler;