Commit edbd5334 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

mod_mime_magic: Handle CRLF-format magic files so that it works with 

the default installation on Windows.


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5 














  [Remove entries to the current 2.0 section below, when backported]



























  *) mod_mime_magic: Handle CRLF-format magic files so that it works with













     the default installation on Windows.  [Jeff Trawick]



























  *) core: Allow multiple modules to register interest in a single 















     configuration command. [Paul Querna]















































modules/metadata/mod_mime_magic.c



+10
−5






























Original line number
Diff line number
Diff line








@@ -947,10 +947,15 @@ static int apprentice(server_rec *s, apr_pool_t *p)













    /* parse it */















    for (lineno = 1; apr_file_gets(line, BUFSIZ, f) == APR_SUCCESS; lineno++) {















	int ws_offset;













        char *last = line + strlen(line) - 1; /* guaranteed that len >= 1 */





























	/* delete newline */













	if (line[0]) {













	    line[strlen(line) - 1] = '\0';













	/* delete newline and potential carriage return */













        if (*last == '\n') {













            *last = '\0';













            --last;













        }













        if (*last == '\r') {













            *last = '\0';















        }















        















	/* skip leading whitespace */