Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9608A104D9 for ; Tue, 2 Dec 2014 17:10:15 +0000 (UTC) Received: (qmail 73138 invoked by uid 500); 2 Dec 2014 17:10:13 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 73068 invoked by uid 500); 2 Dec 2014 17:10:13 -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 73036 invoked by uid 99); 2 Dec 2014 17:10:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 17:10:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 17:10:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 929732388CF1; Tue, 2 Dec 2014 17:08:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1642956 - in /httpd/test/framework/trunk: scripts/uds-test.pl t/conf/extra.conf.in t/modules/proxy.t Date: Tue, 02 Dec 2014 17:08:20 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141202170820.929732388CF1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Tue Dec 2 17:08:20 2014 New Revision: 1642956 URL: http://svn.apache.org/r1642956 Log: Add simple proxy UDS test Modified: httpd/test/framework/trunk/scripts/uds-test.pl httpd/test/framework/trunk/t/conf/extra.conf.in httpd/test/framework/trunk/t/modules/proxy.t Modified: httpd/test/framework/trunk/scripts/uds-test.pl URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/scripts/uds-test.pl?rev=1642956&r1=1642955&r2=1642956&view=diff ============================================================================== --- httpd/test/framework/trunk/scripts/uds-test.pl (original) +++ httpd/test/framework/trunk/scripts/uds-test.pl Tue Dec 2 17:08:20 2014 @@ -8,7 +8,7 @@ socket(my $server, PF_UNIX, SOCK_STREAM, unlink($socket_path); bind($server, $sock_addr) || die "bind: $!"; listen($server,1024) || die "listen: $!"; -while (accept(my $new_sock, $server)) { +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"; 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=1642956&r1=1642955&r2=1642956&view=diff ============================================================================== --- httpd/test/framework/trunk/t/conf/extra.conf.in (original) +++ httpd/test/framework/trunk/t/conf/extra.conf.in Tue Dec 2 17:08:20 2014 @@ -258,6 +258,9 @@ ProxyPass /reverse/notproxy/ ! ProxyPass /reverse/ http://@SERVERNAME@:@PORT@/ ProxyPassReverse /reverse/ http://@SERVERNAME@:@PORT@/ + = 2.4.7> + ProxyPass /uds unix:/tmp/test-ptf.sock|http: + = 2.2.5> Modified: httpd/test/framework/trunk/t/modules/proxy.t URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy.t?rev=1642956&r1=1642955&r2=1642956&view=diff ============================================================================== --- httpd/test/framework/trunk/t/modules/proxy.t (original) +++ httpd/test/framework/trunk/t/modules/proxy.t Tue Dec 2 17:08:20 2014 @@ -6,7 +6,7 @@ use Apache::TestRequest; use Apache::TestUtil; use Apache::TestConfig (); -plan tests => 17, need_module 'proxy'; +plan tests => 18, need_module 'proxy'; Apache::TestRequest::module("proxy_http_reverse"); Apache::TestRequest::user_agent(requests_redirectable => 0); @@ -82,3 +82,13 @@ if (have_module('alias')) { skip "skipping tests without mod_alias" foreach (1..4); } +my $pid = fork; +if ($pid) { + system './scripts/uds-test.pl'; + exit; +} +# give time for the system call to take effect +sleep 2; +$r = GET("/uds/"); +ok t_cmp($r->code, 200, "ProxyPass UDS path"); +