You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2007/10/29 16:06:19 UTC
svn commit: r589666 - in /httpd/test/trunk/perl-framework/t: conf/
htdocs/modules/negotiation/query/ modules/
Author: jorton
Date: Mon Oct 29 08:06:16 2007
New Revision: 589666
URL: http://svn.apache.org/viewvc?rev=589666&view=rev
Log:
Add test case for PR 43550, marked as "todo".
Submitted by: Jose Kahan <jose w3.org>
Added:
httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/ (with props)
httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html (with props)
httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL (with props)
httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.var
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
httpd/test/trunk/perl-framework/t/modules/negotiation.t
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=589666&r1=589665&r2=589666&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Mon Oct 29 08:06:16 2007
@@ -150,6 +150,15 @@
Options +MultiViews
LanguagePriority fu fr en de
</Directory>
+
+ <IfModule @CGI_MODULE@>
+ <Directory @SERVERROOT@/htdocs/modules/negotiation/query>
+ Options +MultiViews +ExecCGI
+ MultiviewsMatch any
+ AddHandler cgi-script .pl
+ </Directory>
+ </IfModule>
+
</IfModule>
##
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 29 08:06:16 2007
@@ -0,0 +1 @@
+*.pl
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html?rev=589666&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html Mon Oct 29 08:06:16 2007
@@ -0,0 +1 @@
+test.html
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL?rev=589666&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL Mon Oct 29 08:06:16 2007
@@ -0,0 +1,8 @@
+
+print "Content-type: text/html\n\n";
+
+foreach my $key (keys %ENV) {
+ if ($key eq "QUERY_STRING") {
+ print "$key --> $ENV{$key}\n";
+ }
+}
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.pl.PL
------------------------------------------------------------------------------
svn:executable = *
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.var
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.var?rev=589666&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.var (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/negotiation/query/test.var Mon Oct 29 08:06:16 2007
@@ -0,0 +1,7 @@
+URI: test
+
+URI: test.pl
+Content-Type: text/html; qs=1.0
+
+URI: test.html
+Content-Type: text/html; qs=0.8
Modified: httpd/test/trunk/perl-framework/t/modules/negotiation.t
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/modules/negotiation.t?rev=589666&r1=589665&r2=589666&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/negotiation.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/negotiation.t Mon Oct 29 08:06:16 2007
@@ -40,9 +40,11 @@
my ($en, $fr, $de, $fu, $bu) = qw(en fr de fu bu);
my @language = ($en, $fr, $de, $fu);
+my $tests = (@language * 3) + (@language * @language * 5) + 7;
-plan tests => (@language * 3) + (@language * @language * 5) + 6,
- have_module 'negotiation';
+plan tests => $tests,
+ todo => [$tests],
+ have_module 'negotiation' && have_cgi && have_module 'mime';
my $actual;
@@ -160,3 +162,11 @@
my_chomp();
ok t_cmp($actual, "index.html.$fr.gz",
"bu has the highest quality but is non-existant, so fr is next best");
+
+# PR 43550 -- TODO
+$actual = GET_BODY "/modules/negotiation/query/test?foo";
+print "# GET /modules/negotiation/query/test?foo\n";
+my_chomp();
+ok t_cmp($actual, "QUERY_STRING --> foo",
+ "The type map gives the script the highest quality;"
+ . "\nthe request included a query string");