Author: jorton
Date: Tue Dec 20 08:11:42 2005
New Revision: 358026
URL: http://svn.apache.org/viewcvs?rev=358026&view=rev
Log:
- add test case for PR 33791 aka CVE-2005-3357.
Added:
httpd/test/trunk/perl-framework/t/security/CVE-2005-3357.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/viewcvs/httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in?rev=358026&r1=358025&r2=358026&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 Tue Dec 20 08:11:42 2005
@@ -167,4 +167,16 @@
</Location>
</VirtualHost>
+ # An SSL vhost which can be used to trigger PR 33791
+
+ <VirtualHost ssl_pr33791>
+ SSLEngine On
+
+ ErrorDocument 400 /index.html
+
+ <Location />
+ SSLVerifyClient require
+ </Location>
+ </VirtualHost>
+
</IfModule>
Added: httpd/test/trunk/perl-framework/t/security/CVE-2005-3357.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CVE-2005-3357.t?rev=358026&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CVE-2005-3357.t (added)
+++ httpd/test/trunk/perl-framework/t/security/CVE-2005-3357.t Tue Dec 20 08:11:42 2005
@@ -0,0 +1,51 @@
+use strict;
+use warnings FATAL => 'all';
+
+# Test case for PR 33791.
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+BEGIN {
+ # prevent TestRequest from croaking on an HTTP/0.9 response
+ $ENV{APACHE_TEST_HTTP_09_OK} = 1;
+}
+
+my $vars = Apache::Test::vars();
+
+plan tests => 3, need $vars->{ssl_module_name}, need_lwp,
+ qw(LWP::Protocol::https);
+
+Apache::TestRequest::user_agent_keepalive(0);
+
+my $config = Apache::Test::config();
+
+Apache::TestRequest::module("ssl_pr33791");
+
+my $hostport = Apache::TestRequest::hostport();
+
+my $rurl = "http://" . $hostport . "/";
+
+t_debug("URL is $rurl");
+
+my $r = GET($rurl);
+
+my $proto = $r->protocol;
+
+ok $proto;
+
+if (!$proto) {
+ skip "server gave no response";
+} else {
+ if ($proto eq "HTTP/0.9") {
+ skip "server gave HTTP/0.9 response";
+ } elsif ($proto) {
+ ok t_cmp($r->code,
+ 400,
+ "Expected bad request from 'GET $rurl'"
+ );
+ }
+}
+
+ok t_cmp($r->content, qr/welcome to localhost/, "errordoc content was served");
Author: jorton
Date: Fri Dec 16 08:15:33 2005
New Revision: 357178
URL: http://svn.apache.org/viewcvs?rev=357178&view=rev
Log:
- add regression test for PR 18757
Added:
httpd/test/trunk/perl-framework/t/apache/pr18757.t
httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/empty.pl.PL
Modified:
httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/ (props changed)
Added: httpd/test/trunk/perl-framework/t/apache/pr18757.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/pr18757.t?rev=357178&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/pr18757.t (added)
+++ httpd/test/trunk/perl-framework/t/apache/pr18757.t Fri Dec 16 08:15:33 2005
@@ -0,0 +1,43 @@
+#
+# Regression test for PR 18757.
+#
+# Annoyingly awkward to write because LWP is a poor excuse for an HTTP
+# interface and will lie about what response headers are sent, so this
+# must be yet another test which speaks TCP directly.
+#
+
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+plan tests => 2, need 'cgi', 'proxy', need_min_apache_version('2.2.1');
+
+my $sock = Apache::TestRequest::vhost_socket("proxy_http_https");
+
+my $url = Apache::TestRequest::resolve_url("/modules/cgi/empty.pl");
+
+t_debug "URL via proxy is $url";
+
+ok $sock;
+
+$sock->print("HEAD $url HTTP/1.0\r\n");
+$sock->print("\r\n");
+
+my $ok = 0;
+my $response;
+
+do {
+ chomp($response = Apache::TestRequest::getline($sock) || '');
+ $response =~ s/\s$//;
+
+ if ($response =~ /Content-Length: 0/) {
+ $ok = 1;
+ }
+
+}
+while ($response ne "");
+
+ok t_cmp($ok, 1, "whether proxy strips Content-Length header");
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 16 08:15:33 2005
@@ -13,3 +13,4 @@
big.pl
not-modified.pl
nph-102.pl
+empty.pl
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/empty.pl.PL
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/empty.pl.PL?rev=357178&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/empty.pl.PL (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/cgi/empty.pl.PL Fri Dec 16 08:15:33 2005
@@ -0,0 +1,6 @@
+use strict;
+
+print "Content-type: text/plain\r\n";
+print "Content-Length: 0\r\n";
+print "\r\n";
+
Author: jorton
Date: Fri Dec 16 07:29:38 2005
New Revision: 357172
URL: http://svn.apache.org/viewcvs?rev=357172&view=rev
Log:
- ignore core files
Modified:
httpd/test/trunk/perl-framework/t/ (props changed)
Propchange: httpd/test/trunk/perl-framework/t/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 16 07:29:38 2005
@@ -5,3 +5,4 @@
SKIP
.gdb-test-start
.debugging
+core.*
Author: jorton
Date: Fri Dec 16 06:24:04 2005
New Revision: 357160
URL: http://svn.apache.org/viewcvs?rev=357160&view=rev
Log:
- add test for CVE-2005-3352
Added:
httpd/test/trunk/perl-framework/t/htdocs/security/CVE-2005-3352.map
httpd/test/trunk/perl-framework/t/security/CVE-2005-3352.t
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=357160&r1=357159&r2=357160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Dec 16 06:24:04 2005
@@ -451,6 +451,9 @@
AllowOverride All
Order allow,deny
Allow from all
+
+ # for CVE-2005-3352 test:
+ AddHandler imap-file map
</Directory>
<Directory @SERVERROOT@/htdocs/security/CAN-2004-0811>
Added: httpd/test/trunk/perl-framework/t/htdocs/security/CVE-2005-3352.map
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/security/CVE-2005-3352.map?rev=357160&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/security/CVE-2005-3352.map (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/security/CVE-2005-3352.map Fri Dec 16 06:24:04
2005
@@ -0,0 +1 @@
+default referer "Go Back"
Added: httpd/test/trunk/perl-framework/t/security/CVE-2005-3352.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CVE-2005-3352.t?rev=357160&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CVE-2005-3352.t (added)
+++ httpd/test/trunk/perl-framework/t/security/CVE-2005-3352.t Fri Dec 16 06:24:04 2005
@@ -0,0 +1,18 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+my $vars = Apache::Test::vars();
+
+plan tests => 2, need 'imagemap';
+
+my $url = "/security/CVE-2005-3352.map";
+
+my $r = GET $url, Referer => '">http://fish/';
+
+ok t_cmp($r->code, 200, "response code is OK");
+
+ok t_cmp($r->content, qr/\"/, "referer was escaped");
Author: jorton
Date: Fri Dec 16 03:53:32 2005
New Revision: 357153
URL: http://svn.apache.org/viewcvs?rev=357153&view=rev
Log:
- regression test for the chunk filter bug; requires a mod_bucketeer
change to not pass the brigade for every FLUSH bucket
Added:
httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/
httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html (with props)
httpd/test/trunk/perl-framework/t/http11/chunked2.t
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=357153&r1=357152&r2=357153&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Dec 16 03:53:32 2005
@@ -519,3 +519,9 @@
</Directory>
</VirtualHost>
+
+<IfModule mod_bucketeer.c>
+ <Directory @DocumentRoot@/apache/chunked>
+ SetOutputFilter BUCKETEER
+ </Directory>
+</IfModule>
Added: httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html?rev=357153&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html Fri Dec 16 03:53:32
2005
@@ -0,0 +1 @@
+aaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbb
\ No newline at end of file
Propchange: httpd/test/trunk/perl-framework/t/htdocs/apache/chunked/flush.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/http11/chunked2.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/http11/chunked2.t?rev=357153&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/http11/chunked2.t (added)
+++ httpd/test/trunk/perl-framework/t/http11/chunked2.t Fri Dec 16 03:53:32 2005
@@ -0,0 +1,18 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+plan tests => 2, need 'bucketeer';
+
+Apache::TestRequest::user_agent(keep_alive => 1);
+
+# Regression test for ap_http_chunk_filter bug.
+
+my $r = GET("/apache/chunked/flush.html");
+
+ok t_cmp($r->code, 200, "successful response");
+
+ok t_cmp($r->content, "aaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbb");
Author: jorton
Date: Tue Dec 13 08:49:43 2005
New Revision: 356537
URL: http://svn.apache.org/viewcvs?rev=356537&view=rev
Log:
- set encoding="none" since " characters now get escaped
Modified:
httpd/test/trunk/perl-framework/t/htdocs/modules/include/bucketeer/y10.shtml
Modified: httpd/test/trunk/perl-framework/t/htdocs/modules/include/bucketeer/y10.shtml
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/modules/include/bucketeer/y10.shtml?rev=356537&r1=356536&r2=356537&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/include/bucketeer/y10.shtml (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/include/bucketeer/y10.shtml Tue Dec 13
08:49:43 2005
@@ -1 +1 @@
-<!--#set var="pass" value="\"pass\"" --><!--#echo var="pass"-->
+<!--#set var="pass" value="\"pass\"" --><!--#echo encoding="none" var="pass"-->
Author: jorton
Date: Wed Nov 23 06:15:22 2005
New Revision: 348445
URL: http://svn.apache.org/viewcvs?rev=348445&view=rev
Log:
- check response status to make failure due to non-2xx
response obvious
Modified:
httpd/test/trunk/perl-framework/t/ssl/env.t
Modified: httpd/test/trunk/perl-framework/t/ssl/env.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/env.t?rev=348445&r1=348444&r2=348445&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/env.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/env.t Wed Nov 23 06:15:22 2005
@@ -1,6 +1,7 @@
use strict;
use warnings FATAL => 'all';
use Apache::Test;
+use Apache::TestUtil;
use Apache::TestRequest;
use Apache::TestConfig ();
use Apache::TestSSLCA ();
@@ -19,19 +20,27 @@
my $url = '/ssl-cgi/env.pl';
-my $tests = (keys(%$server_expect) + keys(%$client_expect)) * 2;
+my $tests = (keys(%$server_expect) + keys(%$client_expect) + 1) * 2;
plan tests => $tests, need need_cgi, need_lwp;
Apache::TestRequest::scheme('https');
-my $env = getenv(GET_STR($url));
+my $r = GET($url);
+
+ok t_cmp($r->code, 200, "response status OK");
+
+my $env = getenv($r->as_string);
verify($env, $server_expect);
verify($env, $client_expect, 1);
$url = '/require-ssl-cgi/env.pl';
-$env = getenv(GET_STR($url, cert => $cert));
+$r = GET($url, cert => $cert);
+
+ok t_cmp($r->code, 200, "second response status OK");
+
+$env = getenv($r->as_string);
verify($env, $server_expect);
verify($env, $client_expect);
Author: jorton
Date: Tue Nov 8 07:37:53 2005
New Revision: 331833
URL: http://svn.apache.org/viewcvs?rev=331833&view=rev
Log:
- use new-style superglobals rather than old-style, since old-style
are off in the upstream recommended default php.ini
Modified:
httpd/test/trunk/perl-framework/t/htdocs/php/arg.php
httpd/test/trunk/perl-framework/t/htdocs/php/func5.php
httpd/test/trunk/perl-framework/t/htdocs/php/var1.php
httpd/test/trunk/perl-framework/t/htdocs/php/var2.php
httpd/test/trunk/perl-framework/t/htdocs/php/var3.php
Modified: httpd/test/trunk/perl-framework/t/htdocs/php/arg.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/arg.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/arg.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/arg.php Tue Nov 8 07:37:53 2005
@@ -1,5 +1,5 @@
<?php
- for($i=0;$i<$HTTP_SERVER_VARS["argc"];$i++) {
- echo "$i: ".$HTTP_SERVER_VARS["argv"][$i]."\n";
+ for($i=0;$i<$_SERVER["argc"];$i++) {
+ echo "$i: ".$_SERVER["argv"][$i]."\n";
}
?>
Modified: httpd/test/trunk/perl-framework/t/htdocs/php/func5.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/func5.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/func5.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/func5.php Tue Nov 8 07:37:53 2005
@@ -1,6 +1,6 @@
<?php
-$file = $HTTP_SERVER_VARS["argv"][0];
+$file = $_SERVER["argv"][0];
function foo()
{
Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var1.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var1.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var1.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var1.php Tue Nov 8 07:37:53 2005
@@ -1,10 +1,10 @@
<?php
- switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+ switch ($_SERVER["REQUEST_METHOD"]) {
case "GET":
- echo $HTTP_GET_VARS["variable"];
+ echo $_GET["variable"];
break;
case "POST":
- echo $HTTP_POST_VARS["variable"];
+ echo $_POST["variable"];
break;
default:
echo "ERROR!";
Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var2.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var2.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var2.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var2.php Tue Nov 8 07:37:53 2005
@@ -1,12 +1,12 @@
<?php
- switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+ switch ($_SERVER["REQUEST_METHOD"]) {
case "GET":
- echo join(" ", array($HTTP_GET_VARS["v1"],
- $HTTP_GET_VARS["v2"]));
+ echo join(" ", array($_GET["v1"],
+ $_GET["v2"]));
break;
case "POST":
- echo join(" ", array($HTTP_POST_VARS["v1"],
- $HTTP_POST_VARS["v2"]));
+ echo join(" ", array($_POST["v1"],
+ $_POST["v2"]));
break;
default:
echo "ERROR!";
Modified: httpd/test/trunk/perl-framework/t/htdocs/php/var3.php
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/php/var3.php?rev=331833&r1=331832&r2=331833&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/php/var3.php (original)
+++ httpd/test/trunk/perl-framework/t/htdocs/php/var3.php Tue Nov 8 07:37:53 2005
@@ -1,14 +1,14 @@
<?php
- switch ($HTTP_SERVER_VARS["REQUEST_METHOD"]) {
+ switch ($_SERVER["REQUEST_METHOD"]) {
case "GET":
- echo join(" ", array($HTTP_GET_VARS["v1"],
- $HTTP_GET_VARS["v2"],
- $HTTP_GET_VARS["v3"]));
+ echo join(" ", array($_GET["v1"],
+ $_GET["v2"],
+ $_GET["v3"]));
break;
case "POST":
- echo join(" ", array($HTTP_POST_VARS["v1"],
- $HTTP_POST_VARS["v2"],
- $HTTP_POST_VARS["v3"]));
+ echo join(" ", array($_POST["v1"],
+ $_POST["v2"],
+ $_POST["v3"]));
break;
default:
echo "ERROR!";
Author: stas
Date: Wed Nov 2 12:44:13 2005
New Revision: 330356
URL: http://svn.apache.org/viewcvs?rev=330356&view=rev
Log:
tests requiring LWP when LWP is not available are now skipped
Modified:
httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t
httpd/test/trunk/perl-framework/t/apache/post.t
httpd/test/trunk/perl-framework/t/modules/alias.t
httpd/test/trunk/perl-framework/t/modules/include.t
httpd/test/trunk/perl-framework/t/modules/vhost_alias.t
httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t
httpd/test/trunk/perl-framework/t/ssl/basicauth.t
httpd/test/trunk/perl-framework/t/ssl/env.t
httpd/test/trunk/perl-framework/t/ssl/headers.t
httpd/test/trunk/perl-framework/t/ssl/http.t
httpd/test/trunk/perl-framework/t/ssl/proxy.t
httpd/test/trunk/perl-framework/t/ssl/require.t
httpd/test/trunk/perl-framework/t/ssl/v2.t
httpd/test/trunk/perl-framework/t/ssl/varlookup.t
httpd/test/trunk/perl-framework/t/ssl/verify.t
Modified: httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t (original)
+++ httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t Wed Nov 2 12:44:13 2005
@@ -23,7 +23,7 @@
push @files, "/test.sh" if ($havecgi);
my $numtests = ((scalar keys %tests) * (scalar @files) * 4);
-plan tests => $numtests, sub { need_apache(2) && need_module('include') };
+plan tests => $numtests, need need_apache(2), need_module('include'), need_lwp;
my $loc = "/apache/acceptpathinfo";
Modified: httpd/test/trunk/perl-framework/t/apache/post.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/post.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/post.t (original)
+++ httpd/test/trunk/perl-framework/t/apache/post.t Wed Nov 2 12:44:13 2005
@@ -7,6 +7,6 @@
my $module = 'eat_post';
my $num = Apache::TestCommon::run_post_test_sizes();
-plan tests => $num, [$module];
+plan tests => $num, need need_lwp, need_module($module);
Apache::TestCommon::run_post_test($module);
Modified: httpd/test/trunk/perl-framework/t/modules/alias.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/alias.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/alias.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/alias.t Wed Nov 2 12:44:13 2005
@@ -40,7 +40,7 @@
(keys %rm_rc) * 10 + 12 + $script_tests;
#LWP required to follow redirects
-plan tests => $tests, [qw(alias LWP)];
+plan tests => $tests, need need_module('alias'), need_lwp;
## simple alias ##
t_debug "verifying simple aliases";
Modified: httpd/test/trunk/perl-framework/t/modules/include.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/include.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/include.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/include.t Wed Nov 2 12:44:13 2005
@@ -213,7 +213,7 @@
plan tests => (scalar keys %tests) + @patterns + 32,
todo => \@todo,
- have_module 'include';
+ need need_lwp, need_module 'include';
foreach $doc (sort keys %tests) {
# do as much from %test as we can
Modified: httpd/test/trunk/perl-framework/t/modules/vhost_alias.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/vhost_alias.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/vhost_alias.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/vhost_alias.t Wed Nov 2 12:44:13 2005
@@ -14,7 +14,7 @@
my @vh = qw(www.vha-test.com big.server.name.from.heck.org ab.com w-t-f.net);
-plan tests => @vh * 2, sub { need_module('vhost_alias') && need_cgi() };
+plan tests => @vh * 2, need need_module('vhost_alias'), need_cgi, need_lwp;
Apache::TestRequest::scheme('http'); #ssl not listening on this vhost
Apache::TestRequest::module('mod_vhost_alias'); #use this module's port
Modified: httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t (original)
+++ httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t Wed Nov 2 12:44:13 2005
@@ -7,7 +7,8 @@
my $vars = Apache::Test::vars();
-plan tests => 2, [$vars->{ssl_module_name}, qw(LWP::Protocol::https)];
+plan tests => 2, need $vars->{ssl_module_name}, need_lwp,
+ qw(LWP::Protocol::https);
Apache::TestRequest::user_agent_keepalive(0);
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/basicauth.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/basicauth.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/basicauth.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/basicauth.t Wed Nov 2 12:44:13 2005
@@ -13,7 +13,7 @@
my $url = '/ssl-fakebasicauth/index.html';
-plan tests => 3, \&need_auth;
+plan tests => 3, need need_auth, need_lwp;
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/env.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/env.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/env.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/env.t Wed Nov 2 12:44:13 2005
@@ -20,7 +20,7 @@
my $url = '/ssl-cgi/env.pl';
my $tests = (keys(%$server_expect) + keys(%$client_expect)) * 2;
-plan tests => $tests, \&need_cgi;
+plan tests => $tests, need need_cgi, need_lwp;
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/headers.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/headers.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/headers.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/headers.t Wed Nov 2 12:44:13 2005
@@ -7,7 +7,7 @@
my $tests = 3;
-plan tests => $tests, need_module('headers', 'ssl');
+plan tests => $tests, need need_lwp, need_module('headers', 'ssl');
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/http.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/http.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/http.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/http.t Wed Nov 2 12:44:13 2005
@@ -22,7 +22,7 @@
@todo = (todo => [2]);
}
-plan tests => 2, @todo;
+plan tests => 2, @todo, need_lwp;
my $config = Apache::Test::config();
my $ssl_module = $config->{vars}->{ssl_module_name};
Modified: httpd/test/trunk/perl-framework/t/ssl/proxy.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/proxy.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/proxy.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/proxy.t Wed Nov 2 12:44:13 2005
@@ -31,7 +31,7 @@
}
plan tests => (8 + $post_tests) * $num_modules - 5 * $num_http_backends,
- [qw(mod_proxy proxy_http.c)];
+ need need_lwp, [qw(mod_proxy proxy_http.c)];
for my $module (sort keys %frontend) {
Modified: httpd/test/trunk/perl-framework/t/ssl/require.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/require.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/require.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/require.t Wed Nov 2 12:44:13 2005
@@ -10,7 +10,7 @@
#happen in real-life, so just disable keepalives here.
Apache::TestRequest::user_agent_keepalive(0);
-plan tests => 5;
+plan tests => 5, need_lwp;
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/v2.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/v2.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/v2.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/v2.t Wed Nov 2 12:44:13 2005
@@ -8,7 +8,7 @@
use Apache::Test;
use Apache::TestRequest;
-plan tests => 1;
+plan tests => 1, need_lwp;
Apache::TestRequest::scheme('https');
Modified: httpd/test/trunk/perl-framework/t/ssl/varlookup.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/varlookup.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/varlookup.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/varlookup.t Wed Nov 2 12:44:13 2005
@@ -6,6 +6,11 @@
use Apache::TestUtil;
use Apache::TestSSLCA qw(dn dn_oneline);
+unless (have_lwp) {
+ # bail out early, since the parser below relies on $LWP::VERSION
+ plan tests => 0, need_lwp;
+}
+
use Time::localtime;
my $config = Apache::Test::config();
@@ -66,7 +71,7 @@
push @vars, $key;
}
-plan tests => scalar @vars, need_module 'test_ssl';
+plan tests => scalar (@vars), need need_lwp, need_module('test_ssl');
for my $key (@vars) {
sok { verify($key); };
Modified: httpd/test/trunk/perl-framework/t/ssl/verify.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/verify.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/verify.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/verify.t Wed Nov 2 12:44:13 2005
@@ -13,7 +13,7 @@
my $url = '/verify/index.html';
-plan tests => 3;
+plan tests => 3, need_lwp;
Apache::TestRequest::scheme('https');
Author: nd
Date: Sun Oct 30 02:08:56 2005
New Revision: 329547
URL: http://svn.apache.org/viewcvs?rev=329547&view=rev
Log:
fix svn:eol-style
Modified:
httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t (props changed)
Propchange: httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Wed Oct 26 05:19:20 2005
New Revision: 328638
URL: http://svn.apache.org/viewcvs?rev=328638&view=rev
Log:
- rename all s/CAN/CVE/ so these sort in historical order
Added:
httpd/test/trunk/perl-framework/t/security/CVE-2004-0747.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0747.t
httpd/test/trunk/perl-framework/t/security/CVE-2004-0811.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0811.t
httpd/test/trunk/perl-framework/t/security/CVE-2004-0940.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0940.t
httpd/test/trunk/perl-framework/t/security/CVE-2004-0942.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0942.t
httpd/test/trunk/perl-framework/t/security/CVE-2004-0958.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0958.t
httpd/test/trunk/perl-framework/t/security/CVE-2004-0959.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2004-0959.t
httpd/test/trunk/perl-framework/t/security/CVE-2005-2491.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t
- copied unchanged from r328629, httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t
Removed:
httpd/test/trunk/perl-framework/t/security/CAN-2004-0747.t
httpd/test/trunk/perl-framework/t/security/CAN-2004-0811.t
httpd/test/trunk/perl-framework/t/security/CAN-2004-0940.t
httpd/test/trunk/perl-framework/t/security/CAN-2004-0942.t
httpd/test/trunk/perl-framework/t/security/CAN-2004-0958.t
httpd/test/trunk/perl-framework/t/security/CAN-2004-0959.t
httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t
Author: jorton
Date: Wed Oct 26 04:46:33 2005
New Revision: 328632
URL: http://svn.apache.org/viewcvs?rev=328632&view=rev
Log:
- add André's test case for the old regex overflow issue
Added:
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess (with props)
httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t
Added: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess?rev=328632&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess Wed Oct 26 04:46:33
2005
@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteRule ((((((((((((((((((((((.*)))))))))))))))))))))) -
+
Propchange: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2003-0542/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t?rev=328632&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t (added)
+++ httpd/test/trunk/perl-framework/t/security/CVE-2003-0542.t Wed Oct 26 04:46:33 2005
@@ -0,0 +1,15 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+plan tests => 1, need 'rewrite';
+
+my $rc;
+
+$rc = GET_RC "/security/CAN-2003-0542/nonesuch";
+
+ok t_cmp($rc, 404, "CAN-2003-0542 test case");
+
Author: jorton
Date: Mon Oct 10 08:25:20 2005
New Revision: 312665
URL: http://svn.apache.org/viewcvs?rev=312665&view=rev
Log:
- work around MMN snafu
Modified:
httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c
Modified: httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c?rev=312665&r1=312664&r2=312665&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c Mon Oct 10 08:25:20
2005
@@ -29,7 +29,8 @@
#include "mod_ssl.h"
-#if AP_MODULE_MAGIC_AT_LEAST(20050919, 0) /* ssl_ext_list() implementation added */
+#if MODULE_MAGIC_COOKIE == 0x41503234UL \
+ && AP_MODULE_MAGIC_AT_LEAST(20050919, 0) /* ssl_ext_list() only in 2.4.x */
#define HAVE_SSL_EXT_LIST
static APR_OPTIONAL_FN_TYPE(ssl_ext_list) *ext_list;
#elif AP_MODULE_MAGIC_AT_LEAST(20050127, 0) /* approx. when ssl_ext_lookup was added */
Author: colm
Date: Thu Sep 29 05:22:06 2005
New Revision: 292424
URL: http://svn.apache.org/viewcvs?rev=292424&view=rev
Log:
The mod_cache + mod_dir fixes are now in th 2.2.x branch, run the cache.t test
>= 2.1.9
Modified:
httpd/test/trunk/perl-framework/t/modules/cache.t
Modified: httpd/test/trunk/perl-framework/t/modules/cache.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/cache.t?rev=292424&r1=292423&r2=292424&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/cache.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/cache.t Thu Sep 29 05:22:06 2005
@@ -6,7 +6,7 @@
use Apache::TestUtil;
use Apache::TestConfig ();
-plan tests => 3, need 'cache', 'disk_cache', need_min_apache_version('2.3.0');
+plan tests => 3, need 'cache', 'disk_cache', need_min_apache_version('2.1.9');
Apache::TestRequest::module('mod_cache');
Author: colm
Date: Tue Sep 27 03:59:48 2005
New Revision: 291903
URL: http://svn.apache.org/viewcvs?rev=291903&view=rev
Log:
Add the support htdocs heirarchy neccessary for the cache tests
Added:
httpd/test/trunk/perl-framework/t/htdocs/modules/cache/
httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/
httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html (with props)
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html?rev=291903&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html Tue Sep 27 03:59:48
2005
@@ -0,0 +1 @@
+hello world
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/cache/cache/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Author: colm
Date: Tue Sep 27 03:55:56 2005
New Revision: 291899
URL: http://svn.apache.org/viewcvs?rev=291899&view=rev
Log:
Add a a test for mod_cache and mod_dir brokenness.
Added:
httpd/test/trunk/perl-framework/t/conf/cache.conf.in (with props)
httpd/test/trunk/perl-framework/t/modules/cache.t (with props)
Added: httpd/test/trunk/perl-framework/t/conf/cache.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/cache.conf.in?rev=291899&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/cache.conf.in (added)
+++ httpd/test/trunk/perl-framework/t/conf/cache.conf.in Tue Sep 27 03:55:56 2005
@@ -0,0 +1,17 @@
+#
+# Config for mod_cache tests
+#
+
+<IfModule mod_cache.c>
+ <IfModule mod_disk_cache.c>
+
+ <VirtualHost mod_cache>
+ CacheEnable disk /cache/
+ CacheRoot @SERVERROOT@/conf/cacheroot/
+ CacheDirLevels 1
+ CacheDirLength 1
+
+ DocumentRoot @SERVERROOT@/htdocs/modules/cache
+ </VirtualHost>
+ </IfModule>
+</IfModule>
Propchange: httpd/test/trunk/perl-framework/t/conf/cache.conf.in
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/modules/cache.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/cache.t?rev=291899&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/cache.t (added)
+++ httpd/test/trunk/perl-framework/t/modules/cache.t Tue Sep 27 03:55:56 2005
@@ -0,0 +1,22 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+use Apache::TestConfig ();
+
+plan tests => 3, need 'cache', 'disk_cache', need_min_apache_version('2.3.0');
+
+Apache::TestRequest::module('mod_cache');
+
+t_mkdir(Apache::Test::vars('serverroot') . '/conf/cacheroot/');
+
+my $r = GET("/cache/");
+ok t_cmp($r->code, 200, "non-cached call to index.html");
+
+$r = GET("/cache/index.html");
+ok t_cmp($r->code, 200, "call to cache index.html");
+
+$r = GET("/cache/");
+ok t_cmp($r->code, 200, "cached call to index.html");
Propchange: httpd/test/trunk/perl-framework/t/modules/cache.t
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Mon Sep 26 05:11:36 2005
New Revision: 291603
URL: http://svn.apache.org/viewcvs?rev=291603&view=rev
Log:
Ignore Makefile.old too.
Modified:
httpd/test/trunk/perl-framework/ (props changed)
Propchange: httpd/test/trunk/perl-framework/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 26 05:11:36 2005
@@ -2,3 +2,4 @@
Makefile
blib
lib
+Makefile.old
Author: jorton
Date: Sun Sep 25 13:24:59 2005
New Revision: 291473
URL: http://svn.apache.org/viewcvs?rev=291473&view=rev
Log:
- add regression test for PR 35292
Added:
httpd/test/trunk/perl-framework/t/apache/pr35292.t (with props)
Added: httpd/test/trunk/perl-framework/t/apache/pr35292.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/pr35292.t?rev=291473&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/pr35292.t (added)
+++ httpd/test/trunk/perl-framework/t/apache/pr35292.t Sun Sep 25 13:24:59 2005
@@ -0,0 +1,33 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+$SIG{PIPE} = 'IGNORE';
+
+plan tests => 3, need_min_apache_version('2.1.8');
+
+my $sock = Apache::TestRequest::vhost_socket('default');
+ok $sock;
+
+Apache::TestRequest::socket_trace($sock);
+
+$sock->print("POST /apache/limits/ HTTP/1.1\r\n");
+$sock->print("Host: localhost\r\n");
+$sock->print("Content-Length: 1048576\r\n");
+$sock->print("\r\n");
+
+foreach (1..128) {
+ $sock->print('x'x8192) if $sock->connected;
+}
+
+# Before the PR 35292 fix, the socket would already have been reset by
+# this point and most clients will have stopped sending and gone away.
+
+ok $sock->connected;
+
+my $line = Apache::TestRequest::getline($sock) || '';
+
+ok t_cmp($line, qr{^HTTP/1\.. 413}, "read response-line");
Propchange: httpd/test/trunk/perl-framework/t/apache/pr35292.t
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Sun Sep 25 08:23:45 2005
New Revision: 291427
URL: http://svn.apache.org/viewcvs?rev=291427&view=rev
Log:
- enable test for >=2.1.8
Modified:
httpd/test/trunk/perl-framework/t/ssl/pr12355.t
Modified: httpd/test/trunk/perl-framework/t/ssl/pr12355.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/pr12355.t?rev=291427&r1=291426&r2=291427&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/pr12355.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/pr12355.t Sun Sep 25 08:23:45 2005
@@ -5,7 +5,7 @@
use Apache::TestRequest;
use Apache::TestUtil;
-plan tests => 10, need 'ssl', need_min_apache_version('2.3.0');
+plan tests => 10, need 'ssl', need_min_apache_version('2.1.8');
Apache::TestRequest::user_agent_keepalive(1);
Apache::TestRequest::scheme('https');
Author: nd
Date: Sat Sep 24 03:40:05 2005
New Revision: 291274
URL: http://svn.apache.org/viewcvs?rev=291274&view=rev
Log:
fix eol-style properties
Modified:
httpd/test/trunk/perl-framework/t/apache/pr35330.t (props changed)
httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t (props changed)
httpd/test/trunk/perl-framework/t/ssl/pr12355.t (props changed)
Propchange: httpd/test/trunk/perl-framework/t/apache/pr35330.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/trunk/perl-framework/t/ssl/pr12355.t
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Fri Sep 23 06:39:38 2005
New Revision: 291116
URL: http://svn.apache.org/viewcvs?rev=291116&view=rev
Log:
- add regression test for PR 35330.
Added:
httpd/test/trunk/perl-framework/t/apache/pr35330.t
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess (with props)
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml (with
props)
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
Added: httpd/test/trunk/perl-framework/t/apache/pr35330.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/pr35330.t?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/pr35330.t (added)
+++ httpd/test/trunk/perl-framework/t/apache/pr35330.t Fri Sep 23 06:39:38 2005
@@ -0,0 +1,16 @@
+#
+# Regression test for PR 35330
+#
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+
+plan tests => 2, need 'include';
+
+my $r = GET '/apache/htaccess/override/hello.shtml';
+
+ok t_cmp($r->code, 200, "SSI was allowed for location");
+ok t_cmp($r->content, "hello", "file was served with correct content");
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=291116&r1=291115&r2=291116&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Sep 23 06:39:38 2005
@@ -8,6 +8,14 @@
</Directory>
##
+## Options override test config
+##
+<Directory @SERVERROOT@/htdocs/apache/htaccess/override>
+ AllowOverride All
+ Options -Includes
+</Directory>
+
+##
## AcceptPathInfo test config
##
<IfDefine APACHE2>
Added: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess Fri Sep 23
06:39:38 2005
@@ -0,0 +1 @@
+Options +Includes
Propchange: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml Fri Sep
23 06:39:38 2005
@@ -0,0 +1 @@
+hello
\ No newline at end of file
Propchange: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Thu Sep 22 08:38:56 2005
New Revision: 290966
URL: http://svn.apache.org/viewcvs?rev=290966&view=rev
Log:
Add test case for PR 12355.
Added:
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/viewcvs/httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in?rev=290966&r1=290965&r2=290966&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 Thu Sep 22 08:38:56 2005
@@ -82,6 +82,9 @@
Alias /ssl-cgi @DocumentRoot@/modules/cgi
Alias /require-ssl-cgi @DocumentRoot@/modules/cgi
+ Alias /require-md5-cgi @DocumentRoot@/modules/cgi
+ Alias /require-sha-cgi @DocumentRoot@/modules/cgi
+
<Location /require/asf>
SSLVerifyClient require
SSLVerifyDepth 10
@@ -108,6 +111,14 @@
SSLOptions +StdEnvVars
SSLVerifyClient require
SSLVerifyDepth 10
+ </Location>
+
+ <Location /require-sha-cgi>
+ SSLCipherSuite RC4-SHA
+ </Location>
+
+ <Location /require-md5-cgi>
+ SSLCipherSuite RC4-MD5
</Location>
<IfModule @AUTH_MODULE@>
Added: httpd/test/trunk/perl-framework/t/ssl/pr12355.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/pr12355.t?rev=290966&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/pr12355.t (added)
+++ httpd/test/trunk/perl-framework/t/ssl/pr12355.t Thu Sep 22 08:38:56 2005
@@ -0,0 +1,54 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+
+plan tests => 10, need 'ssl', need_min_apache_version('2.3.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.
+
+$r = POST "/require-sha-cgi/perl_echo.pl", 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-md5-cgi/perl_echo.pl", 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);
+}
+
Author: jorton
Date: Wed Sep 21 03:28:59 2005
New Revision: 290676
URL: http://svn.apache.org/viewcvs?rev=290676&view=rev
Log:
- fix skip message since the test is enabled for >= 2.0.55
Modified:
httpd/test/trunk/perl-framework/t/modules/proxy.t
Modified: httpd/test/trunk/perl-framework/t/modules/proxy.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy.t?rev=290676&r1=290675&r2=290676&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/proxy.t Wed Sep 21 03:28:59 2005
@@ -43,7 +43,7 @@
$r = GET("/reverse/nonesuch/file%25");
ok t_cmp($r->code, 404, "reverse proxy URI decoding issue, PR 15207");
} else {
- skip "skipping PR 15207 test with httpd < 2.1.0";
+ skip "skipping PR 15207 test with httpd < 2.0.55";
}
$r = GET("/reverse/notproxy/local.html");
Author: jorton
Date: Tue Sep 20 10:26:05 2005
New Revision: 290490
URL: http://svn.apache.org/viewcvs?rev=290490&view=rev
Log:
- fix more format string warnings
Modified:
httpd/test/trunk/perl-framework/c-modules/random_chunk/mod_random_chunk.c
Modified: httpd/test/trunk/perl-framework/c-modules/random_chunk/mod_random_chunk.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/random_chunk/mod_random_chunk.c?rev=290490&r1=290489&r2=290490&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/random_chunk/mod_random_chunk.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/random_chunk/mod_random_chunk.c Tue Sep 20 10:26:05
2005
@@ -171,9 +171,10 @@
}
}
- ap_rprintf(r, "__END__:%d", total);
+ ap_rprintf(r, "__END__:%" APR_SIZE_T_FMT, total);
- fprintf(stderr, "[mod_random_chunk] sent %d bytes\n", total);
+ fprintf(stderr, "[mod_random_chunk] sent %" APR_SIZE_T_FMT "bytes\n",
+ total);
return 0;
}
Author: jorton
Date: Mon Sep 19 06:52:57 2005
New Revision: 290160
URL: http://svn.apache.org/viewcvs?rev=290160&view=rev
Log:
- fix mismatched format string warnings throughout
Modified:
httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c
httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c
httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c
httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c
Modified: httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/echo_post/mod_echo_post.c Mon Sep 19 06:52:57
2005
@@ -42,22 +42,23 @@
#endif
if (r->args) {
- ap_rprintf(r, "%ld:", r->remaining);
+ ap_rprintf(r, "%" APR_OFF_T_FMT ":", r->remaining);
}
- fprintf(stderr, "[mod_echo_post] going to echo %ld bytes\n",
+ fprintf(stderr, "[mod_echo_post] going to echo %" APR_OFF_T_FMT " bytes\n",
r->remaining);
while ((nrd = ap_get_client_block(r, buff, sizeof(buff))) > 0) {
fprintf(stderr,
- "[mod_echo_post] read %ld bytes (wanted %d, remaining=%ld)\n",
+ "[mod_echo_post] read %ld bytes (wanted %" APR_SIZE_T_FMT
+ ", remaining=%" APR_OFF_T_FMT ")\n",
nrd, sizeof(buff), r->remaining);
ap_rwrite(buff, nrd, r);
total += nrd;
}
fprintf(stderr,
- "[mod_echo_post] done reading %ld bytes, %ld bytes remain\n",
+ "[mod_echo_post] done reading %ld bytes, %" APR_OFF_T_FMT " bytes remain\n",
total, r->remaining);
return OK;
Modified: httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/echo_post_chunk/mod_echo_post_chunk.c Mon Sep
19 06:52:57 2005
@@ -39,15 +39,17 @@
}
if (r->args) {
- ap_rprintf(r, "%ld:", r->remaining);
+ ap_rprintf(r, "%" APR_OFF_T_FMT ":", r->remaining);
}
- fprintf(stderr, "[mod_echo_post_chunk] going to echo %ld bytes\n",
+ fprintf(stderr, "[mod_echo_post_chunk] going to echo "
+ "%" APR_OFF_T_FMT " bytes\n",
r->remaining);
while ((nrd = ap_get_client_block(r, buff, sizeof(buff))) > 0) {
fprintf(stderr,
- "[mod_echo_post_chunk] read %ld bytes (wanted %d, remaining=%ld)\n",
+ "[mod_echo_post_chunk] read %ld bytes "
+ "(wanted %" APR_SIZE_T_FMT ", remaining=%" APR_OFF_T_FMT ")\n",
nrd, sizeof(buff), r->remaining);
total += nrd;
}
@@ -74,7 +76,8 @@
ap_rputs(trailer_header, r);
fprintf(stderr,
- "[mod_echo_post_chunk] done reading %ld bytes, %ld bytes remain\n",
+ "[mod_echo_post_chunk] done reading %ld bytes, "
+ "%" APR_OFF_T_FMT " bytes remain\n",
total, r->remaining);
return OK;
Modified: httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_pass_brigade/mod_test_pass_brigade.c Mon
Sep 19 06:52:57 2005
@@ -39,7 +39,8 @@
httpd_test_split_qs_numbers(r, &buff_size, &remaining, NULL);
fprintf(stderr, "[mod_test_pass_brigade] "
- "going to echo %lu bytes with buffer size=%lu\n",
+ "going to echo %" APR_SIZE_T_FMT " bytes with "
+ "buffer size=%" APR_SIZE_T_FMT "\n",
remaining, buff_size);
buff = malloc(buff_size);
@@ -75,7 +76,8 @@
apr_brigade_destroy(bb);
fprintf(stderr,
- "[mod_test_pass_brigade] done writing %ld of %ld bytes\n",
+ "[mod_test_pass_brigade] done writing %" APR_SIZE_T_FMT
+ " of %" APR_SIZE_T_FMT " bytes\n",
total, remaining);
free(buff);
Modified: httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c?rev=290160&r1=290159&r2=290160&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_rwrite/mod_test_rwrite.c Mon Sep 19 06:52:57
2005
@@ -36,7 +36,7 @@
httpd_test_split_qs_numbers(r, &buff_size, &remaining, NULL);
- fprintf(stderr, "[mod_test_rwrite] going to echo %ld bytes\n",
+ fprintf(stderr, "[mod_test_rwrite] going to echo %" APR_SIZE_T_FMT " bytes\n",
remaining);
buff = malloc(buff_size);
@@ -53,7 +53,8 @@
}
fprintf(stderr,
- "[mod_test_rwrite] done writing %ld of %ld bytes\n",
+ "[mod_test_rwrite] done writing %" APR_SIZE_T_FMT
+ " of %" APR_SIZE_T_FMT " bytes\n",
total, remaining);
free(buff);
Author: jorton
Date: Mon Sep 19 06:42:03 2005
New Revision: 290157
URL: http://svn.apache.org/viewcvs?rev=290157&view=rev
Log:
- fix for trunk mod_ssl.
Modified:
httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c
Modified: httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c?rev=290157&r1=290156&r2=290157&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c (original)
+++ httpd/test/trunk/perl-framework/c-modules/test_ssl/mod_test_ssl.c Mon Sep 19 06:42:03
2005
@@ -29,7 +29,10 @@
#include "mod_ssl.h"
-#if AP_MODULE_MAGIC_AT_LEAST(20050127, 0) /* approx. when ssl_ext_lookup was added */
+#if AP_MODULE_MAGIC_AT_LEAST(20050919, 0) /* ssl_ext_list() implementation added */
+#define HAVE_SSL_EXT_LIST
+static APR_OPTIONAL_FN_TYPE(ssl_ext_list) *ext_list;
+#elif AP_MODULE_MAGIC_AT_LEAST(20050127, 0) /* approx. when ssl_ext_lookup was added */
#define HAVE_SSL_EXT_LOOKUP
static APR_OPTIONAL_FN_TYPE(ssl_ext_lookup) *ext_lookup;
#endif
@@ -52,9 +55,12 @@
#ifdef HAVE_SSL_EXT_LOOKUP
ext_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_ext_lookup);
#endif
+#ifdef HAVE_SSL_EXT_LIST
+ ext_list = APR_RETRIEVE_OPTIONAL_FN(ssl_ext_list);
+#endif
}
-#ifdef HAVE_SSL_EXT_LOOKUP
+#if defined(HAVE_SSL_EXT_LOOKUP) || defined(HAVE_SSL_EXT_LIST)
static int test_ssl_ext_lookup(request_rec *r)
{
const char *value;
@@ -69,12 +75,31 @@
return OK;
}
+#ifdef HAVE_SSL_EXT_LOOKUP
if (!ext_lookup) {
ap_rputs("ssl_ext_lookup not available", r);
return OK;
}
value = ext_lookup(r->pool, r->connection, 1, r->args);
+#else
+ if (!ext_list) {
+ ap_rputs("ssl_ext_list not available", r);
+ return OK;
+ }
+
+ {
+ apr_array_header_t *vals = ext_list(r->pool, r->connection, 1,
+ r->args);
+
+ if (vals) {
+ value = *(const char **)apr_array_pop(vals);
+ }
+ else {
+ value = NULL;
+ }
+ }
+#endif
if (!value) value = "NULL";
@@ -125,7 +150,7 @@
static void test_ssl_register_hooks(apr_pool_t *p)
{
ap_hook_handler(test_ssl_var_lookup, NULL, NULL, APR_HOOK_MIDDLE);
-#ifdef HAVE_SSL_EXT_LOOKUP
+#if defined(HAVE_SSL_EXT_LOOKUP) || defined(HAVE_SSL_EXT_LIST)
ap_hook_handler(test_ssl_ext_lookup, NULL, NULL, APR_HOOK_MIDDLE);
#endif
ap_hook_optional_fn_retrieve(import_ssl_var_lookup,
Author: jorton
Date: Tue Aug 30 08:41:09 2005
New Revision: 264798
URL: http://svn.apache.org/viewcvs?rev=264798&view=rev
Log:
Add test for new mod_ssl issue, CAN-2005-2700.
Added:
httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.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/viewcvs/httpd/test/trunk/perl-framework/t/conf/ssl/ssl.conf.in?rev=264798&r1=264797&r2=264798&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 Tue Aug 30 08:41:09 2005
@@ -1,4 +1,4 @@
-#test config derived from httpd-2.0/docs/conf/ssl-std.conf
+#test config derived from httpd-2.0/docs/conf/ssl-std.conf -*- text -*-
<IfModule @ssl_module@>
#base config that can be used by any SSL enabled VirtualHosts
@@ -138,4 +138,22 @@
</IfModule>
</VirtualHost>
+
+ # An SSL vhost which does optional ccert checks at vhost level, to
+ # check for CVE CAN-2005-2700.
+
+ <VirtualHost ssl_optional_cc>
+ SSLEngine on
+
+ SSLVerifyClient optional
+
+ Alias /require/any @DocumentRoot@
+ Alias /require/none @DocumentRoot@
+
+ <Location /require/any>
+ SSLVerifyClient require
+ SSLVerifyDepth 10
+ </Location>
+ </VirtualHost>
+
</IfModule>
Added: httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t?rev=264798&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t (added)
+++ httpd/test/trunk/perl-framework/t/security/CAN-2005-2700.t Tue Aug 30 08:41:09 2005
@@ -0,0 +1,24 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+my $vars = Apache::Test::vars();
+
+plan tests => 2, [$vars->{ssl_module_name}, qw(LWP::Protocol::https)];
+
+Apache::TestRequest::user_agent_keepalive(0);
+Apache::TestRequest::scheme('https');
+Apache::TestRequest::module('ssl_optional_cc');
+
+my $r;
+
+$r = GET "/require/none/";
+
+ok t_cmp($r->code, 200, "access permitted without ccert");
+
+$r = GET "/require/any/";
+
+ok !t_cmp($r->code, 200, "access *not* permitted without ccert");
Author: jorton
Date: Tue Aug 30 04:46:51 2005
New Revision: 264761
URL: http://svn.apache.org/viewcvs?rev=264761&view=rev
Log:
Trim double spaces in the expected strftime output too; otherwise
this test will fail spuriously on dates like "August 2".
Modified:
httpd/test/trunk/perl-framework/t/modules/include.t
Modified: httpd/test/trunk/perl-framework/t/modules/include.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/include.t?rev=264761&r1=264760&r2=264761&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/include.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/include.t Tue Aug 30 04:46:51 2005
@@ -319,6 +319,7 @@
# trim output
$result = single_space($result);
+ $expected = single_space($expected);
ok t_cmp("$result",
"$expected",
Author: nd
Date: Wed Aug 24 06:08:29 2005
New Revision: 239652
URL: http://svn.apache.org/viewcvs?rev=239652&view=rev
Log:
fix line endings
Modified:
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess (props
changed)
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess (props
changed)
httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t (props changed)
httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t (props changed)
Propchange: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Fri Aug 19 10:32:23 2005
New Revision: 233518
URL: http://svn.apache.org/viewcvs?rev=233518&view=rev
Log:
- require both proxy_http and proxy_balancer so this is skipped with 2.0.x
Modified:
httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t
Modified: httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t?rev=233518&r1=233517&r2=233518&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t Fri Aug 19 10:32:23 2005
@@ -6,7 +6,7 @@
use Apache::TestUtil;
use Apache::TestConfig ();
-plan tests => 1, need_module 'proxy';
+plan tests => 1, need 'proxy_balancer', 'proxy_http';
Apache::TestRequest::module("proxy_http_balancer");
Apache::TestRequest::user_agent(requests_redirectable => 0);
Author: jorton
Date: Fri Aug 19 10:28:12 2005
New Revision: 233517
URL: http://svn.apache.org/viewcvs?rev=233517&view=rev
Log:
- move balancer definitions into the same file to avoid ordering problems
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
httpd/test/trunk/perl-framework/t/conf/proxy.conf.in
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=233517&r1=233516&r2=233517&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Aug 19 10:28:12 2005
@@ -215,16 +215,6 @@
ProxyPassReverse /reverse/ http://@SERVERNAME@:@PORT@/
</VirtualHost>
</IfModule>
-
-<IfModule mod_proxy_balancer.c>
- <VirtualHost proxy_http_bal1>
- DocumentRoot @SERVERROOT@/htdocs
- </VirtualHost>
-
- <VirtualHost proxy_http_bal2>
- DocumentRoot @SERVERROOT@/htdocs
- </VirtualHost>
-</IfModule>
##
## @ACCESS_MODULE@ test config
Modified: httpd/test/trunk/perl-framework/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/proxy.conf.in?rev=233517&r1=233516&r2=233517&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/proxy.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/proxy.conf.in Fri Aug 19 10:28:12 2005
@@ -10,6 +10,14 @@
<IfModule mod_proxy_balancer.c>
+ <VirtualHost proxy_http_bal1>
+ DocumentRoot @SERVERROOT@/htdocs
+ </VirtualHost>
+
+ <VirtualHost proxy_http_bal2>
+ DocumentRoot @SERVERROOT@/htdocs
+ </VirtualHost>
+
<VirtualHost proxy_http_balancer>
<Proxy balancer://foo>
BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
Author: jim
Date: Fri Aug 19 10:22:48 2005
New Revision: 233515
URL: http://svn.apache.org/viewcvs?rev=233515&view=rev
Log:
Add in a simple test for balancer functionality...
Added:
httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
httpd/test/trunk/perl-framework/t/conf/proxy.conf.in
httpd/test/trunk/perl-framework/t/modules/proxy.t
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=233515&r1=233514&r2=233515&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Aug 19 10:22:48 2005
@@ -216,6 +216,16 @@
</VirtualHost>
</IfModule>
+<IfModule mod_proxy_balancer.c>
+ <VirtualHost proxy_http_bal1>
+ DocumentRoot @SERVERROOT@/htdocs
+ </VirtualHost>
+
+ <VirtualHost proxy_http_bal2>
+ DocumentRoot @SERVERROOT@/htdocs
+ </VirtualHost>
+</IfModule>
+
##
## @ACCESS_MODULE@ test config
##
Modified: httpd/test/trunk/perl-framework/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/proxy.conf.in?rev=233515&r1=233514&r2=233515&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/proxy.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/proxy.conf.in Fri Aug 19 10:22:48 2005
@@ -7,3 +7,20 @@
</VirtualHost>
</IfModule>
+
+<IfModule mod_proxy_balancer.c>
+
+ <VirtualHost proxy_http_balancer>
+ <Proxy balancer://foo>
+ BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL1_PORT@ loadfactor=1
+ BalancerMember http://@SERVERNAME@:@PROXY_HTTP_BAL2_PORT@ loadfactor=1
+ </Proxy>
+
+ ProxySet balancer://foo lbmethod=bytraffic
+
+ <Location /baltest>
+ ProxyPass balancer://foo/
+ </Location>
+
+ </VirtualHost>
+</IfModule>
Modified: httpd/test/trunk/perl-framework/t/modules/proxy.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy.t?rev=233515&r1=233514&r2=233515&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/proxy.t Fri Aug 19 10:22:48 2005
@@ -59,3 +59,4 @@
} else {
skip "skipping tests without mod_alias" foreach (1..2);
}
+
Added: httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t?rev=233515&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t (added)
+++ httpd/test/trunk/perl-framework/t/modules/proxy_balancer.t Fri Aug 19 10:22:48 2005
@@ -0,0 +1,16 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+use Apache::TestConfig ();
+
+plan tests => 1, need_module 'proxy';
+
+Apache::TestRequest::module("proxy_http_balancer");
+Apache::TestRequest::user_agent(requests_redirectable => 0);
+
+
+my $r = GET("/baltest/index.html");
+ok t_cmp($r->code, 200, "Balancer did not die");
Author: jorton
Date: Fri Aug 19 09:04:14 2005
New Revision: 233501
URL: http://svn.apache.org/viewcvs?rev=233501&view=rev
Log:
- require mod_rewrite.
Modified:
httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
Modified: httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t?rev=233501&r1=233500&r2=233501&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t (original)
+++ httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t Fri Aug 19 09:04:14 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest;
-plan tests => 2 * 2;
+plan tests => 2 * 2, need 'rewrite';
foreach my $dir ("one/", "two/") {
my $r = GET("/security/CAN-2005-2491/" . $dir);
Author: jorton
Date: Fri Aug 19 09:00:56 2005
New Revision: 233494
URL: http://svn.apache.org/viewcvs?rev=233494&view=rev
Log:
Add test case for CAN-2005-2491, PCRE integer overflow in
quantifier parsing.
Added:
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/
httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess
httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
Added: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess?rev=233494&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess Fri Aug
19 09:00:56 2005
@@ -0,0 +1 @@
+RewriteRule a{111111111111111111} /index.html
Added: httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess?rev=233494&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess Fri Aug
19 09:00:56 2005
@@ -0,0 +1 @@
+RewriteRule a{1,11111111111111111111} /index.html
Added: httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t?rev=233494&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t (added)
+++ httpd/test/trunk/perl-framework/t/security/CAN-2005-2491.t Fri Aug 19 09:00:56 2005
@@ -0,0 +1,21 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+plan tests => 2 * 2;
+
+foreach my $dir ("one/", "two/") {
+ my $r = GET("/security/CAN-2005-2491/" . $dir);
+
+ # LWP will generate the annoying fake-500 response if the server
+ # segfaults before generating its own 500 response; check
+ # the response message explicitly to rule that out.
+
+ ok t_cmp($r->message, 'Internal Server Error',
+ 'check that server did not segfault');
+
+ ok t_cmp($r->code, 500, "check for 500 response error");
+}
Author: jorton
Date: Mon Aug 15 08:41:58 2005
New Revision: 232827
URL: http://svn.apache.org/viewcvs?rev=232827&view=rev
Log:
Ignore generated files whilst debugger is running.
Modified:
httpd/test/trunk/perl-framework/t/ (props changed)
Propchange: httpd/test/trunk/perl-framework/t/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 15 08:41:58 2005
@@ -3,3 +3,5 @@
REPORT
logs
SKIP
+.gdb-test-start
+.debugging
Author: jorton
Date: Fri Aug 5 06:59:25 2005
New Revision: 230473
URL: http://svn.apache.org/viewcvs?rev=230473&view=rev
Log:
Run revproxy escaping test against 2.0.55 and later.
Modified:
httpd/test/trunk/perl-framework/t/modules/proxy.t
Modified: httpd/test/trunk/perl-framework/t/modules/proxy.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/proxy.t?rev=230473&r1=230472&r2=230473&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/proxy.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/proxy.t Fri Aug 5 06:59:25 2005
@@ -35,7 +35,7 @@
skip "skipping tests without CGI module" foreach (1..6);
}
-if (have_min_apache_version('2.1.0')) {
+if (have_min_apache_version('2.0.55')) {
# trigger the "proxy decodes abs_path issue": with the bug present, the
# proxy URI-decodes on the way through, so the origin server receives
# an abs_path of "/reverse/nonesuch/file%", which it fails to parse and
Author: nd
Date: Tue May 31 10:51:24 2005
New Revision: 179244
URL: http://svn.apache.org/viewcvs?rev=179244&view=rev
Log:
fix line endings
Modified:
httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml (props changed)
Propchange: httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml
------------------------------------------------------------------------------
svn:eol-style = native
Author: jorton
Date: Tue May 31 06:33:38 2005
New Revision: 179213
URL: http://svn.apache.org/viewcvs?rev=179213&view=rev
Log:
Add regression test for mod_include QUERY_STRING corruption issue
based on test case provided by Deomid Ryabkov, PR 12655.
Added:
httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml
Modified:
httpd/test/trunk/perl-framework/t/modules/include.t
Added: httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml?rev=179213&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/modules/include/virtualq.shtml Tue May 31 06:33:38
2005
@@ -0,0 +1,4 @@
+<!--#echo var="QUERY_STRING" -->
+<!--#include virtual="if1.shtml?$QUERY_STRING" -->
+<!--#include virtual="inc-two.shtml" -->
+<!--#echo var="QUERY_STRING" -->
Modified: httpd/test/trunk/perl-framework/t/modules/include.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/include.t?rev=179213&r1=179212&r2=179213&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/include.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/include.t Tue May 31 06:33:38 2005
@@ -92,6 +92,7 @@
"exec/on/cgi.shtml" => "perl cgi",
"ranged-virtual.shtml" => "x"x32768,
"var128.shtml" => "x"x126 . "yz", # PR#32985
+"virtualq.shtml?foo=bar" => "foo=bar pass inc-two.shtml body foo=bar", # PR#12655
);
# now, assuming 2.1 has the proper behavior across the board,
Author: jorton
Date: Tue Apr 12 00:54:56 2005
New Revision: 161033
URL: http://svn.apache.org/viewcvs?view=rev&rev=161033
Log:
Fix a skip message.
Modified:
httpd/test/trunk/perl-framework/t/modules/deflate.t
Modified: httpd/test/trunk/perl-framework/t/modules/deflate.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/deflate.t?view=diff&r1=161032&r2=161033
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/deflate.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/deflate.t Tue Apr 12 00:54:56 2005
@@ -66,5 +66,5 @@
my $ret = $sock->read($response, 1024);
ok t_cmp($ret, 0, "expect EOF after 304 header");
} else {
- skip "skipping 304/deflate tests without mod_cgi" foreach (1..$cgi_tests);
+ skip "skipping 304/deflate tests without mod_cgi and httpd >= 2.1.0" foreach (1..$cgi_tests);
}
Author: geoff
Date: Wed Mar 30 11:32:43 2005
New Revision: 159516
URL: http://svn.apache.org/viewcvs?view=rev&rev=159516
Log:
delete bogus tag. ugh.
Removed:
httpd/test/tags/post_apache2_rename/