diff --git a/src/framework/XMLRecognizer.cpp b/src/framework/XMLRecognizer.cpp index ee1548a3bf001ec971964a1634f85481af9f1785..7de3bfa384424aa3cb9217e0decddc1dedcfd36d 100644 --- a/src/framework/XMLRecognizer.cpp +++ b/src/framework/XMLRecognizer.cpp @@ -1,37 +1,37 @@ /* * The Apache Software License, Version 1.1 - * + * * Copyright (c) 1999-2000 The Apache Software Foundation. All rights * reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * + * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. - * + * * 4. The names "Xerces" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache\@apache.org. - * + * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -45,7 +45,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== - * + * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation, and was * originally based on software copyright (c) 1999, International @@ -55,28 +55,7 @@ */ /** - * $Log$ - * Revision 1.5 2000/05/15 22:31:12 andyh - * Replace #include<memory.h> with <string.h> everywhere. - * - * Revision 1.4 2000/03/02 19:54:25 roddey - * This checkin includes many changes done while waiting for the - * 1.1.0 code to be finished. I can't list them all here, but a list is - * available elsewhere. - * - * Revision 1.3 2000/02/06 07:47:48 rahulj - * Year 2K copyright swat. - * - * Revision 1.2 1999/12/18 00:19:03 roddey - * More changes to support the new, completely orthagonal, support for - * intrinsic encodings. - * - * Revision 1.1.1.1 1999/11/09 01:08:37 twl - * Initial checkin - * - * Revision 1.2 1999/11/08 20:44:40 rahul - * Swat for adding in Product name and CVS comment log variable. - * + * $Id$ */ @@ -230,7 +209,8 @@ XMLRecognizer::encodingForName(const XMLCh* const encName) // that one ourselves. It is allowed to fall into 'other'. // if (!XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString) - || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString2)) + || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString2) + || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString3)) { return XMLRecognizer::UTF_8; }