diff -r 07b815faa6ac -r f00d03835dd9 src/server/safs/cgi.c
--- a/src/server/safs/cgi.c	Tue Dec 30 21:44:49 2025 +0100
+++ b/src/server/safs/cgi.c	Tue Jan 13 18:09:20 2026 +0100
@@ -809,7 +809,7 @@
     parser->msg = NULL;
     parser->response_length = 0;
     parser->cgiheader = TRUE;
-    cxBufferInit(&parser->tmp, NULL, 64, pool_allocator(sn->pool), CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&parser->tmp, pool_allocator(sn->pool), NULL, 64, CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS);
     return parser;
 }
 
@@ -856,14 +856,14 @@
             for(int l=0;i<name.length;l++) {
                 name.ptr[l] = tolower(name.ptr[l]);
             }
-            name = cx_strdup_a(a, cx_strtrim((cxstring){name.ptr, name.length}));
-            value = cx_strtrim_m(value);
+            name = cx_strdup_a(a, cx_strtrim(name));
+            value = cx_strtrim(value);
             
             if(name.length == 0 || value.length == 0) {
                 return -1;
             }
             
-            if(!cx_strcasecmp(cx_strn(name.ptr, name.length), CX_STR("status"))) {
+            if(!cx_strcasecmp(name, "status")) {
                 cxmutstr codestr = value;
                 int j;
                 for(j=0;j<codestr.length;j++) {
@@ -880,7 +880,7 @@
                 util_strtoint(codestr.ptr, &s);
                 parser->status = (int)s;
                 
-                cxmutstr msg = cx_strtrim_m(cx_strsubs_m(value, j + 1));
+                cxmutstr msg = cx_strtrim(cx_strsubs(value, j + 1));
                 
                 if(msg.length > 0) {
                     parser->msg = cx_strdup_pool(parser->sn->pool, msg).ptr;