You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@hyperreal.org on 1999/02/06 09:51:27 UTC
cvs commit: apache-1.3/src/modules/standard mod_dir.c
fielding 99/02/06 00:51:27
Modified: . STATUS
src CHANGES
src/modules/standard mod_dir.c
Log:
Fix a rare memory corruption possibility in mod_dir if the index
file is negotiable and no acceptable variant can be found.
The alternative solutions of using a copy-over version of ap_overlay_tables
worked, but had other drawbacks, so we'll just keep it simple for now.
Submitted by: Dean Gaudet
Reviewed by: Roy Fielding, Martin Kraemer
Revision Changes Path
1.612 +1 -15 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- STATUS 1999/02/06 08:18:45 1.611
+++ STATUS 1999/02/06 08:51:22 1.612
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/06 08:18:45 $]
+ Last modified at [$Date: 1999/02/06 08:51:22 $]
Release:
@@ -94,20 +94,6 @@
* Koen Holtman's [PATCH] mod_negotiation some loose ends
Message-ID: <Pi...@suncms33.cern.ch>
Status: Roy is looking at it.
-
- * Core dump with Language Negotiation?!?
-
- o Roy's [PATCH] Adds ap_copyover_table()
- Message-ID: <99...@paris.ics.uci.edu>
- Status: Roy +1, Dirkx +1
-
- o Martin and Dean's [PATCH] Adds copy semantics to ap_overlap_tables().
- Message-ID: <19...@deejai.mch.sni.de>
- Status:
-
- o Dean's minimal [PATCH] Adds ap_pool_join()
- MID: <Pi...@twinlark.arctic.org>
- Status: Dean +1, Roy +1
* Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch
ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
1.1233 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -r1.1232 -r1.1233
--- CHANGES 1999/02/06 03:20:32 1.1232
+++ CHANGES 1999/02/06 08:51:24 1.1233
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Fixed a rare memory corruption possibility in mod_dir if the index
+ file is negotiable and no acceptable variant can be found.
+ [Dean Gaudet, Roy Fielding, Martin Kraemer]
+
*) Win32: Add new config directive, ScriptInterpreterSource, to enable
searching the Win32 registry for script interpreters.
[Bill Stoddard]
1.54 +1 -1 apache-1.3/src/modules/standard/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_dir.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mod_dir.c 1999/01/01 19:05:08 1.53
+++ mod_dir.c 1999/02/06 08:51:26 1.54
@@ -179,13 +179,13 @@
if (ap_is_HTTP_REDIRECT(rr->status) ||
(rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
+ ap_pool_join(r->pool, rr->pool);
error_notfound = rr->status;
r->notes = ap_overlay_tables(r->pool, r->notes, rr->notes);
r->headers_out = ap_overlay_tables(r->pool, r->headers_out,
rr->headers_out);
r->err_headers_out = ap_overlay_tables(r->pool, r->err_headers_out,
rr->err_headers_out);
- ap_destroy_sub_req(rr);
return error_notfound;
}