httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1004992 - /httpd/test/framework/trunk/t/modules/expires.t
Date Wed, 06 Oct 2010 11:53:15 GMT
Author: rjung
Date: Wed Oct  6 11:53:15 2010
New Revision: 1004992

URL: http://svn.apache.org/viewvc?rev=1004992&view=rev
Log:
Revert r1002205 since the underlying bug has been
fixed in 2.0 head by r1004974. We now want to
test for it even in 2.0:

mod_expires: Expires time shouldn't be in the past.

Modified:
    httpd/test/framework/trunk/t/modules/expires.t

Modified: httpd/test/framework/trunk/t/modules/expires.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/expires.t?rev=1004992&r1=1004991&r2=1004992&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/expires.t (original)
+++ httpd/test/framework/trunk/t/modules/expires.t Wed Oct  6 11:53:15 2010
@@ -228,9 +228,6 @@ sub expires_test {
 
     my $expected = '';
     my $exp_type = '';
-    my $r713142_version = '2.2.11';
-    my $check_r713142 = have_min_apache_version($r713142_version);
-    my $ignore = 0;
     if ($exp_conf =~ /^([A|M])(\d+)$/) {
         $exp_type = $1;
         $expected = $2;
@@ -240,10 +237,6 @@ sub expires_test {
         if (($exp_type eq 'M')
             && ($headers{access} > $headers{modified} + $expected)) {
             $expected = $headers{access} - $headers{modified};
-            if (!$check_r713142) {
-                $ignore = 1;
-                print STDERR "\nTODO: Fix for expiration date being in the past (r713142
not backported before $r713142_version).\n";
-            }
         }
     } else {
         print STDERR "\n\ndoom: $exp_conf\n\n";
@@ -259,7 +252,7 @@ sub expires_test {
 
     print "# debug: expected: $expected\n";
     print "# debug: actual  : $actual\n";
-    return ($actual == $expected) || $ignore;
+    return ($actual == $expected);
 
 }
 



Mime
View raw message