You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2017/07/11 13:21:47 UTC
svn commit: r1801613 - /httpd/test/framework/trunk/t/modules/remoteip.t
Author: jim
Date: Tue Jul 11 13:21:47 2017
New Revision: 1801613
URL: http://svn.apache.org/viewvc?rev=1801613&view=rev
Log:
clarify and typo fixes
Modified:
httpd/test/framework/trunk/t/modules/remoteip.t
Modified: httpd/test/framework/trunk/t/modules/remoteip.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/remoteip.t?rev=1801613&r1=1801612&r2=1801613&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/remoteip.t (original)
+++ httpd/test/framework/trunk/t/modules/remoteip.t Tue Jul 11 13:21:47 2017
@@ -37,8 +37,8 @@ $sock->shutdown(1);
my $response_data = slurp($sock);
my $r = HTTP::Response->parse($response_data);
chomp(my $content = $r->content);
-ok t_cmp($r->code, 200, "PROXY TCP4 protocol human readable check");
-ok t_cmp($content, "PROXY-OK", "Context check");
+ok t_cmp($r->code, 200, "PROXY human readable TCP4 protocol check");
+ok t_cmp($content, "PROXY-OK", "Content check");
$sock->shutdown(2);
#
@@ -55,8 +55,8 @@ $sock->shutdown(1);
$response_data = slurp($sock);
$r = HTTP::Response->parse($response_data);
chomp($content = $r->content);
-ok t_cmp($r->code, undef, "broken PROXY protocol human readable check");
-ok t_cmp($content, "", "Context check");
+ok t_cmp($r->code, undef, "broken PROXY human readable protocol check");
+ok t_cmp($content, "", "Content check");
$sock->shutdown(2);
#
@@ -69,8 +69,8 @@ $sock->shutdown(1);
$response_data = slurp($sock);
$r = HTTP::Response->parse($response_data);
chomp($content = $r->content);
-ok t_cmp($r->code, 200, "PROXY TCP6 protocol human readable check");
-ok t_cmp($content, "PROXY-OK", "Context check");
+ok t_cmp($r->code, 200, "PROXY human readable TCP6 protocol check");
+ok t_cmp($content, "PROXY-OK", "Content check");
$sock->shutdown(2);
# Test binary format
@@ -78,13 +78,13 @@ $proxy = "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x
$proxy .= "\x21"; # protocol version and command (AF_INET STREAM)
$proxy .= "\x11"; # transport protocol and address family (TCP over IPv4)
$proxy .= "\x00\x0C"; # 12 bytes coming up
-$proxy .= "\xC0\xA8\xC0\x42\xC0\xA8\xC0\x4D\x01\xF0\x01\xF1";
+$proxy .= "\xC0\xA8\xC0\x42\xC0\xA8\xC0\x4D\x01\xF0\x01\xF1"; # IP addresses and ports
ok ($sock = Apache::TestRequest::vhost_socket("remote_ip"));
$sock->print($proxy . $url);
$sock->shutdown(1);
$response_data = slurp($sock);
$r = HTTP::Response->parse($response_data);
chomp($content = $r->content);
-ok t_cmp($r->code, 200, "PROXY TCP4 protocol binary check");
-ok t_cmp($content, "PROXY-OK", "Context check");
+ok t_cmp($r->code, 200, "PROXY binary protocol TCP4 check");
+ok t_cmp($content, "PROXY-OK", "Content check");
$sock->shutdown(2);