Mercurial > hg > webserver / changeset

--- a/src/server/config/conf.c	Mon Nov 10 21:23:55 2025 +0100
+++ b/src/server/config/conf.c	Mon Nov 10 21:50:25 2025 +0100
@@ -259,7 +259,7 @@
  */
 cxmutstr cfg_param_get(ConfigParam *param, cxstring name) {
     while(param != NULL) {
-        if(!cx_strcmp(cx_strn(param->name.ptr, param->name.length), name)) {
+        if(!cx_strcmp(param->name, name)) {
             return param->value;
         }
         param = param->next;

--- a/src/server/daemon/config.c	Mon Nov 10 21:23:55 2025 +0100
+++ b/src/server/daemon/config.c	Mon Nov 10 21:50:25 2025 +0100
@@ -343,7 +343,7 @@
         //int b = 0;
         CxMapIterator map_iter = cxMapIteratorValues(serverconfig->host_vs);
         cx_foreach(VirtualServer *, vs, map_iter) {
-            if(!cx_strcmp(vsname, cx_strn(vs->name.ptr, vs->name.length))) {
+            if(!cx_strcmp(vsname, vs->name)) {
                 listener->default_vs.vs = vs;
                 break;
             }
@@ -784,8 +784,7 @@
     
     // get a list of all DavBackends
     for(ConfigNode *node=obj->children_begin;node;node=node->next) {
-        cxstring node_name = cx_strn(node->name.ptr, node->name.length);
-        if(!cx_strcasecmp(node_name, cx_str("DavBackend"))) {
+        if(!cx_strcasecmp(node->name, cx_str("DavBackend"))) {
             if(node->type == CONFIG_NODE_DIRECTIVE) {
                 if(CFG_NUM_PARAMS(node->args) == 1) {
                     cxListAdd(backends, node->args);
@@ -1158,8 +1157,8 @@
             // add the type for each extension to the map
             for(int i=0;i<d->nextensions;i++) {
                 cxstring ext = d->extensions[i];
-                cxmutstr value = cx_strdup_a(cfg->a, cx_strn(d->type.ptr, d->type.length));
-                if(cxMapPut(map, cx_hash_key_bytes((const unsigned char *)ext.ptr, ext.length), value.ptr)) {
+                cxmutstr value = cx_strdup_a(cfg->a, d->type);
+                if(cxMapPut(map, ext, value.ptr)) {
                     log_ereport(LOG_CATASTROPHE, "OOM");
                     ret = -1;
                     break;
@@ -1214,7 +1213,7 @@
     acllist->ace = NULL;
     acllist->ece = NULL;
     
-    if(acl->type.ptr && !cx_strcmp(cx_strn(acl->type.ptr, acl->type.length), cx_str("fs"))) {
+    if(acl->type.ptr && !cx_strcmp(acl->type, CX_STR("fs"))) {
         acllist->acl.isextern = 1;
     }