Skip to content

fix(apache): remove NULL-returning create_dir_config/merge_dir_config stubs (#96) #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s2x merged 1 commit into from
May 4, 2026
Merged

fix(apache): remove NULL-returning create_dir_config/merge_dir_config stubs (#96) #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions servers/apache/mod_mesi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,6 @@ static void mesi_child_init(apr_pool_t *p, server_rec *s) {
apr_pool_cleanup_register(p, NULL, mesi_child_cleanup, apr_pool_cleanup_null);
}

static void *create_dir_config(apr_pool_t *p, char *dir) {
return NULL;
}

static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {
return NULL;
}

static const char *set_enable_mesi(cmd_parms *cmd, void *cfg, int flag) {
mesi_config *conf = (mesi_config *) ap_get_module_config(cmd->server->module_config, &mesi_module);
conf->enable_mesi = flag;
Expand Down Expand Up @@ -366,8 +358,8 @@ static const command_rec mesi_directives[] = {

module AP_MODULE_DECLARE_DATA mesi_module = {
STANDARD20_MODULE_STUFF,
create_dir_config,
merge_dir_config,
NULL, // no per-dir config (server-level only)
NULL, // no per-dir merge
create_server_config,
merge_server_config,
mesi_directives,
Expand Down
Loading