diff options
| author | Steve Kemp <steve@steve.org.uk> | 2013-10-15 14:52:44 +0100 | 
|---|---|---|
| committer | Steve Kemp <steve@steve.org.uk> | 2013-10-15 14:52:44 +0100 | 
| commit | 77b7577451f9f3aac0f37a56229ac597a0b1b068 (patch) | |
| tree | a69c99313e24e5cf1caa182f3909545cb7af97cf /lib | |
| parent | 6f4a8f1cde20762f8e08dc8c9fe75466585539e2 (diff) | |
  We now allow "with cache busting", and "without cache busting".
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/custodian/protocoltest/http.rb | 33 | 
1 files changed, 26 insertions, 7 deletions
| diff --git a/lib/custodian/protocoltest/http.rb b/lib/custodian/protocoltest/http.rb index c9aedaf..f9e3b85 100644 --- a/lib/custodian/protocoltest/http.rb +++ b/lib/custodian/protocoltest/http.rb @@ -133,6 +133,17 @@ module Custodian          if ( line =~ /not following redirects?/i )            @redirect = false          end + +        # +        # Do we use cache-busting? +        # +        @cache_busting = true +        if ( line =~ /with\s+cache\s+busting/ ) +          @cache_busting = true +        end +        if ( line =~ /without\s+cache\s+busting/ ) +          @cache_busting = false +        end        end @@ -157,6 +168,12 @@ module Custodian          @redirect        end +      # +      #  Do we have cache-busting? +      # +      def cache_busting? +        @cache_busting +      end        #        # Allow this test to be serialized. @@ -192,18 +209,20 @@ module Custodian          period   = settings.timeout()          # -        # The URL we'll fetch, which has a cache-busting -        # query-string +        # The URL we'll fetch/poll.          #          test_url = @url          # -        #  Parse and append a query-string if not present. +        #  Parse and append a query-string if not present, if we're +        # running with cache-busting.          # -        u = URI.parse( test_url ) -        if ( ! u.query ) -          u.query   = "ctime=#{Time.now.to_i}" -          test_url  = u.to_s +        if ( @cache_busting ) +          u = URI.parse( test_url ) +          if ( ! u.query ) +            u.query   = "ctime=#{Time.now.to_i}" +            test_url  = u.to_s +          end          end | 
