From 597319011750ceaf7e156fe8bc03574e7f4e399b Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 12 Feb 2015 11:12:42 +0100
Subject: [PATCH] reorder

---
 tests/client002.phpt         |  2 +-
 tests/client003.phpt         |  2 +-
 tests/client004.phpt         |  2 +-
 tests/client005.phpt         |  2 +-
 tests/client006.phpt         |  2 +-
 tests/client007.phpt         |  2 +-
 tests/client008.phpt         |  2 +-
 tests/client013.phpt         |  2 +-
 tests/client015.phpt         |  2 +-
 tests/client016.phpt         |  2 +-
 tests/clientresponse003.phpt |  2 +-
 tests/pipeline.inc           | 25 ----------------
 tests/pipeline001.phpt       | 56 ------------------------------------
 tests/propertyproxy001.phpt  |  2 ++
 tests/proxy.inc              | 21 --------------
 tests/proxy001.phpt          | 47 ------------------------------
 tests/proxy002.phpt          | 42 ---------------------------
 tests/server.inc             | 36 -----------------------
 18 files changed, 13 insertions(+), 238 deletions(-)
 delete mode 100644 tests/pipeline.inc
 delete mode 100644 tests/pipeline001.phpt
 delete mode 100644 tests/proxy.inc
 delete mode 100644 tests/proxy001.phpt
 delete mode 100644 tests/proxy002.phpt
 delete mode 100644 tests/server.inc

diff --git a/tests/client002.phpt b/tests/client002.phpt
index e07b82e..aeb2d8a 100644
--- a/tests/client002.phpt
+++ b/tests/client002.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client003.phpt b/tests/client003.phpt
index 29ab245..a6b1a4c 100644
--- a/tests/client003.phpt
+++ b/tests/client003.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client004.phpt b/tests/client004.phpt
index 204e172..1b3bb5e 100644
--- a/tests/client004.phpt
+++ b/tests/client004.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client005.phpt b/tests/client005.phpt
index 229195c..b73b5bb 100644
--- a/tests/client005.phpt
+++ b/tests/client005.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client006.phpt b/tests/client006.phpt
index 403d3e7..1621cc7 100644
--- a/tests/client006.phpt
+++ b/tests/client006.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client007.phpt b/tests/client007.phpt
index 6383567..f0100a6 100644
--- a/tests/client007.phpt
+++ b/tests/client007.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client008.phpt b/tests/client008.phpt
index 41c3e68..f8b8774 100644
--- a/tests/client008.phpt
+++ b/tests/client008.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client013.phpt b/tests/client013.phpt
index f246a30..fdf6c96 100644
--- a/tests/client013.phpt
+++ b/tests/client013.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php 
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client015.phpt b/tests/client015.phpt
index a5c2ef7..70b5f43 100644
--- a/tests/client015.phpt
+++ b/tests/client015.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/client016.phpt b/tests/client016.phpt
index c935f06..58f97c1 100644
--- a/tests/client016.phpt
+++ b/tests/client016.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/clientresponse003.phpt b/tests/clientresponse003.phpt
index 45c1d26..60ba07b 100644
--- a/tests/clientresponse003.phpt
+++ b/tests/clientresponse003.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
diff --git a/tests/pipeline.inc b/tests/pipeline.inc
deleted file mode 100644
index 815b463..0000000
--- a/tests/pipeline.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php 
-
-include "server.inc";
-
-function respond($client, $msg) {
-	(new http\Env\Response)->setEnvRequest($msg)
-		->setHeader("X-Req", $msg->getRequestUrl())
-		->send($client);
-}
-
-serve(function($client) {
-	$count = trim(fgets(STDIN));
-	
-	/* the peek message */
-	respond($client, new http\Message($client, false));
-	
-	/* pipelined messages */
-	$req = array();
-	for ($i=0; $i < $count; ++ $i) {
-		$req[] = new http\Message($client, false);
-	}
-	foreach ($req as $msg) {
-		respond($client, $msg);
-	}
-});
diff --git a/tests/pipeline001.phpt b/tests/pipeline001.phpt
deleted file mode 100644
index 54707df..0000000
--- a/tests/pipeline001.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-pipelining
---SKIPIF--
-<?php 
-include "skipif.inc";
-skip_client_test();
-?>
---FILE--
-<?php 
-
-include "server.inc";
-
-echo "Test\n";
-
-server("pipeline.inc", function($port, $stdin, $stdout, $stderr) {
-	/* tell the server we're about to send 3 pipelined messages */
-	fputs($stdin, "3\n");
-	
-	$client = new http\Client(null);
-	$client->configure(["pipelining" => true, "max_host_connections" => 0]);
-	
-	/* this is just to let curl know the server may be capable of pipelining */
-	$client->enqueue(new http\Client\Request("GET", "http://localhost:$port"));
-	$client->send();
-	
-	$client->enqueue(new http\Client\Request("GET", "http://localhost:$port/1"));
-	$client->enqueue(new http\Client\Request("GET", "http://localhost:$port/2"));
-	$client->enqueue(new http\Client\Request("GET", "http://localhost:$port/3"));
-	$client->send();
-	
-	while (($response = $client->getResponse())) {
-		echo $response;
-	}
-});
-
-?>
-===DONE===
---EXPECT--
-Test
-HTTP/1.1 200 OK
-X-Req: /3
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-X-Req: /2
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-X-Req: /1
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-X-Req: /
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-===DONE===
diff --git a/tests/propertyproxy001.phpt b/tests/propertyproxy001.phpt
index 552a713..1001f8e 100644
--- a/tests/propertyproxy001.phpt
+++ b/tests/propertyproxy001.phpt
@@ -4,6 +4,8 @@ property proxy
 <?php
 include "skipif.inc";
 ?>
+--XFAIL--
+TBD
 --FILE--
 <?php
 
diff --git a/tests/proxy.inc b/tests/proxy.inc
deleted file mode 100644
index 61b20dd..0000000
--- a/tests/proxy.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php 
-
-include "server.inc";
-
-serve(function($client) {
-	/* this might be a proxy connect or a standard request */
-	$request = new http\Message($client, false);
-	
-	if ($request->getHeader("Proxy-Connection")) {
-		$response = new http\Env\Response;
-		$response->send($client);
-		
-		/* soak up the request following the connect */
-		new http\Message($client, false);
-	}
-	
-	/* return the initial message as response body */
-	$response = new http\Env\Response;
-	$response->getBody()->append($request);
-	$response->send($client);
-});
diff --git a/tests/proxy001.phpt b/tests/proxy001.phpt
deleted file mode 100644
index c3a5905..0000000
--- a/tests/proxy001.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-proxy - send proxy headers for a proxy request
---SKIPIF--
-<?php 
-include "skipif.inc";
-skip_client_test();
-?>
---FILE--
-<?php
-
-include "server.inc";
-
-echo "Test\n";
-
-server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
-	echo "Server on port $port\n";
-	
-	$c = new http\Client;
-	$r = new http\Client\Request("GET", "http://www.example.com/");
-	$r->setOptions(array(
-			"timeout" => 3,
-			"proxytunnel" => true,
-			"proxyheader" => array("Hello" => "there!"),
-			"proxyhost" => "localhost",
-			"proxyport" => $port,
-	));
-	try {
-		$c->enqueue($r)->send();
-	} catch (Exception $e) {
-		echo $e;
-	}
-	echo $c->getResponse()->getBody();
-	unset($r, $client);
-});
-
-?>
-===DONE===
---EXPECTF--
-Test
-Server on port %d
-CONNECT www.example.com:80 HTTP/1.1
-Host: www.example.com:80
-User-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
-Proxy-Connection: Keep-Alive
-Hello: there!
-Content-Length: 0
-===DONE===
diff --git a/tests/proxy002.phpt b/tests/proxy002.phpt
deleted file mode 100644
index ce548a5..0000000
--- a/tests/proxy002.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-proxy - don't send proxy headers for a standard request
---SKIPIF--
-<?php 
-include "skipif.inc";
-skip_client_test();
-?>
---FILE--
-<?php
-
-include "server.inc";
-
-echo "Test\n";
-
-server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
-	echo "Server on port $port\n";
-	$c = new http\Client;
-	$r = new http\Client\Request("GET", "http://localhost:$port/");
-	$r->setOptions(array(
-		"timeout" => 3,
-		"proxyheader" => array("Hello" => "there!"),
-	));
-	try {
-		$c->enqueue($r)->send();
-	} catch (Exception $e) {
-		echo $e;
-	}
-	echo $c->getResponse()->getBody();
-	unset($r, $client);
-});
-
-?>
-===DONE===
---EXPECTF--
-Test
-Server on port %d
-GET / HTTP/1.1
-User-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
-Host: localhost:%d
-Accept: */*
-Content-Length: 0
-===DONE===
diff --git a/tests/server.inc b/tests/server.inc
deleted file mode 100644
index ca20cb0..0000000
--- a/tests/server.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php 
-
-function serve(callable $cb) {
-	foreach (range(8000, 9000) as $port) {
-		if (($server = stream_socket_server("tcp://localhost:$port"))) {
-			fprintf(STDERR, "%s\n", $port);
-			do {
-				$R = [$server]; $W = []; $E = [];
-				$select = stream_select($R, $E, $E, 0, 10000);
-				if ($select && ($client = stream_socket_accept($server, 1))) {
-					if (getenv("PHP_HTTP_TEST_SSL")) {
-						stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
-					}
-					while (!feof($client)) {
-						$cb($client);
-					}
-				}
-			} while ($select !== false);
-			return;
-		}
-	}
-}
-
-function server($file, callable $cb) {
-	$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
-	if (($proc = proc_open(PHP_BINARY . " $file", $spec, $pipes, __DIR__))) {
-		$port = trim(fgets($pipes[2]));
-		
-		$cb($port, $stdin = $pipes[0], $stdout = $pipes[1], $stderr = $pipes[2]);
-		
-		proc_terminate($proc);
-		
-		fpassthru($stderr);
-		fpassthru($stdout);
-	}
-}
-- 
2.30.2