]> granicus.if.org Git - apache/commitdiff
reverting to sterlings original segv fix when extension_mappings is NULL
authorDoug MacEachern <dougm@apache.org>
Wed, 22 Aug 2001 22:03:01 +0000 (22:03 +0000)
committerDoug MacEachern <dougm@apache.org>
Wed, 22 Aug 2001 22:03:01 +0000 (22:03 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90512 13f79535-47bb-0310-9956-ffa450edef68

modules/http/mod_mime.c

index 45ff4425427a99bc33895b083701ae46349d8ed1..29ae4be42908422b9b59abf9b257914906ea564a 100644 (file)
@@ -149,7 +149,7 @@ static void *create_mime_dir_config(apr_pool_t *p, char *dummy)
     mime_dir_config *new =
     (mime_dir_config *) apr_palloc(p, sizeof(mime_dir_config));
 
-    new->extension_mappings = apr_hash_make(p);
+    new->extension_mappings = NULL;
 
     new->charsets_remove = NULL;
     new->encodings_remove = NULL;
@@ -827,8 +827,10 @@ static int find_ct(request_rec *r)
         ap_str_tolower(ext);
 #endif
 
-        exinfo = (extension_info*)apr_hash_get(conf->extension_mappings,
-                                               ext, APR_HASH_KEY_STRING);
+        if (conf->extension_mappings != NULL) {
+            exinfo = (extension_info*)apr_hash_get(conf->extension_mappings,
+                                                   ext, APR_HASH_KEY_STRING);
+        }
 
         if (exinfo == NULL) {
             if ((type = apr_hash_get(mime_type_extensions, ext,