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/11/02 12:30:11 UTC
svn commit: r591305 - in /httpd/test/trunk/perl-framework/t:
conf/ssl/ssl.conf.in htdocs/modules/ssl/ htdocs/modules/ssl/md5/
htdocs/modules/ssl/md5/empty.pfa htdocs/modules/ssl/sha/
htdocs/modules/ssl/sha/empty.pfa ssl/pr43738.t
Author: jorton
Date: Fri Nov 2 04:30:10 2007
New Revision: 591305
URL: http://svn.apache.org/viewvc?rev=591305&view=rev
Log:
- add TODO test for PR 43738
Added:
httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/
httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/md5/
httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/md5/empty.pfa
httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/sha/
httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/sha/empty.pfa
httpd/test/trunk/perl-framework/t/ssl/pr43738.t
- copied, changed from r589636, httpd/test/trunk/perl-framework/t/ssl/pr12355.t
Modified:
httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in
Modified: httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in?rev=591305&r1=591304&r2=591305&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in Fri Nov 2 04:30:10 2007
@@ -179,4 +179,19 @@
</Location>
</VirtualHost>
+ # For t/ssl/pr43738.t:
+ <IfModule mod_actions.c>
+ Action application/x-pf-action /modules/cgi/action.pl
+
+ AddType application/x-pf-action .pfa
+ </IfModule>
+
+ <Location /modules/ssl/sha/>
+ SSLCipherSuite RC4-SHA
+ </Location>
+
+ <Location /modules/ssl/md5/>
+ SSLCipherSuite RC4-MD5
+ </Location>
+
</IfModule>
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/md5/empty.pfa
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/md5/empty.pfa?rev=591305&view=auto
==============================================================================
(empty)
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/sha/empty.pfa
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/htdocs/modules/ssl/sha/empty.pfa?rev=591305&view=auto
==============================================================================
(empty)
Copied: httpd/test/trunk/perl-framework/t/ssl/pr43738.t (from r589636, httpd/test/trunk/perl-framework/t/ssl/pr12355.t)
URL: http://svn.apache.org/viewvc/httpd/test/trunk/perl-framework/t/ssl/pr43738.t?p2=httpd/test/trunk/perl-framework/t/ssl/pr43738.t&p1=httpd/test/trunk/perl-framework/t/ssl/pr12355.t&r1=589636&r2=591305&rev=591305&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/pr12355.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/pr43738.t Fri Nov 2 04:30:10 2007
@@ -5,50 +5,22 @@
use Apache::TestRequest;
use Apache::TestUtil;
-plan tests => 10, need 'ssl', need_min_apache_version('2.0');
+plan tests => 4, todo => [2, 4],
+ need 'ssl', need_module 'actions', need_min_apache_version('2.0');
Apache::TestRequest::user_agent_keepalive(1);
Apache::TestRequest::scheme('https');
my $r;
-# Send a series of POST requests with varying size request bodies.
-# Alternate between the location which requires a RC4-SHA ciphersuite
-# and one which requires RC5-MD5; mod_ssl will attempt to perform the
-# renegotiation between each request, and hence needs to perform the
-# buffering of request body data.
+# Variation of the PR 12355 test which breaks per PR 43738.
-$r = POST "/require-sha-cgi/perl_echo.pl", content => "hello world";
+$r = POST "/modules/ssl/md5/empty.pfa", content => "hello world";
ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, "hello world", "request body matches response");
+ok t_cmp($r->content, "/modules/ssl/md5/empty.pfa\nhello world", "request body matches response");
-$r = POST "/require-md5-cgi/perl_echo.pl", content => "hello world";
+$r = POST "/modules/ssl/sha/empty.pfa", content => "hello world";
ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, "hello world", "request body matches response");
-
-$r = POST "/require-sha-cgi/perl_echo.pl", content => 'x'x10000;
-
-ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, $r->request->content, "request body matches response");
-
-$r = POST "/require-md5-cgi/perl_echo.pl", content => 'x'x60000;
-
-ok t_cmp($r->code, 200, "renegotiation on POST works");
-ok t_cmp($r->content, $r->request->content, "request body matches response");
-
-# Test that content-level input filters are still run as expected by
-# using a request which triggers the mod_case_filter_in:
-
-my @filter = ('X-AddInputFilter' => 'CaseFilterIn'); #mod_client_add_filter
-
-if (have_module('case_filter_in')) {
- $r = POST "/require-sha-cgi/perl_echo.pl", @filter, content => "hello";
-
- ok t_cmp($r->code, 200, "renegotiation on POST works");
- ok t_cmp($r->content, "HELLO", "request body matches response");
-} else {
- skip "mod_case_filter_in not available" foreach (1..2);
-}
-
+ok t_cmp($r->content, "/modules/ssl/sha/empty.pfa\nhello world", "request body matches response");