This commit was manufactured by cvs2svn to create branch 'PECL_OPENSSL'.PECL_OPENSSL

15 files changed, 0 insertions, 609 deletions

diff --git a/ext/zlib/tests/001.phpt b/ext/zlib/tests/001.phpt
deleted file mode 100644
index 4850a65a5a..0000000000
--- a/ext/zlib/tests/001.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-gzdeflate()/gzinflate()
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php /* $Id$ */
-$original = str_repeat("hallo php",4096);
-$packed=gzdeflate($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);
-echo strlen($packed)." ".strlen($original)."\n";
-$unpacked=gzinflate($packed, 40000);
-if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";
-
-$original = 'aaaaaaaaaaaaaaa';
-$packed=gzdeflate($original);
-echo strlen($packed)." ".strlen($original)."\n";
-$unpacked=gzinflate($packed);
-if (strcmp($original,$unpacked)==0) echo "Strings are equal";
-?>
---EXPECT--
-100 36864
-Strings are equal
-100 36864
-Strings are equal
-5 15
-Strings are equal
\ No newline at end of file
diff --git a/ext/zlib/tests/002.phpt b/ext/zlib/tests/002.phpt
deleted file mode 100644
index 9844a1b93d..0000000000
--- a/ext/zlib/tests/002.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-gzcompress()/gzuncompress()
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php /* $Id$ */
-$original = str_repeat("hallo php",4096);
-$packed=gzcompress($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);
-echo strlen($packed)." ".strlen($original)."\n";
-$unpacked=gzuncompress($packed, 40000);
-if (strcmp($original,$unpacked)==0) echo "Strings are equal\n";
-?>
---EXPECT--
-106 36864
-Strings are equal
-106 36864
-Strings are equal
diff --git a/ext/zlib/tests/003.phpt b/ext/zlib/tests/003.phpt
deleted file mode 100644
index 2732d4cea6..0000000000
--- a/ext/zlib/tests/003.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-gzencode()/base64_encode()
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-$original = 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";
-?>
---EXPECT--
-118 36864
-Strings are equal
diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt
deleted file mode 100644
index a758b8c7b3..0000000000
--- a/ext/zlib/tests/004.phpt
+++ /dev/null
@@ -1,89 +0,0 @@
---TEST--
-gzfile() with various invalid params
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-
-var_dump(gzfile());
-var_dump(gzfile("nonexistent_file_gzfile",1));
-var_dump(gzfile(1,1,1));
-
-var_dump(gzfile(dirname(__FILE__)."/004.txt.gz"));
-var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1));
-
-ini_set("magic_quotes_runtime", 1);
-var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", -1));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d
-bool(false)
-
-Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-array(6) {
-  [0]=>
-  string(36) "When you're taught through feelings
-"
-  [1]=>
-  string(26) "Destiny flying high above
-"
-  [2]=>
-  string(38) "all I know is that you can realize it
-"
-  [3]=>
-  string(18) "Destiny who cares
-"
-  [4]=>
-  string(19) "as it turns around
-"
-  [5]=>
-  string(39) "and I know that it descends down on me
-"
-}
-array(6) {
-  [0]=>
-  string(36) "When you're taught through feelings
-"
-  [1]=>
-  string(26) "Destiny flying high above
-"
-  [2]=>
-  string(38) "all I know is that you can realize it
-"
-  [3]=>
-  string(18) "Destiny who cares
-"
-  [4]=>
-  string(19) "as it turns around
-"
-  [5]=>
-  string(39) "and I know that it descends down on me
-"
-}
-array(6) {
-  [0]=>
-  string(37) "When you\'re taught through feelings
-"
-  [1]=>
-  string(26) "Destiny flying high above
-"
-  [2]=>
-  string(38) "all I know is that you can realize it
-"
-  [3]=>
-  string(18) "Destiny who cares
-"
-  [4]=>
-  string(19) "as it turns around
-"
-  [5]=>
-  string(39) "and I know that it descends down on me
-"
-}
-Done
diff --git a/ext/zlib/tests/004.txt.gz b/ext/zlib/tests/004.txt.gz
deleted file mode 100644
index 07805db755..0000000000
--- a/ext/zlib/tests/004.txt.gz
+++ /dev/null
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
deleted file mode 100644
index 79834b2d34..0000000000
--- a/ext/zlib/tests/005.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-gzcompress()/gzuncompress() and invalid params 
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-
-var_dump(gzcompress());
-var_dump(gzcompress("", 1000));
-var_dump(gzcompress("", -1));
-
-var_dump(gzcompress(""));
-var_dump(gzcompress("", 9));
-
-$string = "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony";
-
-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(""));
-var_dump(gzuncompress("", 9));
-
-var_dump(gzuncompress($data1));
-var_dump(gzuncompress($data2));
-$data2{4} = 0;
-var_dump(gzuncompress($data2));
-
-echo "Done\n";
-?>
---EXPECTF--	
-
-Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on line %d
-bool(false)
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-
-Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzuncompress(): %s error in %s on line %d
-bool(false)
-
-Warning: gzuncompress(): length (-1) must be greater or equal zero in %s on line %d
-bool(false)
-
-Warning: gzuncompress(): %s error in %s on line %d
-bool(false)
-
-Warning: gzuncompress(): %s error in %s on line %d
-bool(false)
-string(94) "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony"
-string(94) "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony"
-
-Warning: gzuncompress(): %s error in %s on line %d
-bool(false)
-Done
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
deleted file mode 100644
index 1ddb563784..0000000000
--- a/ext/zlib/tests/006.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
---TEST--
-gzdeflate()/gzinflate() and invalid params 
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-
-var_dump(gzdeflate());
-var_dump(gzdeflate("", 1000));
-var_dump(gzdeflate("", -1));
-
-var_dump(gzdeflate(""));
-var_dump(gzdeflate("", 9));
-
-$string = "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony";
-
-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("asdf"));
-var_dump(gzinflate("asdf", 9));
-
-var_dump(gzinflate($data1));
-var_dump(gzinflate($data2));
-$data2{4} = 0;
-var_dump(gzinflate($data2));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on line %d
-bool(false)
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-string(%d) "%s"
-
-Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-
-Warning: gzinflate(): data error in %s on line %d
-bool(false)
-
-Warning: gzinflate(): length (-1) must be greater or equal zero in %s on line %d
-bool(false)
-
-Warning: gzinflate(): data error in %s on line %d
-bool(false)
-
-Warning: gzinflate(): data error in %s on line %d
-bool(false)
-string(94) "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony"
-string(94) "Answer me, it can't be so hard
-Cry to relieve what's in your heart
-Desolation, grief and agony"
-
-Warning: gzinflate(): data error in %s on line %d
-bool(false)
-Done
diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
deleted file mode 100644
index ec37b99de6..0000000000
--- a/ext/zlib/tests/007.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-gzencode() and invalid params
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-
-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("", -1, 1));
-var_dump(gzencode("", 9, 2));
-
-$string = "Light of my sun
-Light in this temple
-Light in my truth
-Lies in the darkness";
-
-var_dump(gzencode($string, 9, 3));
-
-var_dump(gzencode($string, -1, 1));
-var_dump(gzencode($string, 9, 2));
-
-echo "Done\n";
-?>
---EXPECTF--	
-Warning: gzencode() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzencode() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
-Warning: gzencode(): compression level(-10) must be within -1..9 in %s on line %d
-bool(false)
-
-Warning: gzencode(): compression level(100) must be within -1..9 in %s on line %d
-bool(false)
-
-Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d
-bool(false)
-string(%d) "%s"
-string(%d) "%s"
-
-Warning: gzencode(): encoding mode must be FORCE_GZIP or FORCE_DEFLATE in %s on line %d
-bool(false)
-string(%d) "%s"
-string(%d) "%s"
-Done
diff --git a/ext/zlib/tests/bug_34821.phpt b/ext/zlib/tests/bug_34821.phpt
deleted file mode 100644
index ff845c6df7..0000000000
--- a/ext/zlib/tests/bug_34821.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-bug 34821
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-
-// test 50 bytes to 500k
-$b = array(
-	50, 
-	500, 
-	5000, 
-	500000,
-//	1000000, // works, but test would take too long
-);
-
-srand(time());
-
-foreach ($b as $size) {
-	$s = '';
-	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)));
-}
-?>
---EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
diff --git a/ext/zlib/tests/compress_zlib_wrapper.phpt b/ext/zlib/tests/compress_zlib_wrapper.phpt
deleted file mode 100644
index fe8774f3a1..0000000000
--- a/ext/zlib/tests/compress_zlib_wrapper.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-compress.zlib:// wrapper
---SKIPIF--
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
---FILE--
-<?php
-
-$pfx = str_repeat('../', substr_count($_SERVER['PHP_SELF'], '../'));
-
-// Relative path
-$fp = fopen("compress.zlib://{$pfx}ext/xsl/tests/xslt.xsl.gz", "rb");
-fclose($fp);
-
-// Absolute path
-$fp = fopen("compress.zlib://". dirname(__FILE__). "/../../../ext/xsl/tests/xslt.xsl.gz", "rb");
-fclose($fp);
-
-echo "ok\n";
-?>
---EXPECT--
-ok
diff --git a/ext/zlib/tests/gzfilegzreadfile.phpt b/ext/zlib/tests/gzfilegzreadfile.phpt
deleted file mode 100644
index 2d6843ddd4..0000000000
--- a/ext/zlib/tests/gzfilegzreadfile.phpt
+++ /dev/null
@@ -1,82 +0,0 @@
---TEST--
-gzfile(), gzreadfile()
---SKIPIF--
-<?php /* $Id$ */
-if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-$original = <<<EOD
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-
-EOD;
-
-$filename = tempnam("/tmp", "phpt");
-
-$fp = gzopen($filename, "wb");
-gzwrite($fp, $original);
-var_dump(strlen($original));
-fclose($fp);
-
-readgzfile($filename);
-
-echo "\n";
-
-$lines = gzfile($filename);
-
-unlink($filename);
-
-foreach ($lines as $line) {
-    echo $line;
-}
-
-?>
---EXPECT--
-int(560)
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
-blah blah blah blah blah blah blah
diff --git a/ext/zlib/tests/gzreadgzwrite.phpt b/ext/zlib/tests/gzreadgzwrite.phpt
deleted file mode 100644
index 6d6729a72f..0000000000
--- a/ext/zlib/tests/gzreadgzwrite.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-gzopen(), gzread(), gzwrite()
---SKIPIF--
-<?php # vim600:syn=php:
-if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-$original = str_repeat("hallo php",4096);
-$filename = tempnam("/tmp", "phpt");
-
-$fp = gzopen($filename, "wb");
-gzwrite($fp, $original);
-var_dump(strlen($original));
-var_dump(gztell($fp));
-fclose($fp);
-
-$fp = gzopen($filename, "rb");
-$data = gzread($fp, strlen($original));
-if ($data == $original) {
-	echo "Strings are equal\n";
-} else {
-	echo "Strings are not equal\n";
-	var_dump($data);
-}
-gzclose($fp);
-unlink($filename);
-?>
---EXPECT--
-int(36864)
-int(36864)
-Strings are equal
diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt
deleted file mode 100644
index 7bb567d889..0000000000
--- a/ext/zlib/tests/gzreadgzwriteplain.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-gzopen(), gzread(), gzwrite() for non-compressed data
---SKIPIF--
-<?php # vim600:syn=php:
-if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php
-$original = str_repeat("hallo php",4096);
-$filename = tempnam("/tmp", "phpt");
-
-$fp = fopen($filename, "wb");
-fwrite($fp, $original);
-var_dump(strlen($original));
-var_dump(ftell($fp));
-fclose($fp);
-
-$fp = gzopen($filename, "rb");
-$data = gzread($fp, strlen($original));
-if ($data == $original) {
-	echo "Strings are equal\n";
-} else {
-	echo "Strings are not equal\n";
-	var_dump($data);
-}
-
-gzseek($fp, strlen($original) / 2);
-$data = gzread($fp, strlen($original));
-
-var_dump(strlen($data));
-if ($data == substr($original, strlen($original) / 2)) {
-	echo "Strings are equal\n";
-} else {
-	echo "Strings are not equal\n";
-	var_dump($data);
-}
-
-gzclose($fp);
-unlink($filename);
-?>
---EXPECT--
-int(36864)
-int(36864)
-Strings are equal
-int(18432)
-Strings are equal
diff --git a/ext/zlib/tests/zlib_filter_deflate.phpt b/ext/zlib/tests/zlib_filter_deflate.phpt
deleted file mode 100644
index 1811779f04..0000000000
--- a/ext/zlib/tests/zlib_filter_deflate.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-zlib.deflate (with convert.base64-encode)
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php /* $Id$ */
-$text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
-
-$fp = fopen('php://stdout', 'w');
-stream_filter_append($fp, 'zlib.deflate', STREAM_FILTER_WRITE);
-stream_filter_append($fp, 'convert.base64-encode', STREAM_FILTER_WRITE);
-fwrite($fp, $text);
-fclose($fp);
-
-?> 
---EXPECT-- 
-HctBDoAgDETRq8zOjfEeHKOGATG0TRpC4u1Vdn/xX4IoxkVMxgP1zA4vkJVhULk9UGkM6TvSNolmxUNlNLePVQ45O3eINf0fsQxtCxwv
diff --git a/ext/zlib/tests/zlib_filter_inflate.phpt b/ext/zlib/tests/zlib_filter_inflate.phpt
deleted file mode 100644
index 026f192a6e..0000000000
--- a/ext/zlib/tests/zlib_filter_inflate.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-zlib.inflate (with convert.base64-decode)
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
---FILE--
-<?php /* $Id$ */
-$text = 'HctBDoAgDETRq8zOjfEeHKOGATG0TRpC4u1Vdn/xX4IoxkVMxgP1zA4vkJVhULk9UGkM6TvSNolmxUNlNLePVQ45O3eINf0fsQxtCxwv';
-
-$fp = fopen('php://stdout', 'w');
-stream_filter_append($fp, 'convert.base64-decode', STREAM_FILTER_WRITE);
-stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_WRITE);
-fwrite($fp, $text);
-fclose($fp);
-
-?> 
---EXPECT-- 
-I am the very model of a modern major general, I've information vegetable, animal, and mineral.