You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/05/22 19:05:25 UTC
cvs commit: apache-2.0/src/modules/standard mod_mime_magic.c
rbb 00/05/22 10:05:24
Modified: src/lib/apr/misc/unix start.c
src/modules/mpm/dexter dexter.c
src/modules/standard mod_mime_magic.c
Log:
Remove ap_destroy_context from Apache 2.0. With the name change back to
ap_pool_t, this function doesn't make sense. This also changes all
references to ap_destroy_context back to ap_destroy_pool.
Revision Changes Path
1.33 +0 -6 apache-2.0/src/lib/apr/misc/unix/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- start.c 2000/05/17 22:30:51 1.32
+++ start.c 2000/05/22 17:05:16 1.33
@@ -77,12 +77,6 @@
return APR_SUCCESS;
}
-ap_status_t ap_destroy_context(ap_pool_t *cont)
-{
- ap_destroy_pool(cont);
- return APR_SUCCESS;
-}
-
ap_status_t ap_set_userdata(void *data, char *key,
ap_status_t (*cleanup) (void *),
ap_pool_t *cont)
1.82 +1 -1 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- dexter.c 2000/05/19 07:14:43 1.81
+++ dexter.c 2000/05/22 17:05:19 1.82
@@ -716,7 +716,7 @@
}
pthread_mutex_lock(&thread_pool_parent_mutex);
- ap_destroy_context(tpool);
+ ap_destroy_pool(tpool);
pthread_mutex_unlock(&thread_pool_parent_mutex);
pthread_mutex_lock(&worker_thread_count_mutex);
worker_thread_count--;
1.20 +2 -2 apache-2.0/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_mime_magic.c 2000/05/21 05:31:07 1.19
+++ mod_mime_magic.c 2000/05/22 17:05:23 1.20
@@ -2232,12 +2232,12 @@
*newch = (unsigned char *) ap_palloc(r->pool, n);
rv = ap_bread(bout, *newch, n, &n);
if (n == 0) {
- ap_destroy_context(sub_context);
+ ap_destroy_pool(sub_context);
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
MODNAME ": read failed %s", r->filename);
return -1;
}
- ap_destroy_context(sub_context);
+ ap_destroy_pool(sub_context);
return n;
}