Commit 4265ecac authored by Andre Malo's avatar Andre Malo
Browse files

fix segfault, which occurs if no CT is set and wildcards are used. 

PR: 28047
Reviewed by: Brad Nicholes, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103494 13f79535-47bb-0310-9956-ffa450edef68
parent c7d0594b

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.50









  *) Fix segfault in mod_expires, which occured under certain









     circumstances. PR 28047.  [Andr Malo]

















  *) htpasswd: use apr_temp_dir_get() and general cleanup









     [Guenter Knauf <eflash gmx.net>, Thom May]










































STATUS



+1
−5



























Changes for STATUS: 1 added line, 5 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/04/24 11:28:20 $]









Last modified at [$Date: 2004/04/24 11:43:01 $]



















Release:




















@@ -144,10 +144,6 @@ PATCHES TO BACKPORT FROM 2.1







         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.272&r2=1.273









       +1: nd (geoff)



















    *) Fix segfault in mod_expires. PR 28047









         modules/metadata/mod_expires.c: r1.54









       +1: nd, bnicholes, trawick



















    *) Fix memory leak in mod_rewrite. PR 27862. (2.0 + 1.3)









         http://www.apache.org/~nd/mod_rewrite_fixleak.diff









       +1: nd


































modules/metadata/mod_expires.c



+1
−1



























Changes for modules/metadata/mod_expires.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -482,7 +482,7 @@ static apr_status_t expires_filter(ap_filter_t *f,







                char *checkmime;









                char *spos;









                checkmime = apr_pstrdup(r->pool, r->content_type);









                spos = strchr(checkmime, '/');









                spos = checkmime ? ap_strchr(checkmime, '/') : NULL;









                if (spos != NULL) {









                    /*









                     * Without a '/' character, nothing we have will match.