You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@locus.apache.org on 2000/05/21 07:31:10 UTC
cvs commit: apache-2.0/src/support httpd.exp
manoj 00/05/20 22:31:10
Modified: src/lib/apr/include apr_lib.h
src/lib/apr/lib apr_pools.c
src/main http_log.c util.c
src/modules/standard mod_cgi.c mod_mime_magic.c
mod_rewrite.c
src/support httpd.exp
Log:
Remove all remaining instances in Apache code of
ap_{block,unblock}_alarms.
Revision Changes Path
1.31 +0 -12 apache-2.0/src/lib/apr/include/apr_lib.h
Index: apr_lib.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- apr_lib.h 2000/05/21 05:13:09 1.30
+++ apr_lib.h 2000/05/21 05:31:04 1.31
@@ -358,18 +358,6 @@
API_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size);
-/*
- * Routine definitions that only work on Windows.
- */
-
-/*#ifdef TPF*/
-#define ap_block_alarms()
-#define ap_unblock_alarms()
-/*#else
-API_EXPORT(void) ap_block_alarms(void);
-API_EXPORT(void) ap_unblock_alarms(void);
-#endif */
-
#ifdef __cplusplus
}
#endif
1.52 +0 -27 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- apr_pools.c 2000/05/21 05:13:10 1.51
+++ apr_pools.c 2000/05/21 05:31:05 1.52
@@ -497,7 +497,6 @@
union block_hdr *blok;
ap_pool_t *new_pool;
- ap_block_alarms();
#if APR_HAS_THREADS
ap_lock(alloc_mutex);
@@ -529,7 +528,6 @@
#if APR_HAS_THREADS
ap_unlock(alloc_mutex);
#endif
- ap_unblock_alarms();
return new_pool;
}
@@ -617,10 +615,8 @@
{
ap_status_t rv;
- ap_block_alarms(); /* Run cleanup only once! */
rv = (*cleanup) (data);
ap_kill_cleanup(p, data, cleanup);
- ap_unblock_alarms();
return rv;
}
@@ -662,9 +658,7 @@
* I can do about that (except if the child decides
* to go out and close them
*/
- ap_block_alarms();
cleanup_pool_for_exec(permanent_pool);
- ap_unblock_alarms();
#endif /* ndef WIN32 */
}
@@ -723,8 +717,6 @@
*/
API_EXPORT(void) ap_clear_pool(ap_pool_t *a)
{
- ap_block_alarms();
-
while (a->sub_pools) {
ap_destroy_pool(a->sub_pools);
}
@@ -754,13 +746,10 @@
a->allocation_list = NULL;
}
#endif
-
- ap_unblock_alarms();
}
API_EXPORT(void) ap_destroy_pool(ap_pool_t *a)
{
- ap_block_alarms();
ap_clear_pool(a);
#if APR_HAS_THREADS
ap_lock(alloc_mutex);
@@ -781,7 +770,6 @@
ap_unlock(alloc_mutex);
#endif
free_blocks(a->first);
- ap_unblock_alarms();
}
API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p)
@@ -829,7 +817,6 @@
(stack_direction == 1 &&
is_ptr_in_range(s, known_stack_point, &ts)), 1, apr_abort,
"Ouch! find_pool() called on pointer in a free block\n");
- ap_block_alarms();
/* search the global_block_list */
for (pb = &global_block_list; *pb; pb = &b->h.global_next) {
b = *pb;
@@ -847,11 +834,9 @@
b->h.global_next = global_block_list;
global_block_list = b;
}
- ap_unblock_alarms();
return b->h.owning_pool;
}
}
- ap_unblock_alarms();
return NULL;
}
@@ -888,7 +873,6 @@
/* We could handle more general cases... but this is it for now. */
APR_ABORT(sub->parent != p, 1, apr_abort,
"pool_join: p is not a parent of sub\n");
- ap_block_alarms();
while (p->joined) {
p = p->joined;
}
@@ -898,7 +882,6 @@
b->h.owning_pool = p;
}
}
- ap_unblock_alarms();
}
#endif
@@ -916,7 +899,6 @@
if (a == NULL) {
return malloc(reqsize);
}
- ap_block_alarms();
if (c == NULL) {
return malloc(reqsize);
}
@@ -928,7 +910,6 @@
debug_fill(ptr, size); /* might as well get uninitialized protection */
*(void **)ptr = a->allocation_list;
a->allocation_list = ptr;
- ap_unblock_alarms();
return (char *)ptr + CLICK_SZ;
#else
@@ -977,8 +958,6 @@
/* Nope --- get a new one that's guaranteed to be big enough */
- ap_block_alarms();
-
#if APR_HAS_THREADS
ap_lock(alloc_mutex);
#endif
@@ -994,8 +973,6 @@
ap_unlock(alloc_mutex);
#endif
- ap_unblock_alarms();
-
first_avail = blok->h.first_avail;
blok->h.first_avail += size;
@@ -1168,7 +1145,6 @@
struct psprintf_data ps;
void *ptr;
- ap_block_alarms();
ps.base = malloc(512);
if (ps.base == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
@@ -1188,14 +1164,12 @@
}
*(void **)ptr = p->allocation_list;
p->allocation_list = ptr;
- ap_unblock_alarms();
return (char *)ptr + CLICK_SZ;
#else
struct psprintf_data ps;
char *strp;
int size;
- ap_block_alarms();
ps.blok = p->last;
ps.vbuff.curpos = ps.blok->h.first_avail;
ps.vbuff.endpos = ps.blok->h.endp - 1; /* save one for NUL */
@@ -1219,7 +1193,6 @@
ps.blok->h.owning_pool = p;
#endif
}
- ap_unblock_alarms();
return strp;
#endif
1.48 +0 -2 apache-2.0/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- http_log.c 2000/05/18 01:35:03 1.47
+++ http_log.c 2000/05/21 05:31:06 1.48
@@ -197,8 +197,6 @@
}
}
- ap_unblock_alarms();
-
return(rc);
}
1.46 +0 -2 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- util.c 2000/05/18 14:11:23 1.45
+++ util.c 2000/05/21 05:31:07 1.46
@@ -275,10 +275,8 @@
API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t * reg)
{
- ap_block_alarms();
regfree(reg);
ap_kill_cleanup(p, (void *) reg, regex_cleanup);
- ap_unblock_alarms();
}
/*
1.38 +0 -3 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_cgi.c 2000/05/16 20:19:29 1.37
+++ mod_cgi.c 2000/05/21 05:31:07 1.38
@@ -310,8 +310,6 @@
int i;
#endif
- ap_block_alarms();
-
RAISE_SIGSTOP(CGI_CHILD);
#ifdef DEBUG_CGI
fprintf(dbg, "Attempting to exec %s as %sCGI child (argv0 = %s)\n",
@@ -381,7 +379,6 @@
ap_bsetopt(*script_err, BO_TIMEOUT, &r->server->timeout);
}
}
- ap_unblock_alarms();
return (rc);
}
static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_pool_t *p)
1.19 +0 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_mime_magic.c 2000/04/26 07:14:38 1.18
+++ mod_mime_magic.c 2000/05/21 05:31:07 1.19
@@ -2158,8 +2158,6 @@
ap_file_t *file = NULL;
ap_iol *iol;
- ap_block_alarms();
-
env = ap_create_environment(child_context, r->subprocess_env);
if ((ap_createprocattr_init(&procattr, child_context) != APR_SUCCESS) ||
@@ -2203,7 +2201,6 @@
ap_bpush_iol(*script_in, iol);
}
}
- ap_unblock_alarms();
return (rc);
}
1.25 +0 -4 apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_rewrite.c 2000/04/26 07:14:38 1.24
+++ mod_rewrite.c 2000/05/21 05:31:09 1.25
@@ -3413,8 +3413,6 @@
ap_procattr_t *procattr;
ap_proc_t *procnew;
- ap_block_alarms();
-
#ifdef SIGHUP
ap_signal(SIGHUP, SIG_IGN);
#endif
@@ -3449,8 +3447,6 @@
}
}
}
-
- ap_unblock_alarms();
return (rc);
}
1.5 +0 -2 apache-2.0/src/support/httpd.exp
Index: httpd.exp
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/httpd.exp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.exp 1999/12/10 16:10:41 1.4
+++ httpd.exp 2000/05/21 05:31:09 1.5
@@ -39,7 +39,6 @@
ap_bgets
ap_bhalfduplex
ap_bind_address
-ap_block_alarms
ap_blookc
ap_bnonblock
ap_bonerror
@@ -356,7 +355,6 @@
ap_tm2sec
ap_translate_name
ap_uname2id
-ap_unblock_alarms
ap_unescape_url
ap_unparse_uri_components
ap_unregister_other_child