Sat, 25 Feb 2012 12:43:26 +0100
Fixed config parser bug
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2011 Olaf Wintermann. 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. * * 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. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include "davparser.h" #include "../util/pool.h" #include "../util/pblock.h" #include "saxhandler.h" #include <xercesc/sax2/SAX2XMLReader.hpp> #include <xercesc/sax2/XMLReaderFactory.hpp> #include <xercesc/sax2/DefaultHandler.hpp> #include <xercesc/util/XMLString.hpp> #include <xercesc/framework/MemBufInputSource.hpp> XERCES_CPP_NAMESPACE_USE; int xcinit = 0; PropfindRequest* dav_parse_propfind( Session *sn, Request *rq, char *xml, size_t len) { if(!xcinit) { /* TODO: create webdav module init function */ XMLPlatformUtils::Initialize(); xcinit = 1; } PropfindRequest *davrq = (PropfindRequest*)pool_malloc( sn->pool, sizeof(PropfindRequest)); davrq->allprop = 0; davrq->propname = 0; davrq->properties = NULL; // create xml parser SAX2XMLReader* parser = XMLReaderFactory::createXMLReader(); parser->setFeature(XMLUni::fgSAX2CoreNameSpaces, true); PropfindHandler handler(davrq, sn->pool); parser->setContentHandler(&handler); parser->setErrorHandler(&handler); MemBufInputSource source((XMLByte*)xml, (XMLSize_t)len, "wsid"); try { parser->parse(source); } catch (const XMLException& e) { printf("XMLException\n"); } catch (const SAXParseException& e) { printf("SAXParseException\n"); } catch (...) { printf("davaparser Exception\n"); } return davrq; }