Fri, 01 Nov 2024 12:25:52 +0100
fix pgext uses a wrong field number, if the column has the same name as a resource or property column
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2013 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 <cx/string.h> #include <cx/map.h> #include "objecttype.h" #include "../util/pblock.h" #include "../daemon/config.h" #include "../daemon/session.h" int object_type_by_extension(pblock *pb, Session *sn, Request *rq) { cxstring path = cx_str(pblock_findkeyval(pb_key_path, rq->vars)); //printf("\nobject_type_by_extension: {%s}[%d]\n\n", path); cxstring ct; if(path.ptr[path.length - 1] == '/') { // directory ct = (cxstring)CX_STR(OBJTYPE_INTERNAL_DIRECTORY); } else { cxstring ext; ext.length = 0; for(int i=path.length - 1;i>=0;i--) { if(path.ptr[i] == '.') { ext.ptr = path.ptr + i + 1; ext.length = path.length - i - 1; break; } } if(ext.length == 0) { // no extension, no type return REQ_NOACTION; } // get the mime type for the ext from the server configuration ServerConfiguration *config = session_get_config(sn); WS_ASSERT(config); WS_ASSERT(config->mimetypes); WS_ASSERT(config->mimetypes->map); char *type = cxMapGet(config->mimetypes->map, cx_hash_key_bytes((const unsigned char*)ext.ptr, ext.length)); if(!type) { return REQ_NOACTION; } ct.ptr = type; ct.length = strlen(type); } pblock_kvinsert(pb_key_content_type, ct.ptr, ct.length, rq->srvhdrs); return REQ_PROCEED; } int object_type_force_type(pblock *pb, Session *sn, Request *rq) { char *type = pblock_findkeyval(pb_key_type, pb); if(!type) { return REQ_NOACTION; } char *ct = pblock_findkeyval(pb_key_content_type, rq->srvhdrs); if(ct) { return REQ_NOACTION; } pblock_kvinsert(pb_key_content_type, type, strlen(type), rq->srvhdrs); return REQ_PROCEED; }