From: Daniel Lowrey <rdlowrey@php.net>
Date: Mon, 24 Feb 2014 21:41:46 +0000 (-0700)
Subject: Remove openssl tests that shouldn't have survived last merge
X-Git-Tag: php-5.6.0alpha3~1^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4c7ab8399be148a6e2cab58719d59e73c983020;p=php

Remove openssl tests that shouldn't have survived last merge

These are .phpt files I meant to remove with the last batch as
the same functionality is now covered in other tests and these
are no longer needed.
---

diff --git a/ext/openssl/tests/tlsv1.1_wrapper_001.phpt b/ext/openssl/tests/tlsv1.1_wrapper_001.phpt
deleted file mode 100644
index 82048e525d..0000000000
--- a/ext/openssl/tests/tlsv1.1_wrapper_001.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-tlsv1.1 stream wrapper
---SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip");
-if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSL 1.0.1 required");
-if (!function_exists('pcntl_fork')) die("skip no fork");
---FILE--
-<?php
-$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-$ctx = stream_context_create(array('ssl' => array(
-	'local_cert' => __DIR__ . '/streams_crypto_method.pem',
-)));
-
-$server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-var_dump($server);
-
-$pid = pcntl_fork();
-if ($pid == -1) {
-	die('could not fork');
-} elseif ($pid) {
-	$flags = STREAM_CLIENT_CONNECT;
-	$ctx = stream_context_create(array('ssl' => array(
-		'verify_peer' => false,
-		'verify_host' => false
-	)));
-	
-	$client = stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-	$client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-	$client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-} else {	
-	@pcntl_wait($status);
-	for ($i=0; $i < 3; $i++) {
-		@stream_socket_accept($server, 1);
-	}
-}
---EXPECTF--
-resource(%d) of type (stream)
-resource(%d) of type (stream)
-bool(false)
-bool(false)
diff --git a/ext/openssl/tests/tlsv1.2_wrapper_002.phpt b/ext/openssl/tests/tlsv1.2_wrapper_002.phpt
deleted file mode 100644
index d58d1a1262..0000000000
--- a/ext/openssl/tests/tlsv1.2_wrapper_002.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-tlsv1.2 stream wrapper
---SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip");
-if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSL 1.0.1 required");
-if (!function_exists('pcntl_fork')) die("skip no fork");
---FILE--
-<?php
-$flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-$ctx = stream_context_create(array('ssl' => array(
-	'local_cert' => __DIR__ . '/streams_crypto_method.pem',
-)));
-
-$server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-var_dump($server);
-
-$pid = pcntl_fork();
-if ($pid == -1) {
-	die('could not fork');
-} elseif ($pid) {
-	$flags = STREAM_CLIENT_CONNECT;
-	$ctx = stream_context_create(array('ssl' => array(
-		'verify_peer' => false,
-		'verify_host' => false
-	)));
-	
-	$client = stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-	$client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-	$client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
-	var_dump($client);
-	
-} else {	
-	@pcntl_wait($status);
-	for ($i=0; $i < 3; $i++) {
-		@stream_socket_accept($server, 1);
-	}
-}
---EXPECTF--
-resource(%d) of type (stream)
-resource(%d) of type (stream)
-bool(false)
-bool(false)