You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@apache.org on 2003/01/01 01:57:03 UTC
cvs commit: httpd-2.0/modules/http mod_mime.c
brianp 2002/12/31 16:57:03
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/http Tag: APACHE_2_0_BRANCH mod_mime.c
Log:
fix for mod_mime segfault when r->filename is null [ported back from 2.1]
Revision Changes Path
No revision
No revision
1.988.2.13 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.12
retrieving revision 1.988.2.13
diff -u -r1.988.2.12 -r1.988.2.13
--- CHANGES 23 Dec 2002 18:29:48 -0000 1.988.2.12
+++ CHANGES 1 Jan 2003 00:57:01 -0000 1.988.2.13
@@ -1,5 +1,8 @@
Changes with Apache 2.0.45
+ *) mod_mime: Workaround to prevent a segfault if r->filename=NULL
+ [Brian Pane]
+
*) Reorder the definitions for mod_ldap and mod_auth_ldap within
config.m4 to make sure the parent mod_ldap is defined first.
This ensures that mod_ldap comes before mod_auth_ldap in the
1.751.2.32 +1 -4 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.31
retrieving revision 1.751.2.32
diff -u -r1.751.2.31 -r1.751.2.32
--- STATUS 1 Jan 2003 00:24:17 -0000 1.751.2.31
+++ STATUS 1 Jan 2003 00:57:01 -0000 1.751.2.32
@@ -58,9 +58,6 @@
PATCHES TO PORT FROM 2.1
* Use saner default config values for suexec. PR 15713.
- * mod_mime: Workaround to prevent a segfault if r->filename=NULL
- +1: brianp, jim, jerenkrantz
-
* Rewrite how proxy sends its request to allow input bodies to
morph the request bodies. Previously, if an input filter
changed the request body, the original C-L would be sent which
No revision
No revision
1.88.2.1 +4 -0 httpd-2.0/modules/http/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -u -r1.88 -r1.88.2.1
--- mod_mime.c 5 Sep 2002 11:04:25 -0000 1.88
+++ mod_mime.c 1 Jan 2003 00:57:02 -0000 1.88.2.1
@@ -790,6 +790,10 @@
return OK;
}
+ if (!r->filename) {
+ return DECLINED;
+ }
+
conf = (mime_dir_config *)ap_get_module_config(r->per_dir_config,
&mime_module);
exception_list = apr_array_make(r->pool, 2, sizeof(char *));