diff --git a/testing/normalise_result b/testing/normalise_result index 1b414cb0..9fd1af57 100755 --- a/testing/normalise_result +++ b/testing/normalise_result @@ -8,9 +8,6 @@ use strict; while( ) { - /^Date: [SMTWF][a-z]{2}, [0-9]{1,2} [JFMAJSOND][a-z]+ 20[0-9]{2} [012][0-9]:[0-5][0-9]:[0-5][0-9] GMT\r$/ && do { - $_ = "Date: Dow, 01 Jan 2000 00:00:00 GMT\r\n"; - }; /^Server: Apache\/[0-9.]+/ && do { $_ = ""; @@ -24,6 +21,9 @@ while( ) { $_ = ""; }; + # HTTP Standard Dates + s/(Mon|Tue|Wed|Thu|Fri|Sat|Sun), [0-3][0-9] (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) 2[0-9]{3} [0-2][0-9](:[0-5][0-9]){2} GMT/Dow, 01 Jan 2000 00:00:00 GMT/; + # Fix up any opaquelocktokens to something regular s/opaquelocktoken:[[:xdigit:]]{8}-([[:xdigit:]]{4}-){3}[[:xdigit:]]{12}/opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/;