Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6F0B5200CC4 for ; Wed, 28 Jun 2017 15:08:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6DA4E160BE8; Wed, 28 Jun 2017 13:08:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B1189160BF7 for ; Wed, 28 Jun 2017 15:08:45 +0200 (CEST) Received: (qmail 87703 invoked by uid 500); 28 Jun 2017 13:08:44 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 87694 invoked by uid 99); 28 Jun 2017 13:08:44 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2017 13:08:44 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id A1F8F3A060B for ; Wed, 28 Jun 2017 13:08:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1800162 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/proxy.t Date: Wed, 28 Jun 2017 13:08:41 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170628130843.A1F8F3A060B@svn01-us-west.apache.org> archived-at: Wed, 28 Jun 2017 13:08:46 -0000 Author: jim Date: Wed Jun 28 13:08:41 2017 New Revision: 1800162 URL: http://svn.apache.org/viewvc?rev=1800162&view=rev Log: Test that we read the content correctly as well for unix domain socket tests Modified: httpd/test/framework/trunk/t/conf/extra.conf.in httpd/test/framework/trunk/t/modules/proxy.t Modified: httpd/test/framework/trunk/t/conf/extra.conf.in URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1800162&r1=1800161&r2=1800162&view=diff ============================================================================== --- httpd/test/framework/trunk/t/conf/extra.conf.in (original) +++ httpd/test/framework/trunk/t/conf/extra.conf.in Wed Jun 28 13:08:41 2017 @@ -286,7 +286,7 @@ ProxyPass /reverse/ http://@SERVERNAME@:@PORT@/ ProxyPassReverse /reverse/ http://@SERVERNAME@:@PORT@/ = 2.4.7> - ProxyPass /uds unix:/tmp/test-ptf.sock|http: + ProxyPass /uds/ unix:/tmp/test-ptf.sock|http: ProxyPass http://@SERVERNAME@:@PORT@/ Modified: httpd/test/framework/trunk/t/modules/proxy.t URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy.t?rev=1800162&r1=1800161&r2=1800162&view=diff ============================================================================== --- httpd/test/framework/trunk/t/modules/proxy.t (original) +++ httpd/test/framework/trunk/t/modules/proxy.t Wed Jun 28 13:08:41 2017 @@ -7,7 +7,7 @@ use Apache::TestUtil; use Apache::TestConfig (); use Misc; -my $num_tests = 20; +my $num_tests = 21; if (have_min_apache_version('2.4.7')) { $num_tests++; } @@ -119,8 +119,8 @@ sub uds_script if (accept(my $new_sock, $server)) { my $data = <$new_sock>; print $new_sock "HTTP/1.0 200 OK\r\n"; - print $new_sock "Content-Type: text/html\r\n\r\n"; - print $new_sock "

Hello World

$data

\n"; + print $new_sock "Content-Type: text/plain\r\n\r\n"; + print $new_sock "hello world\n"; close $new_sock; } unlink($socket_path); @@ -145,5 +145,9 @@ if (have_min_apache_version('2.4.7')) { } $r = GET("/uds/"); ok t_cmp($r->code, 200, "ProxyPass UDS path"); + my $c = $r->content; + chomp $c; + ok t_cmp($c, "hello world", "UDS content OK"); + }