rse 98/11/07 06:31:25
Modified: src CHANGES
src/main alloc.c
Log:
Backout conservative NULL/ap_null_cleanup prevention
change on requests from Dean and Ben H.
Revision Changes Path
1.1139 +0 -7 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1138
retrieving revision 1.1139
diff -u -r1.1138 -r1.1139
--- CHANGES 1998/11/06 22:42:38 1.1138
+++ CHANGES 1998/11/07 14:31:21 1.1139
@@ -3,13 +3,6 @@
*) PORT: Add a port to the TPF OS. [Joe Moenich <[EMAIL PROTECTED]> and
others at IBM]
- *) Fix internal handling of registered cleanups in alloc.c by making sure
- that NULL-specified callback functions (we don't do this in the official
- set of modules, but third-party modules do) for ap_register_cleanup()
- always mean the dummy ap_null_cleanup() so we don't dump core later when
- running the cleanups.
- [J.Kean Johnston <[EMAIL PROTECTED]>] PR#3307, PR#3250, PR#3256
-
*) Fix problems with handling of UNC names (e.g., \\host\path)
on Win32. [Ken Parzygnat <[EMAIL PROTECTED]>]
1.103 +2 -2 apache-1.3/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- alloc.c 1998/11/06 12:24:37 1.102
+++ alloc.c 1998/11/07 14:31:24 1.103
@@ -1560,8 +1560,8 @@
{
struct cleanup *c = (struct cleanup *) ap_palloc(p, sizeof(struct
cleanup));
c->data = data;
- c->plain_cleanup = (plain_cleanup != NULL ? plain_cleanup :
ap_null_cleanup);
- c->child_cleanup = (child_cleanup != NULL ? child_cleanup :
ap_null_cleanup);
+ c->plain_cleanup = plain_cleanup;
+ c->child_cleanup = child_cleanup;
c->next = p->cleanups;
p->cleanups = c;
}
