Use apr_palloc/apr_pmemdup rather than malloc/memcpy in mod_tile.c (#491)

Also:
- Add `HEAD` request test
- Add `renderd_config_test helper`
- Improve `renderd_config` testing
- Consolidate redundant code in `mod_tile.c`
- Stop unnecessarily reading `renderd.conf` 3 times
- Don't try to build `CentOS Stream 9/10` until `gdal` RPM issue is resolved
  - https://issues.redhat.com/browse/RHEL-134116

Author: hummeltech

.github/workflows/build-and-test.yml

@@ -33,14 +33,14 @@ jobs:
             build_system: CMake
             compiler: GNU
             experimental: true
-          - image: "quay.io/centos/centos:stream9"
-            build_system: CMake
-            compiler: GNU
-            experimental: true
-          - image: "quay.io/centos/centos:stream10"
-            build_system: CMake
-            compiler: GNU
-            experimental: true
+          # - image: "quay.io/centos/centos:stream9"
+          #   build_system: CMake
+          #   compiler: GNU
+          #   experimental: true
+          # - image: "quay.io/centos/centos:stream10"
+          #   build_system: CMake
+          #   compiler: GNU
+          #   experimental: true
           - image: "fedora:rawhide"
             build_system: CMake
             compiler: GNU

.github/workflows/docker-image-build.yml

@@ -41,10 +41,10 @@ jobs:
           - ubuntu-22.04
           - ubuntu-24.04
         include:
-          - service-name: centos-stream-9
-            experimental: true
-          - service-name: centos-stream-10
-            experimental: true
+          # - service-name: centos-stream-9
+          #   experimental: true
+          # - service-name: centos-stream-10
+          #   experimental: true
           - service-name: debian-unstable
             experimental: true
           - service-name: debian-unstable-autotools

Makefile.am

@@ -26,6 +26,7 @@ bin_PROGRAMS = \
 	render_speedtest
 noinst_PROGRAMS = \
 	gen_tile_test \
+	renderd_config_test_helper \
 	renderd_config_test \
 	renderd_test \
 	render_expired_test \
@@ -109,6 +110,12 @@ gen_tile_test_CFLAGS = -DMAIN_ALREADY_DEFINED
 gen_tile_test_CXXFLAGS = $(renderd_CXXFLAGS)
 gen_tile_test_LDADD = $(renderd_LDADD) catch_test_common.o
 
+renderd_config_test_helper_SOURCES = \
+	tests/renderd_config_test_helper.cpp \
+	src/g_logger.c \
+	src/renderd_config.c
+renderd_config_test_helper_LDADD = $(GLIB_LIBS) $(INIPARSER_LDFLAGS) catch_main.o
+
 renderd_config_test_SOURCES = \
 	tests/renderd_config_test.cpp
 renderd_config_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
@@ -137,7 +144,7 @@ CLEANFILES=*.slo mod_tile.la stderr.out src/*.slo src/*.lo src/.libs/* src/*.la
 
 COMMA=,
 
-test: gen_tile_test renderd_config_test renderd_test render_expired_test render_list_test render_old_test render_speedtest_test
+test: gen_tile_test renderd_config_test_helper renderd_config_test renderd_test render_expired_test render_list_test render_old_test render_speedtest_test
 	./gen_tile_test
 	./renderd_config_test
 	./renderd_test

includes/renderd_config.h

@@ -21,6 +21,12 @@
 #include "render_config.h"
 #include "renderd.h"
 
+#ifdef HAVE_INIPARSER_INIPARSER_H
+#include <iniparser/iniparser.h>
+#else
+#include <iniparser.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,9 +43,9 @@ void free_map_sections(xmlconfigitem *map_sections);
 void free_renderd_section(renderd_config renderd_section);
 void free_renderd_sections(renderd_config *renderd_sections);
 void process_config_file(const char *config_file_name, int active_renderd_section_num, int log_level);
-void process_map_sections(const char *config_file_name, xmlconfigitem *maps_dest, const char *default_tile_dir, int num_threads);
-void process_mapnik_section(const char *config_file_name, renderd_config *config_dest);
-void process_renderd_sections(const char *config_file_name, renderd_config *configs_dest);
+void process_map_sections(dictionary *ini, const char *config_file_name, xmlconfigitem *maps_dest, const char *default_tile_dir, int num_threads);
+void process_mapnik_section(dictionary *ini, const char *config_file_name, renderd_config *config_dest);
+void process_renderd_sections(dictionary *ini, const char *config_file_name, renderd_config *configs_dest);
 
 #ifdef __cplusplus
 }

src/CMakeLists.txt

@@ -219,4 +219,23 @@ target_include_directories(gen_tile_test PRIVATE ${PROJECT_SOURCE_DIR}/tests)
 target_link_libraries(gen_tile_test ${gen_tile_test_LIBS})
 set_target_properties(gen_tile_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
 
+#-----------------------------------------------------------------------------
+#
+#  renderd_config_test_helper
+#
+#-----------------------------------------------------------------------------
+
+set(renderd_config_test_helper_SRCS
+  ${PROJECT_SOURCE_DIR}/tests/renderd_config_test_helper.cpp
+  g_logger.c
+  renderd_config.c
+)
+set(renderd_config_test_helper_LIBS
+  ${GLIB_LIBRARIES}
+  ${INIPARSER_LIBRARIES}
+)
+add_executable(renderd_config_test_helper ${renderd_config_test_helper_SRCS})
+target_link_libraries(renderd_config_test_helper ${renderd_config_test_helper_LIBS})
+set_target_properties(renderd_config_test_helper PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
+
 endif()