Commit 9cc1390c authored by Doug MacEachern's avatar Doug MacEachern
Browse files

fix segv in mod_mime if no AddTypes are configured 

PR:
Obtained from:
Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90506 13f79535-47bb-0310-9956-ffa450edef68
parent dcd834a9

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.25-dev

  *) fix segv in mod_mime if no AddTypes are configured

     [John Sterling <sterling@covalent.net>]



  *) Enable ssl client authentication at SSL_accept time

     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]

modules/http/mod_mime.c

+6 −4
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int find_ct(request_rec *r) 
    /* Parse filename extensions which can be in any order 

     */

    while (*fn && (ext = ap_getword(r->pool, &fn, '.'))) {

        extension_info *exinfo;

        extension_info *exinfo = NULL;

        int found;



        if (*ext == '\0')  /* ignore empty extensions "bad..html" */
@@ -827,8 +827,10 @@ static int find_ct(request_rec *r) 
        ap_str_tolower(ext);

#endif



        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,