Use mapcache_util_str_replace_all

Author: geographika

cgi/mapcache.c

@@ -162,17 +162,6 @@ static void fcgi_write_response(mapcache_context_fcgi *ctx, mapcache_http_respon
   }
 }
 
-// Replace all occurrences of substr in string
-char* str_replace_all(apr_pool_t* pool, const char* string,
-    const char* substr, const char* replacement)
-{
-    char* replaced = apr_pstrdup(pool, string);
-    while (strstr(replaced, substr)) {
-        replaced = mapcache_util_str_replace(pool, string, substr, replacement);
-    }
-    return replaced;
-}
-
 apr_time_t mtime;
 char *conffile;
 
@@ -264,8 +253,7 @@ static void set_headers(mapcache_context* ctx, char** env)
         // convert HTTP header keys from the form HTTP_MY_HEADER to MY-HEADER
         key = apr_strtok(kvp, "=", &pair);
         key = mapcache_util_str_replace(ctx->pool, key, "HTTP_", "");
-        key = mapcache_util_str_replace(ctx->pool, key, "_", "-");
-        // key = str_replace_all(ctx->pool, key, "_", "-");
+        key = mapcache_util_str_replace_all(ctx->pool, key, "_", "-");
         val = apr_strtok(NULL, "=", &pair);
 
         if (val != NULL) {
@@ -348,7 +336,7 @@ int main(int argc, const char **argv)
       goto cleanup;
     }
 
-    set_headers(ctx, environ);
+    set_headers(ctx, apr_pstrdup(ctx->pool, environ));
 
     http_response = NULL;
     if(request->type == MAPCACHE_REQUEST_GET_CAPABILITIES) {