W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2010

link-checker commit: Compile trusted and exclude-docs regexps only once.

From: Mercurial notifier <nobody@w3.org>
Date: Thu, 05 Aug 2010 14:46:55 +0000
To: link-checker updates <www-validator-cvs@w3.org>
Message-Id: <E1Oh1ih-0005Xb-EM@blinky.w3.org>
changeset:   39:1fd9cf4b6157
user:        ville
date:        Sat Apr 03 10:26:36 2004 +0000
files:       bin/checklink
description:
Compile trusted and exclude-docs regexps only once.


diff -r e736acee742b -r 1fd9cf4b6157 bin/checklink
--- a/bin/checklink	Sat Apr 03 09:46:35 2004 +0000
+++ b/bin/checklink	Sat Apr 03 10:26:36 2004 +0000
@@ -5,7 +5,7 @@
 # (c) 1999-2004 World Wide Web Consortium
 # based on Renaud Bruyeron's checklink.pl
 #
-# $Id: checklink,v 3.18 2004-04-03 09:46:35 ville Exp $
+# $Id: checklink,v 3.19 2004-04-03 10:26:36 ville Exp $
 #
 # This program is licensed under the W3C(r) Software License:
 #       http://www.w3.org/Consortium/Legal/copyright-software
@@ -92,7 +92,7 @@
   $PROGRAM       = 'W3C checklink';
   ($AGENT        = $PROGRAM) =~ s/\s+/-/g;
   $VERSION       = '3.9.2';
-  ($CVS_VERSION) = q$Revision: 3.18 $ =~ /(\d+[\d\.]*\.\d+)/;
+  ($CVS_VERSION) = q$Revision: 3.19 $ =~ /(\d+[\d\.]*\.\d+)/;
   $REVISION      = sprintf('version %s [%s] (c) 1999-2004 W3C',
                            $VERSION, $CVS_VERSION);
 
@@ -204,11 +204,11 @@
 
 # Precompile/error-check regular expressions.
 if (defined($Opts{Exclude_Docs})) {
-  eval { $Opts{Exclude_Docs} = qr/$Opts{Exclude_Docs}/; };
+  eval { $Opts{Exclude_Docs} = qr/$Opts{Exclude_Docs}/o; };
   &usage(1, "Error in exclude-docs regexp: $@") if $@;
 }
 if (defined($Opts{Trusted})) {
-  eval { $Opts{Trusted} = qr/$Opts{Trusted}/; };
+  eval { $Opts{Trusted} = qr/$Opts{Trusted}/io; };
   &usage(1, "Error in trusted domains regexp: $@") if $@;
 }
 
@@ -885,7 +885,7 @@
   }
   $request->header('Accept', $Accept);
   # Are we providing authentication info?
-  if ($auth && $request->url()->host() =~ /$Opts{Trusted}/i) {
+  if ($auth && $request->url()->host() =~ $Opts{Trusted}) {
     if (defined($ENV{HTTP_AUTHORIZATION})) {
       $request->headers->header(Authorization => $ENV{HTTP_AUTHORIZATION});
     } elsif (defined($Opts{User}) && defined($Opts{Password})) {
@@ -916,7 +916,10 @@
        || (defined($Opts{User}) && defined($Opts{Password})))) {
 
     # Set host as trusted domain unless we already have one.
-    $Opts{Trusted} ||= sprintf('^%s$', quotemeta($response->base()->host()));
+    if (!$Opts{Trusted}) {
+      my $re = sprintf('^%s$', quotemeta($response->base()->host()));
+      $Opts{Trusted} = qr/$re/io;
+    }
 
     # Deal with authentication and avoid loops
     if (! defined($realm)) {
Received on Thursday, 5 August 2010 14:47:09 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:43 UTC