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 9C334200BCF for ; Mon, 5 Dec 2016 21:39:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9AFE9160B18; Mon, 5 Dec 2016 20:39:08 +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 E100A160B09 for ; Mon, 5 Dec 2016 21:39:07 +0100 (CET) Received: (qmail 59655 invoked by uid 500); 5 Dec 2016 20:39:07 -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 59646 invoked by uid 99); 5 Dec 2016 20:39:07 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2016 20:39:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 893BDD0DCD for ; Mon, 5 Dec 2016 20:39:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id bfO7WoOsp9Od for ; Mon, 5 Dec 2016 20:39:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 651465FC41 for ; Mon, 5 Dec 2016 20:39:04 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 56696E036E for ; Mon, 5 Dec 2016 20:38:48 +0000 (UTC) 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 228B83A0257 for ; Mon, 5 Dec 2016 20:38:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1772791 - in /httpd/test/framework/trunk/t: apache/iffile.t conf/extra.conf.in htdocs/apache/iffile/ htdocs/apache/iffile/document Date: Mon, 05 Dec 2016 20:38:47 -0000 To: cvs@httpd.apache.org From: jchampion@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161205203848.228B83A0257@svn01-us-west.apache.org> archived-at: Mon, 05 Dec 2016 20:39:08 -0000 Author: jchampion Date: Mon Dec 5 20:38:47 2016 New Revision: 1772791 URL: http://svn.apache.org/viewvc?rev=1772791&view=rev Log: Add some tests for trunk's new directive Been sitting on these since ACEU. Added: httpd/test/framework/trunk/t/apache/iffile.t httpd/test/framework/trunk/t/htdocs/apache/iffile/ httpd/test/framework/trunk/t/htdocs/apache/iffile/document Modified: httpd/test/framework/trunk/t/conf/extra.conf.in Added: httpd/test/framework/trunk/t/apache/iffile.t URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/iffile.t?rev=1772791&view=auto ============================================================================== --- httpd/test/framework/trunk/t/apache/iffile.t (added) +++ httpd/test/framework/trunk/t/apache/iffile.t Mon Dec 5 20:38:47 2016 @@ -0,0 +1,16 @@ +use strict; +use warnings FATAL => 'all'; + +use Apache::Test; +use Apache::TestRequest; +use Apache::TestUtil; + +plan tests => 2, + need( + need_module('mod_headers'), + need_min_apache_version('2.5.0') + ); + +my $resp = GET('/apache/iffile/document'); +ok t_cmp($resp->code, 200); +ok t_cmp($resp->header('X-Out'), "success1, success2, success3, success4"); 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=1772791&r1=1772790&r2=1772791&view=diff ============================================================================== --- httpd/test/framework/trunk/t/conf/extra.conf.in (original) +++ httpd/test/framework/trunk/t/conf/extra.conf.in Mon Dec 5 20:38:47 2016 @@ -1000,3 +1000,44 @@ LimitRequestFields 32 + +# +# test config (see t/apache/iffile.t) +# + + = 2.5.0> + + + + # First, the IfFiles that should succeed. + + Header merge X-Out success1 + + + Header merge X-Out success2 + + + Header merge X-Out success3 + + + Header merge X-Out success4 + + + # Followed by the IfFiles that should fail. + + Header merge X-Out fail1 + + + Header merge X-Out fail2 + + + Header merge X-Out fail3 + + + Header merge X-Out fail4 + + + + + + Added: httpd/test/framework/trunk/t/htdocs/apache/iffile/document URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/apache/iffile/document?rev=1772791&view=auto ============================================================================== --- httpd/test/framework/trunk/t/htdocs/apache/iffile/document (added) +++ httpd/test/framework/trunk/t/htdocs/apache/iffile/document Mon Dec 5 20:38:47 2016 @@ -0,0 +1 @@ +placeholder