W3C home > Mailing lists > Public > www-validator-cvs@w3.org > December 2009

validator/httpd/cgi-bin check,1.741,1.742

From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 04 Dec 2009 21:31:36 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1NGfkW-000675-Iq@lionel-hutz.w3.org>
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv23481/httpd/cgi-bin

Modified Files:
	check 
Log Message:
Fix error log trashing with unusual doctype declarations.

Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.741
retrieving revision 1.742
diff -u -d -r1.741 -r1.742
--- check	29 Nov 2009 20:38:17 -0000	1.741
+++ check	4 Dec 2009 21:31:34 -0000	1.742
@@ -2432,12 +2432,13 @@
             $File->{Root}    = "html";
             $File->{DOCTYPE} = "HTML5";
         }
-        else {
+        elsif ($declaration =~
+            m(<!DOCTYPE\s+(\w[\w\.-]+)\s+(PUBLIC|SYSTEM)\s+(?:[\'\"])([^\"\']+)(?:[\"\'])(.*)>)si
+            )
+        {
             (   $File->{Root},    $doctype_type,
                 $File->{DOCTYPE}, $doctype_secondpart
-                )
-                = $declaration =~
-                m(<!DOCTYPE\s+(\w[\w\.-]+)\s+(PUBLIC|SYSTEM)\s+(?:[\'\"])([^\"\']+)(?:[\"\'])(.*)>)si;
+            ) = ($1, $2, $3, $4);
             if (($doctype_type eq "PUBLIC") and
                 (($doctype_secondpart) =
                     $doctype_secondpart =~
Received on Friday, 4 December 2009 21:31:38 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:16 GMT