diff options
author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:17 +0100 |
---|---|---|
committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:17 +0100 |
commit | 9e615cb6aa4afcee97f8a1646e5a586261a7b81f (patch) | |
tree | 0e09fde2404555dc5daf167b38243b5f89c16549 /modules/http/mod_mime.c | |
parent | 1acac7a6b494db24f8f58e44dab7657b6de68742 (diff) | |
download | apache2-9e615cb6aa4afcee97f8a1646e5a586261a7b81f.tar.gz |
Upstream tarball 2.2.8upstream/2.2.8
Diffstat (limited to 'modules/http/mod_mime.c')
-rw-r--r-- | modules/http/mod_mime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index d122d05b..d9d8b101 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -140,11 +140,10 @@ static void *overlay_extension_mappings(apr_pool_t *p, const void *base_val, const void *data) { - extension_info *new_info = apr_palloc(p, sizeof(extension_info)); const extension_info *overlay_info = (const extension_info *)overlay_val; const extension_info *base_info = (const extension_info *)base_val; + extension_info *new_info = apr_pmemdup(p, base_info, sizeof(extension_info)); - memcpy(new_info, base_info, sizeof(extension_info)); if (overlay_info->forced_type) { new_info->forced_type = overlay_info->forced_type; } |