com php-src: Remove openssl tests that shouldn't have survived last merge: ext/openssl/tests/tlsv1.1_wrapper_001.phpt
ext/openssl/tests/tlsv1.2_wrapper_002.phpt
| From: | rdlowrey@php.net | Date: | Tue, 25 Feb 2014 16:59:13 +0000 |
| Subject: | com php-src: Remove openssl tests that shouldn't have survived last merge: ext/openssl/tests/tlsv1.1_wrapper_001.phpt ext/openssl/tests/tlsv1.2_wrapper_002.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76212@lists.php.net to get a copy of this message | ||
Commit: a4c7ab8399be148a6e2cab58719d59e73c983020
Author: Daniel Lowrey <rdlowrey@php.net> Mon, 24 Feb 2014 14:41:46 -0700
Parents: a031dc06d9b903705c7dd433d1361ba265ee4dfa
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4c7ab8399be148a6e2cab58719d59e73c983020
Log:
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.
Changed paths:
D ext/openssl/tests/tlsv1.1_wrapper_001.phpt
D ext/openssl/tests/tlsv1.2_wrapper_002.phpt
Diff:
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 82048e5..0000000
--- 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 d58d1a1..0000000
--- 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)