httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: apache-2.0/src/test test_find.c test_parser.c
Date Wed, 02 Aug 2000 05:27:44 GMT
dougm       00/08/01 22:27:38

  Modified:    src/ap   ap_base64.c ap_cache.c ap_hooks.c ap_sha1.c
               src/docs new_features_2_0.html
               src/include ap_base64.h ap_cache.h ap_hooks.h ap_iol.h
                        ap_listen.h ap_mmn.h ap_mpm.h ap_sha1.h buff.h
                        http_config.h http_connection.h http_core.h
                        http_log.h http_main.h http_protocol.h
                        http_request.h http_vhost.h httpd.h mpm_common.h
                        mpm_status.h util_charset.h util_date.h
                        util_ebcdic.h util_filter.h util_md5.h
                        util_script.h util_uri.h util_xml.h
               src/lib/apr/buckets ap_buf.c ap_filter.h ap_mmap_buf.c
                        ap_rmem_buf.c ap_rwmem_buf.c apr_buf.h filters.c
                        util_filter.c util_filter.h
               src/lib/apr/dso/aix dso.c dso.h
               src/lib/apr/dso/beos dso.c dso.h
               src/lib/apr/dso/os2 dso.c dso.h
               src/lib/apr/dso/unix dso.c dso.h
               src/lib/apr/dso/win32 dso.c dso.h
               src/lib/apr/file_io/os2 dir.c filedup.c fileio.h filestat.c
                        maperrorcode.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
                        filestat.c fullrw.c open.c pipe.c readwrite.c
                        seek.c
               src/lib/apr/file_io/win32 dir.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/i18n/unix xlate.c
               src/lib/apr/include apr_dso.h apr_errno.h apr_file_io.h
                        apr_fnmatch.h apr_general.h apr_getopt.h apr_hash.h
                        apr_lib.h apr_lock.h apr_md5.h apr_mmap.h
                        apr_network_io.h apr_pools.h apr_portable.h
                        apr_shmem.h apr_strings.h apr_tables.h
                        apr_thread_proc.h apr_time.h apr_xlate.h
               src/lib/apr/lib apr_pools.c apr_signal.c
               src/lib/apr/locks/beos crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/os2 locks.c locks.h
               src/lib/apr/locks/unix crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/win32 locks.c locks.h
               src/lib/apr/misc/unix canonerr.c errorcodes.c getopt.c
                        misc.h otherchild.c rand.c start.c
               src/lib/apr/misc/win32 misc.c names.c rand.c
               src/lib/apr/mmap/unix common.c mmap.c
               src/lib/apr/network_io/beos networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/os2 networkio.h poll.c sendrecv.c
                        sockets.c sockopt.c
               src/lib/apr/network_io/unix networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/win32 networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/passwd apr_getpass.c apr_md5.c
               src/lib/apr/shmem/os2 shmem.c
               src/lib/apr/shmem/unix shmem.c
               src/lib/apr/strings apr_cpystrn.c apr_fnmatch.c
                        apr_snprintf.c apr_strings.c apr_strnatcmp.c
               src/lib/apr/tables apr_hash.c apr_tables.c
               src/lib/apr/test abc.c client.c server.c testargs.c
                        testcontext.c testdso.c testfile.c testmd5.c
                        testmmap.c testoc.c testpipe.c testproc.c testsf.c
                        testshmem.c testsock.c testthread.c testtime.c
               src/lib/apr/threadproc/beos proc.c thread.c threadpriv.c
                        threadproc.h
               src/lib/apr/threadproc/os2 proc.c signals.c thread.c
                        threadpriv.c threadproc.h
               src/lib/apr/threadproc/unix proc.c procsup.c signals.c
                        thread.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/win32 proc.c signals.c thread.c
                        threadpriv.c threadproc.h
               src/lib/apr/time/unix time.c timestr.c
               src/lib/apr/time/win32 access.c atime.h time.c timestr.c
               src/lib/sdbm sdbm.c sdbm.h sdbm_lock.c sdbm_private.h
                        sdbm_tune.h
               src/main buff.c gen_uri_delims.c http_config.c
                        http_connection.c http_core.c http_log.c
                        http_main.c http_protocol.c http_request.c
                        http_vhost.c iol_file.c iol_socket.c listen.c
                        mpm_common.c rfc1413.c util.c util_charset.c
                        util_date.c util_ebcdic.c util_filter.c util_md5.c
                        util_script.c util_uri.c util_xml.c
               src/modules/dav/fs dbm.c lock.c mod_dav_fs.c repos.c repos.h
               src/modules/dav/main dav_opaquelock.h liveprop.c mod_dav.c
                        mod_dav.h opaquelock.c props.c util.c util_lock.c
               src/modules/example mod_example.c
               src/modules/experimental mod_charset_lite.c
                        mod_mmap_static.c
               src/modules/file_cache cache_util.c file_cache.c
                        file_garbage.c mod_cache.c mod_cache.h
               src/modules/mpm/beos beos.c scoreboard.c scoreboard.h
               src/modules/mpm/dexter dexter.c scoreboard.c scoreboard.h
               src/modules/mpm/mpmt_beos mpmt_beos.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/perchild perchild.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/prefork prefork.c scoreboard.h
               src/modules/mpm/spmt_os2 scoreboard.h spmt_os2.c
               src/modules/mpm/winnt mpm_winnt.c mpm_winnt.h registry.c
                        service.c
               src/modules/proxy mod_proxy.c mod_proxy.h proxy_connect.c
                        proxy_ftp.c proxy_http.c proxy_util.c
               src/modules/standard mod_access.c mod_actions.c mod_alias.c
                        mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c
                        mod_auth_dbm.c mod_auth_digest.c mod_autoindex.c
                        mod_cern_meta.c mod_cgi.c mod_cgid.c mod_dir.c
                        mod_echo.c mod_env.c mod_expires.c mod_file_cache.c
                        mod_headers.c mod_imap.c mod_include.c mod_info.c
                        mod_log_config.c mod_mime.c mod_mime_magic.c
                        mod_negotiation.c mod_rewrite.c mod_rewrite.h
                        mod_setenvif.c mod_so.c mod_speling.c mod_status.c
                        mod_unique_id.c mod_userdir.c mod_usertrack.c
                        mod_vhost_alias.c
               src/modules/test mod_rndchunk.c mod_test_util_uri.c
               src/os/beos beosd.c
               src/os/bs2000 bs2login.c ebcdic.c os.c
               src/os/os2 os.h util_os2.c
               src/os/tpf ebcdic.c os.c
               src/os/unix unixd.c
               src/os/win32 main_win32.c mod_dll.c mod_isapi.c os.h
                        registry.c registry.h service.c service.h
                        util_win32.c
               src/os/win32/installer/installdll install.c
               src/support ab.c htdigest.c htpasswd.c logresolve.c suexec.c
               src/test test_find.c test_parser.c
  Log:
  prefix libapr functions and types with apr_
  
  Revision  Changes    Path
  1.12      +7 -7      apache-2.0/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_base64.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ap_base64.c	2000/05/27 22:28:00	1.11
  +++ ap_base64.c	2000/08/02 05:25:22	1.12
  @@ -58,7 +58,7 @@
   
   /* base64 encoder/decoder. Originally part of main/util.c
    * but moved here so that support/ab and ap_sha1.c could
  - * use it. This meant removing the ap_palloc()s and adding
  + * use it. This meant removing the apr_palloc()s and adding
    * ugly 'len' functions, which is quite a nasty cost.
    */
   
  @@ -111,15 +111,15 @@
   };
   
   #ifdef CHARSET_EBCDIC
  -static ap_xlate_t *xlate_to_ebcdic;
  +static apr_xlate_t *xlate_to_ebcdic;
   static unsigned char os_toascii[256];
   
  -API_EXPORT(ap_status_t) ap_base64init_ebcdic(ap_xlate_t *to_ascii,
  -                                             ap_xlate_t *to_ebcdic)
  +API_EXPORT(apr_status_t) ap_base64init_ebcdic(apr_xlate_t *to_ascii,
  +                                             apr_xlate_t *to_ebcdic)
   {
       int i;
  -    ap_size_t inbytes_left, outbytes_left;
  -    ap_status_t rv;
  +    apr_size_t inbytes_left, outbytes_left;
  +    apr_status_t rv;
       int onoff;
       
       /* Only single-byte conversion is supported.
  @@ -168,7 +168,7 @@
   API_EXPORT(int) ap_base64decode(char *bufplain, const char *bufcoded)
   {
   #ifdef CHARSET_EBCDIC
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_size_t inbytes_left, outbytes_left;
   #endif				/* CHARSET_EBCDIC */
       int len;
       
  
  
  
  1.7       +24 -24    apache-2.0/src/ap/ap_cache.c
  
  Index: ap_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_cache.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_cache.c	2000/07/21 19:50:38	1.6
  +++ ap_cache.c	2000/08/02 05:25:22	1.7
  @@ -13,45 +13,45 @@
       AP_HOOK_LINK(cache_init)
   )
   
  -ap_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *server)
  +apr_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *server)
   {
       return ap_run_cache_init(h, desc, server);
   }
  -ap_status_t ap_cache_close(ap_cache_handle_t *h)
  +apr_status_t ap_cache_close(ap_cache_handle_t *h)
   {
       VERIFY_IMPL(h, cache_close);
       return h->meth.cache_close(h);
   }
  -ap_status_t ap_cache_garbage_collect(ap_cache_handle_t *h)
  +apr_status_t ap_cache_garbage_collect(ap_cache_handle_t *h)
   {
       VERIFY_IMPL(h, cache_garbage_coll);
       return h->meth.cache_garbage_coll(h);
   }
  -ap_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **el)
  +apr_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **el)
   {
       VERIFY_IMPL(h, cache_element);
       *el = NULL;
       return h->meth.cache_element(h, name, el, AP_CACHE_SEEK);
   }
  -ap_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **el)
  +apr_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **el)
   {
       VERIFY_IMPL(h, cache_element);
       *el = NULL;
       return h->meth.cache_element(h, name, el, AP_CACHE_CREATE);
   }
  -ap_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name)
  +apr_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name)
   {
       VERIFY_IMPL(h, cache_element);
       return h->meth.cache_element(h, name, NULL, AP_CACHE_REMOVE);
   }
  -struct walk_struct { char **place; ap_pool_t *pool; };
  +struct walk_struct { char **place; apr_pool_t *pool; };
   static int get_first_val(void *datum, const char *name, const char *val)
   {
       struct walk_struct *ws = (struct walk_struct *)datum;
  -    *(ws->place) = ap_pstrdup(ws->pool, val);
  +    *(ws->place) = apr_pstrdup(ws->pool, val);
       return 0;
   }
  -ap_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val)
  +apr_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val)
   {
       struct walk_struct ws;
       if(!val || !el) return APR_BADARG;
  @@ -61,11 +61,11 @@
       ap_cache_el_header_walk(el, get_first_val, &ws, hdr, NULL);
       return *val ? APR_SUCCESS : APR_ENOENT;
   }
  -ap_status_t ap_cache_el_header_walk(ap_cache_el *el,
  +apr_status_t ap_cache_el_header_walk(ap_cache_el *el,
                  int (*comp)(void *, const char *, const char *), void *rec, ...)
   {
       va_list args;
  -    ap_status_t ret;
  +    apr_status_t ret;
       
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_header_walk);
  @@ -83,9 +83,9 @@
       return APR_SUCCESS;
   }
   */
  -ap_status_t ap_cache_el_header_merge(ap_cache_el *el, ap_table_t *tbl)
  +apr_status_t ap_cache_el_header_merge(ap_cache_el *el, apr_table_t *tbl)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) tbl->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) tbl->a.elts;
       int i;
   /*
       const char *val;
  @@ -95,45 +95,45 @@
           ap_cache_el_header_set(el, elts[i].key, elts[i].val);
       return APR_SUCCESS;
   }
  -ap_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname,
  +apr_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname,
                                      const char *hdrval)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_hdr);
       return el->cache->meth.cache_el_hdr(el, hdrname, hdrval, AP_CACHE_CHANGE);
   }
  -ap_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname,
  +apr_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname,
                                      const char *hdrval)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_hdr);
       return el->cache->meth.cache_el_hdr(el, hdrname, hdrval, AP_CACHE_CREATE);
   }
  -ap_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdrname)
  +apr_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdrname)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_hdr);
       return el->cache->meth.cache_el_hdr(el, hdrname, NULL, AP_CACHE_REMOVE);
   }
  -ap_status_t ap_cache_el_header_clear(ap_cache_el *el)
  +apr_status_t ap_cache_el_header_clear(ap_cache_el *el)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_reset);
       return el->cache->meth.cache_el_reset(el, AP_CACHE_HEADER);
   }
  -ap_status_t ap_cache_el_data(ap_cache_el *el, BUFF **b)
  +apr_status_t ap_cache_el_data(ap_cache_el *el, BUFF **b)
   {
       if(!b || !el) return APR_BADARG;
       *b = NULL;
       VERIFY_IMPL(el->cache, cache_el_data);
       return el->cache->meth.cache_el_data(el, b);
   }
  -ap_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data)
  +apr_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data)
   {
       BUFF *place;
       char buffer[HUGE_STRING_LEN];
  -    ap_status_t ret = APR_SUCCESS;
  -    ap_ssize_t nbytes, i, o;
  +    apr_status_t ret = APR_SUCCESS;
  +    apr_ssize_t nbytes, i, o;
       
       if((ret = ap_cache_el_data(el, &place)) != APR_SUCCESS) return ret;
       while(ap_bread(data, buffer, HUGE_STRING_LEN, &nbytes) == APR_SUCCESS && nbytes) {
  @@ -147,13 +147,13 @@
       }    
       return ret;
   }
  -ap_status_t ap_cache_el_data_clear(ap_cache_el *el)
  +apr_status_t ap_cache_el_data_clear(ap_cache_el *el)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_reset);
       return el->cache->meth.cache_el_reset(el, AP_CACHE_DATA);
   }
  -ap_status_t ap_cache_el_finalize(ap_cache_el *el)
  +apr_status_t ap_cache_el_finalize(ap_cache_el *el)
   {
       if(!el) return APR_BADARG;
       VERIFY_IMPL(el->cache, cache_el_final);
  @@ -161,6 +161,6 @@
   }
   
   /* hooks */
  -AP_IMPLEMENT_HOOK_RUN_FIRST(ap_status_t, cache_init, (ap_cache_handle_t **h, const char *desc, server_rec *s),
  +AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, cache_init, (ap_cache_handle_t **h, const char *desc, server_rec *s),
                            (h, desc, s), APR_ENOTIMPL)
   
  
  
  
  1.18      +16 -16    apache-2.0/src/ap/ap_hooks.c
  
  Index: ap_hooks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_hooks.c	2000/05/27 22:40:19	1.17
  +++ ap_hooks.c	2000/08/02 05:25:22	1.18
  @@ -3,10 +3,10 @@
   #include <assert.h>
   
   #if 0
  -#define ap_palloc(pool,size)	malloc(size)
  +#define apr_palloc(pool,size)	malloc(size)
   #endif
   
  -API_VAR_EXPORT ap_pool_t *ap_global_hook_pool = NULL;
  +API_VAR_EXPORT apr_pool_t *ap_global_hook_pool = NULL;
   API_VAR_EXPORT int ap_debug_module_hooks = FALSE;
   API_VAR_EXPORT const char *ap_debug_module_name = NULL;
   
  @@ -36,15 +36,15 @@
       return a->nOrder-b->nOrder;
   }
   
  -static TSort *prepare(ap_pool_t *p,TSortData *pItems,int nItems)
  +static TSort *prepare(apr_pool_t *p,TSortData *pItems,int nItems)
   {
  -    TSort *pData=ap_palloc(p,nItems*sizeof *pData);
  +    TSort *pData=apr_palloc(p,nItems*sizeof *pData);
       int n;
       
       qsort(pItems,nItems,sizeof *pItems,crude_order);
       for(n=0 ; n < nItems ; ++n) {
   	pData[n].nPredecessors=0;
  -	pData[n].ppPredecessors=ap_pcalloc(p,nItems*sizeof *pData[n].ppPredecessors);
  +	pData[n].ppPredecessors=apr_pcalloc(p,nItems*sizeof *pData[n].ppPredecessors);
   	pData[n].pNext=NULL;
   	pData[n].pData=&pItems[n];
       }
  @@ -115,23 +115,23 @@
       return pHead;
   }
   
  -static ap_array_header_t *sort_hook(ap_array_header_t *pHooks,const char *szName)
  +static apr_array_header_t *sort_hook(apr_array_header_t *pHooks,const char *szName)
   {
  -    ap_pool_t *p;
  +    apr_pool_t *p;
       TSort *pSort;
  -    ap_array_header_t *pNew;
  +    apr_array_header_t *pNew;
       int n;
   
  -    ap_create_pool(&p, ap_global_hook_pool);
  +    apr_create_pool(&p, ap_global_hook_pool);
       pSort=prepare(p,(TSortData *)pHooks->elts,pHooks->nelts);
       pSort=tsort(pSort,pHooks->nelts);
  -    pNew=ap_make_array(ap_global_hook_pool,pHooks->nelts,sizeof(TSortData));
  +    pNew=apr_make_array(ap_global_hook_pool,pHooks->nelts,sizeof(TSortData));
       if(ap_debug_module_hooks)
   	printf("Sorting %s:",szName);
       for(n=0 ; pSort ; pSort=pSort->pNext,++n) {
   	TSortData *pHook;
   	assert(n < pHooks->nelts);
  -	pHook=ap_push_array(pNew);
  +	pHook=apr_push_array(pNew);
   	memcpy(pHook,pSort->pData,sizeof *pHook);
   	if(ap_debug_module_hooks)
   	    printf(" %s",pHook->szName);
  @@ -141,21 +141,21 @@
       return pNew;
   }
   
  -static ap_array_header_t *s_aHooksToSort;
  +static apr_array_header_t *s_aHooksToSort;
   typedef struct
   {
       const char *szHookName;
  -    ap_array_header_t **paHooks;
  +    apr_array_header_t **paHooks;
   } HookSortEntry;
   
   API_EXPORT(void) ap_hook_sort_register(const char *szHookName,
  -                                      ap_array_header_t **paHooks)
  +                                      apr_array_header_t **paHooks)
   {
       HookSortEntry *pEntry;
   
       if(!s_aHooksToSort)
  -	s_aHooksToSort=ap_make_array(ap_global_hook_pool,1,sizeof(HookSortEntry));
  -    pEntry=ap_push_array(s_aHooksToSort);
  +	s_aHooksToSort=apr_make_array(ap_global_hook_pool,1,sizeof(HookSortEntry));
  +    pEntry=apr_push_array(s_aHooksToSort);
       pEntry->szHookName=szHookName;
       pEntry->paHooks=paHooks;
   }
  
  
  
  1.13      +16 -16    apache-2.0/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ap_sha1.c	2000/07/21 19:50:38	1.12
  +++ ap_sha1.c	2000/08/02 05:25:23	1.13
  @@ -120,11 +120,11 @@
   #define SHA_BLOCKSIZE           64
   
   #ifdef CHARSET_EBCDIC
  -static ap_xlate_t *ebcdic2ascii_xlate;
  +static apr_xlate_t *ebcdic2ascii_xlate;
   
  -API_EXPORT(ap_status_t) ap_SHA1InitEBCDIC(ap_xlate_t *x)
  +API_EXPORT(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       int onoff;
   
       /* Only single-byte conversion is supported.
  @@ -147,7 +147,7 @@
   static void sha_transform(AP_SHA1_CTX *sha_info)
   {
       int i;
  -    ap_uint32_t temp, A, B, C, D, E, W[80];
  +    apr_uint32_t temp, A, B, C, D, E, W[80];
   
       for (i = 0; i < 16; ++i) {
   	W[i] = sha_info->data[i];
  @@ -219,13 +219,13 @@
   /* change endianness of data */
   
   /* count is the number of bytes to do an endian flip */
  -static void maybe_byte_reverse(ap_uint32_t *buffer, int count)
  +static void maybe_byte_reverse(apr_uint32_t *buffer, int count)
   {
       int i;
       AP_BYTE ct[4], *cp;
   
       if (isLittleEndian()) {	/* do the swap only if it is little endian */
  -	count /= sizeof(ap_uint32_t);
  +	count /= sizeof(apr_uint32_t);
   	cp = (AP_BYTE *) buffer;
   	for (i = 0; i < count; ++i) {
   	    ct[0] = cp[0];
  @@ -236,7 +236,7 @@
   	    cp[1] = ct[2];
   	    cp[2] = ct[1];
   	    cp[3] = ct[0];
  -	    cp += sizeof(ap_uint32_t);
  +	    cp += sizeof(apr_uint32_t);
   	}
       }
   }
  @@ -263,11 +263,11 @@
   {
       unsigned int i;
   
  -    if ((sha_info->count_lo + ((ap_uint32_t) count << 3)) < sha_info->count_lo) {
  +    if ((sha_info->count_lo + ((apr_uint32_t) count << 3)) < sha_info->count_lo) {
   	++sha_info->count_hi;
       }
  -    sha_info->count_lo += (ap_uint32_t) count << 3;
  -    sha_info->count_hi += (ap_uint32_t) count >> 29;
  +    sha_info->count_lo += (apr_uint32_t) count << 3;
  +    sha_info->count_hi += (apr_uint32_t) count >> 29;
       if (sha_info->local) {
   	i = SHA_BLOCKSIZE - sha_info->local;
   	if (i > count) {
  @@ -302,13 +302,13 @@
   #ifdef CHARSET_EBCDIC
       int i;
       const AP_BYTE *buffer = (const AP_BYTE *) buf;
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_size_t inbytes_left, outbytes_left;
   
  -    if ((sha_info->count_lo + ((ap_uint32_t) count << 3)) < sha_info->count_lo) {
  +    if ((sha_info->count_lo + ((apr_uint32_t) count << 3)) < sha_info->count_lo) {
   	++sha_info->count_hi;
       }
  -    sha_info->count_lo += (ap_uint32_t) count << 3;
  -    sha_info->count_hi += (ap_uint32_t) count >> 29;
  +    sha_info->count_lo += (apr_uint32_t) count << 3;
  +    sha_info->count_hi += (apr_uint32_t) count >> 29;
       /* Is there a remainder of the previous Update operation? */
       if (sha_info->local) {
   	i = SHA_BLOCKSIZE - sha_info->local;
  @@ -354,7 +354,7 @@
                                AP_SHA1_CTX *sha_info)
   {
       int count, i, j;
  -    ap_uint32_t lo_bit_count, hi_bit_count, k;
  +    apr_uint32_t lo_bit_count, hi_bit_count, k;
   
       lo_bit_count = sha_info->count_lo;
       hi_bit_count = sha_info->count_hi;
  @@ -400,7 +400,7 @@
       ap_SHA1Final(digest, &context);
   
       /* private marker. */
  -    ap_cpystrn(out, AP_SHA1PW_ID, AP_SHA1PW_IDLEN + 1);
  +    apr_cpystrn(out, AP_SHA1PW_ID, AP_SHA1PW_IDLEN + 1);
   
       /* SHA1 hash is always 20 chars */
       l = ap_base64encode_binary(out + AP_SHA1PW_IDLEN, digest, sizeof(digest));
  
  
  
  1.2       +2 -2      apache-2.0/src/docs/new_features_2_0.html
  
  Index: new_features_2_0.html
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/docs/new_features_2_0.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- new_features_2_0.html	2000/03/10 16:52:08	1.1
  +++ new_features_2_0.html	2000/08/02 05:25:25	1.2
  @@ -1,10 +1,10 @@
   <pre>
   Changes with Apache 2.0-dev
     
  -  *) ap_send{,v}, ap_recv, ap_sendfile API clarification --
  +  *) apr_send{,v}, apr_recv, ap_sendfile API clarification --
        bytes_read/bytes_written is always valid (never -1).  Plus
        some fixes to buff.c to correct problems introduced by the
  -     errno => ap_status_t changes a while back.  Plus a fix to
  +     errno => apr_status_t changes a while back.  Plus a fix to
        chunked encoding introduced right at the beginning of 2.0.
        [Dean Gaudet]
   
  
  
  
  1.7       +1 -1      apache-2.0/src/include/ap_base64.h
  
  Index: ap_base64.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_base64.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ap_base64.h	2000/07/26 05:00:20	1.6
  +++ ap_base64.h	2000/08/02 05:25:26	1.7
  @@ -51,7 +51,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - * The ap_vsnprintf/ap_snprintf functions are based on, and used with the
  + * The apr_vsnprintf/apr_snprintf functions are based on, and used with the
    * permission of, the  SIO stdio-replacement strx_* functions by Panos
    * Tsirigotis <panos@alumni.cs.colorado.edu> for xinetd.
    */
  
  
  
  1.4       +46 -46    apache-2.0/src/include/ap_cache.h
  
  Index: ap_cache.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_cache.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_cache.h	2000/07/31 18:20:34	1.3
  +++ ap_cache.h	2000/08/02 05:25:26	1.4
  @@ -84,26 +84,26 @@
    *         for this client.
    * @param  Current server_rec, this will be used for retreiving configuration, 
    *         and various other necesar server pieces.
  - * @deffunc ap_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *r);
  + * @deffunc apr_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *r);
    */
  -ap_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *r);
  +apr_status_t ap_cache_init(ap_cache_handle_t **h, const char *desc, server_rec *r);
   
   /**
    * This function will finalize a cache_handle, after this call the handle will
    * no longer be usable.
    * @param  The handle to close
  - * @deffunc ap_status_t ap_cache_close(ap_cache_handle_t *);
  + * @deffunc apr_status_t ap_cache_close(ap_cache_handle_t *);
    */
  -ap_status_t ap_cache_close(ap_cache_handle_t *);
  +apr_status_t ap_cache_close(ap_cache_handle_t *);
   
   /**
    * Force a garbage collection of the cache_handle, the client should call this periodically,
    * the caching module will not do this on its own, however it isn't required to actually 
    * garbage collect anything, and may defer the call until later.
    * @param  The handle to force a garbage collection.
  - * @deffunc ap_status_t ap_cache_garbage_collect(ap_cache_handle_t *h);
  + * @deffunc apr_status_t ap_cache_garbage_collect(ap_cache_handle_t *h);
    */
  -ap_status_t ap_cache_garbage_collect(ap_cache_handle_t *h);
  +apr_status_t ap_cache_garbage_collect(ap_cache_handle_t *h);
   
   /* B) insertion and query into database */
   /**
  @@ -114,9 +114,9 @@
    * @param  The cache to search in.
    * @param  The name of the record you are looking for
    * @param  Where to put the cache element if a seek succeeds.
  - * @deffunc ap_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **);
  + * @deffunc apr_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **);
    */
  -ap_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **);
  +apr_status_t ap_cache_seek(ap_cache_handle_t *h, const char *name, ap_cache_el **);
   
   /**
    * Create a new element inside of a cache, you must call this first function to put 
  @@ -128,9 +128,9 @@
    * @param  The cache to create this element in.
    * @param  The name to give this new record
    * @param  Where to put this new element. 
  - * @deffunc ap_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **);
  + * @deffunc apr_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **);
    */
  -ap_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **);
  +apr_status_t ap_cache_create(ap_cache_handle_t *h, const char *name, ap_cache_el **);
   
   /**
    * Remove a record from a cache. This call will fail if the requested element
  @@ -139,9 +139,9 @@
    * element is no longer locked.
    * @param  The cache to remove this record from.
    * @param  The name of the record to remove from the cache.
  - * @deffunc ap_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name);
  + * @deffunc apr_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name);
    */
  -ap_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name);
  +apr_status_t ap_cache_remove(ap_cache_handle_t *h, const char *name);
   
   /* (C) Works on an actual element */
   
  @@ -151,9 +151,9 @@
    * @param  A previously ap-cache_seek()'d or ap_cache_create()'d element.
    * @param  Header name looking to retrieve, must be null terminated.
    * @param  Where to put the value
  - * @deffunc ap_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val);
  + * @deffunc apr_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val);
    */
  -ap_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val);
  +apr_status_t ap_cache_el_header(ap_cache_el *el, const char *hdr, char **val);
   
   /**
    * Walk through all the headers for given values. This function is synonymous with 
  @@ -166,19 +166,19 @@
    * @param  User defined data passed back to the callback as argument 1.
    * @param  NULL terminated list of headers to walk through. If the first value 
    *         of this list is NULL then ALL element will be walked over.
  - * @deffunc ap_status_t ap_cache_el_header_walk(ap_cache_el *el, 
  + * @deffunc apr_status_t ap_cache_el_header_walk(ap_cache_el *el, 
    *                                 int (*comp)(void *, const char *, const char *), void *rec, ...);
    */
  -ap_status_t ap_cache_el_header_walk(ap_cache_el *el, 
  +apr_status_t ap_cache_el_header_walk(ap_cache_el *el, 
                                       int (*comp)(void *, const char *, const char *), void *rec, ...);
   
   /**
  - * This will merge an existing ap_table_t into a cache_el's header section.
  + * This will merge an existing apr_table_t into a cache_el's header section.
    * @param  The cache element to merge onto.
  - * @param  The filled in ap_table_t to merge in.
  - * @deffunc ap_status_t ap_cache_el_header_merge(ap_cache_el *el, ap_table_t *tbl);
  + * @param  The filled in apr_table_t to merge in.
  + * @deffunc apr_status_t ap_cache_el_header_merge(ap_cache_el *el, apr_table_t *tbl);
    */
  -ap_status_t ap_cache_el_header_merge(ap_cache_el *el, ap_table_t *tbl);
  +apr_status_t ap_cache_el_header_merge(ap_cache_el *el, apr_table_t *tbl);
   
   /**
    * This will set the current value of a header name to a given value. Using this function
  @@ -186,9 +186,9 @@
    * @param  The cache element to modify
    * @param  The name of the header to change
    * @param  The value to assign to the given name.
  - * @deffunc ap_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname, const char *hdrval);
  + * @deffunc apr_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname, const char *hdrval);
    */
  -ap_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname, const char *hdrval);
  +apr_status_t ap_cache_el_header_set(ap_cache_el *el, const char *hdrname, const char *hdrval);
   
   /**
    * Each header may have more than one value, you may call this function repeatedly and it will
  @@ -197,26 +197,26 @@
    * @param  The cache element to add to
    * @param  The name of the header to append values to.
    * @param  The value to append to the given header name.
  - * @deffunc ap_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname, const char *hdrval);
  + * @deffunc apr_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname, const char *hdrval);
    */
  -ap_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname, const char *hdrval);
  +apr_status_t ap_cache_el_header_add(ap_cache_el *el, const char *hdrname, const char *hdrval);
   
   /**
    * This will remove all headers of a given name.
    * @param  The cache element to remove headers from
    * @param  The name of the header to remove. This will remove ALL values assigned to this
    *         header (via the ap_cache_el_header_add call).
  - * @deffunc ap_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdr);
  + * @deffunc apr_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdr);
    */
  -ap_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdr);
  +apr_status_t ap_cache_el_header_remove(ap_cache_el *el, const char *hdr);
   
   /**
    * This will clear out an entire header section. You may use this if you are intending
    * to change the entire value of the header section of a cache element.
    * @param  The element to clear 
  - * @deffunc ap_status_t ap_cache_el_header_clear(ap_cache_el *el);
  + * @deffunc apr_status_t ap_cache_el_header_clear(ap_cache_el *el);
    */
  -ap_status_t ap_cache_el_header_clear(ap_cache_el *el);
  +apr_status_t ap_cache_el_header_clear(ap_cache_el *el);
   
   /* (E) Works on the data section */
   /**
  @@ -228,9 +228,9 @@
    *         will be a normal buff that will either write to a network, or disk - but
    *         you should not rely on it going anywhere in a caching module as the destination
    *         for all data is opaque.
  - * @deffunc ap_status_t ap_cache_el_data(ap_cache_el *el, BUFF **);
  + * @deffunc apr_status_t ap_cache_el_data(ap_cache_el *el, BUFF **);
    */
  -ap_status_t ap_cache_el_data(ap_cache_el *el, BUFF **);
  +apr_status_t ap_cache_el_data(ap_cache_el *el, BUFF **);
   
   /**
    * Convenience function to put an existing BUFF into a cache_el's data section. This
  @@ -238,17 +238,17 @@
    * to another.
    * @param  The element to append to
    * @param  An existing BUFF to append onto the ap_cache_el's stream of data.
  - * @deffunc ap_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data);
  + * @deffunc apr_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data);
    */
  -ap_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data);
  +apr_status_t ap_cache_el_data_append(ap_cache_el *el, BUFF *data);
   
   /**
    * Clear the data section of an existing cache_el. You may use this if you are 
    * intending to change the entire value of the data section of a cache element.
    * @param  The element to clear
  - * @deffunc ap_status_t ap_cache_el_data_clear(ap_cache_el *el);
  + * @deffunc apr_status_t ap_cache_el_data_clear(ap_cache_el *el);
    */
  -ap_status_t ap_cache_el_data_clear(ap_cache_el *el);
  +apr_status_t ap_cache_el_data_clear(ap_cache_el *el);
   
   /**
    * This will complete an open element. When you are done working on a caching
  @@ -260,9 +260,9 @@
    * @param  The element to finalize, after calling this function the caching
    *         element is no longer valid and you must ap_cache_seek for it again if
    *         you want to make any further changes to it.
  - * @deffunc ap_status_t ap_cache_el_finalize(ap_cache_el *el);
  + * @deffunc apr_status_t ap_cache_el_finalize(ap_cache_el *el);
    */
  -ap_status_t ap_cache_el_finalize(ap_cache_el *el);
  +apr_status_t ap_cache_el_finalize(ap_cache_el *el);
   
   /* ****************************************************************************/
   /* ****************************************************************************/
  @@ -277,7 +277,7 @@
    * passed into ap_cache_init. If your cache wants to reject a hook call return 
    * APR_ENOTIMPL from your hook and the next caching module will be tried.
    */
  -AP_DECLARE_HOOK(ap_status_t, cache_init, (ap_cache_handle_t **, const char *desc, server_rec *t))
  +AP_DECLARE_HOOK(apr_status_t, cache_init, (ap_cache_handle_t **, const char *desc, server_rec *t))
   
   /* These are various enum's passed into call back functions (as defined below) */
   typedef enum { AP_CACHE_SEEK, AP_CACHE_CREATE, AP_CACHE_CHANGE, AP_CACHE_REMOVE } ap_cache_query;
  @@ -289,23 +289,23 @@
    */
   typedef struct ap_cache_methods 
   {
  -    ap_status_t (*cache_close)(ap_cache_handle_t *h);
  -    ap_status_t (*cache_garbage_coll)(ap_cache_handle_t *h);
  -    ap_status_t (*cache_element)(ap_cache_handle_t *h, const char *name, ap_cache_el **,
  +    apr_status_t (*cache_close)(ap_cache_handle_t *h);
  +    apr_status_t (*cache_garbage_coll)(ap_cache_handle_t *h);
  +    apr_status_t (*cache_element)(ap_cache_handle_t *h, const char *name, ap_cache_el **,
                                    ap_cache_query flag);
  -    ap_status_t (*cache_el_header_walk)(ap_cache_el *el, 
  +    apr_status_t (*cache_el_header_walk)(ap_cache_el *el, 
                                        int (*comp)(void *, const char *, const char *), void *rec, va_list);
  -    ap_status_t (*cache_el_hdr)(ap_cache_el *el, const char *name, const char *val, ap_cache_query flag);
  -    ap_status_t (*cache_el_data)(ap_cache_el *el, BUFF **);
  -    ap_status_t (*cache_el_reset)(ap_cache_el *, ap_cache_part flag);
  -    ap_status_t (*cache_el_final)(ap_cache_el *el);
  +    apr_status_t (*cache_el_hdr)(ap_cache_el *el, const char *name, const char *val, ap_cache_query flag);
  +    apr_status_t (*cache_el_data)(ap_cache_el *el, BUFF **);
  +    apr_status_t (*cache_el_reset)(ap_cache_el *, ap_cache_part flag);
  +    apr_status_t (*cache_el_final)(ap_cache_el *el);
   } ap_cache_methods;
   /* This is declared here because modules need to fill this in, however
    *  clients of the library should NEVER use this 
    */
   struct ap_cache_handle_t
   {
  -    ap_pool_t *pool;    /* pool for alloc's */
  +    apr_pool_t *pool;    /* pool for alloc's */
       server_rec *server; /* access to configurations, used on init */
       ap_cache_methods meth;
   };
  
  
  
  1.22      +9 -9      apache-2.0/src/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_hooks.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ap_hooks.h	2000/07/29 15:57:49	1.21
  +++ ap_hooks.h	2000/08/02 05:25:26	1.22
  @@ -57,7 +57,7 @@
   
   #include "ap_config.h"
   
  -/* For ap_array_header_t */
  +/* For apr_array_header_t */
   #include "apr_lib.h"
   
   /**
  @@ -82,7 +82,7 @@
   static struct { members } _hooks;
   
   #define AP_HOOK_LINK(name) \
  -    ap_array_header_t *link_##name;
  +    apr_array_header_t *link_##name;
   
   #define AP_IMPLEMENT_HOOK_BASE(name) \
   API_EXPORT(void) ap_hook_##name(HOOK_##name *pf,const char * const *aszPre, \
  @@ -91,10 +91,10 @@
       LINK_##name *pHook; \
       if(!_hooks.link_##name) \
   	{ \
  -	_hooks.link_##name=ap_make_array(ap_global_hook_pool,1,sizeof(LINK_##name)); \
  +	_hooks.link_##name=apr_make_array(ap_global_hook_pool,1,sizeof(LINK_##name)); \
   	ap_hook_sort_register(#name,&_hooks.link_##name); \
   	} \
  -    pHook=ap_push_array(_hooks.link_##name); \
  +    pHook=apr_push_array(_hooks.link_##name); \
       pHook->pFunc=pf; \
       pHook->aszPredecessors=aszPre; \
       pHook->aszSuccessors=aszSucc; \
  @@ -180,20 +180,20 @@
   
   /**
    * The global pool used to allocate any memory needed by the hooks.
  - * @defvar ap_pool_t *ap_global_hook_pool
  + * @defvar apr_pool_t *ap_global_hook_pool
    */ 
  -extern API_VAR_EXPORT ap_pool_t *ap_global_hook_pool;
  +extern API_VAR_EXPORT apr_pool_t *ap_global_hook_pool;
   
   /**
    * A global variable to determine if debugging information about the
    * hooks functions should be printed
  - * @defvar ap_pool_t *ap_debug_module_hooks
  + * @defvar apr_pool_t *ap_debug_module_hooks
    */ 
   extern API_VAR_EXPORT int ap_debug_module_hooks;
   
   /**
    * The name of the module that is currently registering a function
  - * @defvar ap_pool_t *ap_debug_module_name
  + * @defvar apr_pool_t *ap_debug_module_name
    */ 
   extern API_VAR_EXPORT const char *ap_debug_module_name;
   
  @@ -204,7 +204,7 @@
    * @deffunc void ap_hook_sort_register(const char *szHookName, ap_arry_header_t **aHooks)
    */
   API_EXPORT(void) ap_hook_sort_register(const char *szHookName, 
  -                                      ap_array_header_t **aHooks);
  +                                      apr_array_header_t **aHooks);
   /**
    * Sort all of the registerd functions for a given hook
    * @deffunc void ap_sort_hooks(void)
  
  
  
  1.22      +33 -33    apache-2.0/src/include/ap_iol.h
  
  Index: ap_iol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ap_iol.h	2000/07/29 17:43:01	1.21
  +++ ap_iol.h	2000/08/02 05:25:26	1.22
  @@ -58,7 +58,7 @@
   #define AP_IOL_H
   
   #include "apr_general.h" /* For ap_s?size_t */
  -#include "apr_errno.h" /* For ap_status_t and the APR_errnos */
  +#include "apr_errno.h" /* For apr_status_t and the APR_errnos */
   
   typedef struct ap_iol ap_iol;
   typedef struct ap_iol_methods ap_iol_methods;
  @@ -109,19 +109,19 @@
    */
   
   struct ap_iol_methods {
  -    ap_status_t (*close)(ap_iol *fd);
  -    ap_status_t (*write)(ap_iol *fd, const char *buf, ap_size_t len,
  -                         ap_ssize_t *nbytes);
  -    ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, ap_size_t nvec,
  -                          ap_ssize_t *nbytes);
  -    ap_status_t (*read)(ap_iol *fd, char *buf, ap_size_t len,
  -                        ap_ssize_t *nbytes);
  -    ap_status_t (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
  -    ap_status_t (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
  -    ap_status_t (* sendfile)(ap_iol *fd, ap_file_t * file, ap_hdtr_t * hdtr, 
  -                             ap_off_t * offset, ap_size_t * len, 
  -                             ap_int32_t flags);
  -    ap_status_t (*shutdown)(ap_iol *fd, int how);
  +    apr_status_t (*close)(ap_iol *fd);
  +    apr_status_t (*write)(ap_iol *fd, const char *buf, apr_size_t len,
  +                         apr_ssize_t *nbytes);
  +    apr_status_t (*writev)(ap_iol *fd, const struct iovec *vec, apr_size_t nvec,
  +                          apr_ssize_t *nbytes);
  +    apr_status_t (*read)(ap_iol *fd, char *buf, apr_size_t len,
  +                        apr_ssize_t *nbytes);
  +    apr_status_t (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
  +    apr_status_t (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
  +    apr_status_t (* sendfile)(ap_iol *fd, apr_file_t * file, apr_hdtr_t * hdtr, 
  +                             apr_off_t * offset, apr_size_t * len, 
  +                             apr_int32_t flags);
  +    apr_status_t (*shutdown)(ap_iol *fd, int how);
       /* TODO: accept, connect, ... */
   };
   
  @@ -138,14 +138,14 @@
    * a file IOL does not support sendfile or shutdown, so those function pointers
    * are NULL.
    * <PRE>
  - * ap_status_t (*close)(ap_iol *fd);
  - * ap_status_t (*write)(ap_iol *fd, const char *buf, ap_size_t len, ap_ssize_t *nbytes);
  - * ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes);
  - * ap_status_t (*read)(ap_iol *fd, char *buf, ap_size_t len, ap_ssize_t *nbytes);
  - * ap_status_t (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
  - * ap_status_t (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
  - * ap_status_t (* sendfile)(ap_iol *fd, ap_file_t *file, ap_hdtr_t *hdtr, ap_off_t *offset, ap_size_t *len, ap_int32_t flags);
  - * ap_status_t (*shutdown)(ap_iol *fd, int how);
  + * apr_status_t (*close)(ap_iol *fd);
  + * apr_status_t (*write)(ap_iol *fd, const char *buf, apr_size_t len, apr_ssize_t *nbytes);
  + * apr_status_t (*writev)(ap_iol *fd, const struct iovec *vec, apr_size_t nvec, apr_ssize_t *nbytes);
  + * apr_status_t (*read)(ap_iol *fd, char *buf, apr_size_t len, apr_ssize_t *nbytes);
  + * apr_status_t (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
  + * apr_status_t (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
  + * apr_status_t (* sendfile)(ap_iol *fd, apr_file_t *file, apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len, apr_int32_t flags);
  + * apr_status_t (*shutdown)(ap_iol *fd, int how);
    * </PRE>
    */
   struct ap_iol {
  @@ -155,7 +155,7 @@
   /**
    * Macro to close the specified iol
    * @param iol The iol to close
  - * @deffunc ap_status_t iol_close(ap_iol *iol)
  + * @deffunc apr_status_t iol_close(ap_iol *iol)
    */
   #define iol_close(iol)	((iol)->methods->close((iol)))
   /**
  @@ -166,7 +166,7 @@
    * @param nbytes The number of bytes actually written
    * @tip This function is not garuanteed to write the whole buffer.  It will
    * return APR_SUCCESS if any bytes were written without errors.
  - * @deffunc ap_status_t iol_write(ap_iol *iol, const char *buf, ap_size_t len, ap_ssize_t *nbytes)
  + * @deffunc apr_status_t iol_write(ap_iol *iol, const char *buf, apr_size_t len, apr_ssize_t *nbytes)
    */
   #define iol_write(iol, a, b, c) ((iol)->methods->write((iol), (a), (b), (c)))
   /**
  @@ -177,7 +177,7 @@
    * @param nbytes The number of bytes actually written
    * @tip This function is not garuanteed to write the whole buffer.  It will
    * return APR_SUCCESS if any bytes were written without errors.
  - * @deffunc ap_status_t iol_writev(ap_iol *iol, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes)
  + * @deffunc apr_status_t iol_writev(ap_iol *iol, const struct iovec *vec, apr_size_t nvec, apr_ssize_t *nbytes)
    */
   #define iol_writev(iol, a, b, c) ((iol)->methods->writev((iol), (a), (b), (c)))
   /**
  @@ -188,7 +188,7 @@
    * @param nbytes The number of bytes actually read
    * @tip This function is not garuanteed to read the number of bytes specified.
    * It will return APR_SUCCESS if any bytes were written without errors.
  - * @deffunc ap_status_t iol_read(ap_iol *iol, char *buf, ap_size_t len, ap_ssize_t *nbytes)
  + * @deffunc apr_status_t iol_read(ap_iol *iol, char *buf, apr_size_t len, apr_ssize_t *nbytes)
    */
   #define iol_read(iol, a, b, c) ((iol)->methods->read((iol), (a), (b), (c)))
   /**
  @@ -199,7 +199,7 @@
    * @tip Currently, the only option recognized is AP_IOL_TIMEOUT.  This sets
    * the timeout value for all read/write operations.  The value should be
    * specified in seconds.
  - * @deffunc ap_status_t iol_setopt(ap_iol *iol, ap_iol_option opt, const void *value)
  + * @deffunc apr_status_t iol_setopt(ap_iol *iol, ap_iol_option opt, const void *value)
    */
   #define iol_setopt(iol, a, b) ((iol)->methods->setopt((iol), (a), (b)))
   /**
  @@ -210,7 +210,7 @@
    * @tip Currently, the only option recognized is AP_IOL_TIMEOUT.  This gets
    * the current timeout value for all read/write operations.  The value 
    * is specified in seconds.
  - * @deffunc ap_status_t iol_setopt(ap_iol *iol, ap_iol_option opt, void *value)
  + * @deffunc apr_status_t iol_setopt(ap_iol *iol, ap_iol_option opt, void *value)
    */
   #define iol_getopt(iol, a, b) ((iol)->methods->getopt((iol), (a), (b)))
   /**
  @@ -221,14 +221,14 @@
    * @param offset Place in the file to start sending the file
    * @param len The amount of the file to send
    * @param flags Flags mapped to OS specific flags.
  - * @deffunc ap_status_t iol_sendfile(ap_iol *iol, ap_file_t *file, ap_hdtr_t *hdtr, ap_off_t *offset, ap_size_t *len, ap_int32_t flags)
  + * @deffunc apr_status_t iol_sendfile(ap_iol *iol, apr_file_t *file, apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len, apr_int32_t flags)
    */
   #define iol_sendfile(iol, a, b, c, d, e) ((iol)->methods->sendfile((iol), (a), (b), (c), (d), (e)))
   /**
    * Macro to shutdown a given iol
    * @param iol The iol to shutdown
    * @param how How to shutdown the iol.
  - * @deffunc ap_status_t iol_shutdown(ap_iol *iol, int how)
  + * @deffunc apr_status_t iol_shutdown(ap_iol *iol, int how)
    */
   #define iol_shutdown(iol, a) ((iol)->methods->shutdown((iol), (a)))
   
  @@ -237,15 +237,15 @@
    * Create an iol out of a file structure
    * @param file The file to insert into the iol
    */
  -ap_iol *ap_create_file_iol(ap_file_t *file);
  +ap_iol *ap_create_file_iol(apr_file_t *file);
   
   /* the socket iol */
   /**
    * Create an iol out of a socket structure
    * @param The pool to allocate the iol structure out of
    * @param sock The socket to insert into the iol
  - * @deffunc ap_iol *ap_iol_attach_socket(ap_pool_t *p, ap_socket_t *sock)
  + * @deffunc ap_iol *ap_iol_attach_socket(apr_pool_t *p, apr_socket_t *sock)
    */
  -API_EXPORT(ap_iol *) ap_iol_attach_socket(ap_pool_t *p, ap_socket_t *sock);
  +API_EXPORT(ap_iol *) ap_iol_attach_socket(apr_pool_t *p, apr_socket_t *sock);
   
   #endif
  
  
  
  1.18      +1 -1      apache-2.0/src/include/ap_listen.h
  
  Index: ap_listen.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_listen.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_listen.h	2000/07/29 18:23:38	1.17
  +++ ap_listen.h	2000/08/02 05:25:27	1.18
  @@ -77,7 +77,7 @@
       /**
        * The actual socket 
        */
  -    ap_socket_t *sd;
  +    apr_socket_t *sd;
       /**
        * Is this socket currently active 
        */
  
  
  
  1.6       +9 -9      apache-2.0/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mmn.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_mmn.h	2000/07/29 18:29:12	1.5
  +++ ap_mmn.h	2000/08/02 05:25:27	1.6
  @@ -104,7 +104,7 @@
    *			  short_score split into parent and child pieces
    *			  os_is_absolute_path
    * 19971026 (1.3b3-dev)	- custom config hooks in place
  - * 19980126 (1.3b4-dev)	- ap_cpystrn(), table_addn(), table_setn(),
  + * 19980126 (1.3b4-dev)	- apr_cpystrn(), table_addn(), table_setn(),
    *			  table_mergen()
    * 19980201 (1.3b4-dev)	- construct_url()
    *			  prototype server_rec * -> request_rec *
  @@ -132,7 +132,7 @@
    * 19980324 (1.3b6-dev)	- API_EXPORT(index_of_response)
    * 19980413 (1.3b6-dev)	- The BIG SYMBOL RENAMING: general ap_ prefix
    *			  (see src/include/compat.h for more details)
  - *			  ap_vformatter() API, see src/include/ap.h
  + *			  apr_vformatter() API, see src/include/ap.h
    * 19980507 (1.3b7-dev)	- addition of ap_add_version_component() and
    *			  discontinuation of -DSERVER_SUBVERSION support
    * 19980519 (1.3b7-dev)	- add child_info * to spawn function (as passed to
  @@ -168,7 +168,7 @@
    *			  added limit_req_body to core_dir_config and
    *			  ap_get_limit_req_body() to get its value.
    * 19980812 (1.3.2-dev)	- split off MODULE_MAGIC_NUMBER
  - * 19980812.2           - add ap_overlap_tables()
  + * 19980812.2           - add apr_overlap_tables()
    * 19980816 (1.3.2-dev)	- change proxy to use tables for headers, change
    *                        struct cache_req to typedef cache_req.
    *                        Delete ap_proxy_get_header(), ap_proxy_add_header(),
  @@ -195,7 +195,7 @@
    *                        and added vlist_validator to request_rec.
    * 19990101             - renamed macro escape_uri() to ap_escape_uri()
    *                      - added MODULE_MAGIC_COOKIE to identify module structs
  - * 19990103 (1.3.4-dev) - added ap_array_pstrcat()
  + * 19990103 (1.3.4-dev) - added apr_array_pstrcat()
    * 19990105 (1.3.4-dev) - added ap_os_is_filename_valid()
    * 19990106 (1.3.4-dev) - Move MODULE_MAGIC_COOKIE to the end of the
    *                        STANDARD_MODULE_STUFF macro so the version
  @@ -205,8 +205,8 @@
    *                      - reordered entries in request_rec that were waiting
    *                        for a non-binary-compatible release.
    *          (1.3.5-dev)
  - * 19990108.1           - add ap_MD5Encode() for MD5 password handling.
  - * 19990108.2           - add ap_validate_password() and change ap_MD5Encode()
  + * 19990108.1           - add apr_MD5Encode() for MD5 password handling.
  + * 19990108.2           - add apr_validate_password() and change apr_MD5Encode()
    *                        to use a stronger algorithm.
    * 19990108.4           - add ap_size_list_item(), ap_get_list_item(), and
    *                        ap_find_list_item()
  @@ -242,13 +242,13 @@
    * specified value.
    * <PRE>
    * Useful for testing for features.
  - * For example, suppose you wish to use the ap_overlap_tables
  + * For example, suppose you wish to use the apr_overlap_tables
    *    function.  You can do this:
    * 
    * #if MODULE_MAGIC_AT_LEAST(19980812,2)
  - *     ... use ap_overlap_tables()
  + *     ... use apr_overlap_tables()
    * #else
  - *     ... alternative code which doesn't use ap_overlap_tables()
  + *     ... alternative code which doesn't use apr_overlap_tables()
    * #endif
    * </PRE>
    * @param major The major module magic number
  
  
  
  1.15      +3 -3      apache-2.0/src/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mpm.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_mpm.h	2000/07/29 18:49:51	1.14
  +++ ap_mpm.h	2000/08/02 05:25:27	1.15
  @@ -89,7 +89,7 @@
       However the MPM may choose to terminate processes when the user
       requests a non-graceful restart/stop.  When this occurs, the MPM kills
       all threads with extreme prejudice, and destroys the pchild pool.
  -    User cleanups registered in the pchild ap_pool_t will be invoked at
  +    User cleanups registered in the pchild apr_pool_t will be invoked at
       this point.  (This can pose some complications, the user cleanups
       are asynchronous behaviour not unlike longjmp/signal... but if the
       admin is asking for a non-graceful shutdown, how much effort should
  @@ -113,9 +113,9 @@
    * @param plog the log pool, reset after the config file is read
    * @param server_conf the global server config.
    * @return 1 for shutdown 0 otherwise.
  - * @deffunc int ap_mpm_run(ap_pool_t *pconf, ap_pool_t *plog, server_rec *server_conf)
  + * @deffunc int ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf)
    */
  -API_EXPORT(int) ap_mpm_run(ap_pool_t *pconf, ap_pool_t *plog, server_rec *server_conf);
  +API_EXPORT(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *server_conf);
   
   /**
    * predicate indicating if a graceful stop has been requested ...
  
  
  
  1.10      +3 -3      apache-2.0/src/include/ap_sha1.h
  
  Index: ap_sha1.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_sha1.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_sha1.h	2000/07/29 19:26:29	1.9
  +++ ap_sha1.h	2000/08/02 05:25:27	1.10
  @@ -90,11 +90,11 @@
       /** 
        * message digest
        */
  -    ap_uint32_t digest[5];
  +    apr_uint32_t digest[5];
       /** 64-bit bit counts */
  -    ap_uint32_t count_lo, count_hi;
  +    apr_uint32_t count_lo, count_hi;
       /** SHA data buffer */
  -    ap_uint32_t data[16];
  +    apr_uint32_t data[16];
       /** unprocessed amount in data */
       int local;
   };
  
  
  
  1.33      +25 -25    apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- buff.h	2000/07/28 01:57:04	1.32
  +++ buff.h	2000/08/02 05:25:28	1.33
  @@ -134,24 +134,24 @@
   
   #ifdef APACHE_XLATE
   typedef struct b_read_ops {
  -    ap_status_t (*bread)(BUFF *, void *, ap_size_t, ap_ssize_t *);
  +    apr_status_t (*bread)(BUFF *, void *, apr_size_t, apr_ssize_t *);
   } b_read_ops;
   
   typedef struct b_write_ops {
  -    ap_status_t (*bwrite)(BUFF *, const void *, ap_size_t, ap_ssize_t *);
  +    apr_status_t (*bwrite)(BUFF *, const void *, apr_size_t, apr_ssize_t *);
   } b_write_ops;
   #endif
   
   struct buff_struct {
       int flags;			/* flags */
  -    ap_status_t saved_errno;	/* saved errno */
  -    ap_status_t berrno;         /* errno for the functions that don't return
  -                                   an ap_status_t. This is separate from
  +    apr_status_t saved_errno;	/* saved errno */
  +    apr_status_t berrno;         /* errno for the functions that don't return
  +                                   an apr_status_t. This is separate from
                                      saved_errno. A broken call, e.g. ap_bgets
                                      on an unbuffered stream, shouldn't change
                                      the saved error from I/O */
       unsigned char *inptr;	/* pointer to next location to read */
  -    ap_ssize_t incnt;		/* number of bytes left to read from input buffer;
  +    apr_ssize_t incnt;		/* number of bytes left to read from input buffer;
   				 * always 0 if had a read error  */
       int outchunk;               /* location of chunk header when chunking */
       int outcnt;			/* number of byte put in output buffer */
  @@ -162,11 +162,11 @@
   				 * keep track of the #remaining bytes in the chunk
   				 * here
   				 */
  -    void (*error) (BUFF *fb, int op, void *data, ap_status_t errnum);
  +    void (*error) (BUFF *fb, int op, void *data, apr_status_t errnum);
       void *error_data;
       long int bytes_sent;	/* number of bytes actually written */
   
  -    ap_pool_t *pool;
  +    apr_pool_t *pool;
   
       ap_iol *iol;
   #ifdef APACHE_XLATE
  @@ -174,10 +174,10 @@
                                    * translation is on */
       b_write_ops b_write_ops;    /* some write operations are replaced when
                                    * translation is on */
  -    ap_xlate_t *write_xlate;    /* translation handle to use on write operations
  +    apr_xlate_t *write_xlate;    /* translation handle to use on write operations
                                    * (or NULL if no translation is to be performed) */
       int write_xlate_sb;         /* flag: is write translation single-byte-only? */
  -    ap_xlate_t *read_xlate;     /* translation handle to use on read operations
  +    apr_xlate_t *read_xlate;     /* translation handle to use on read operations
                                    * (or NULL if no translation is to be performed) */
       char *xbuf;                 /* buffer to use temporarily while translating */
       size_t xbufsize;            /* size of xbuf buffer */
  @@ -208,54 +208,54 @@
   #define BO_ERROR (3)
   #ifdef APACHE_XLATE
   /* BO_WXLATE - translate-charset-on-write setting; if value is NULL, no
  - *             translation is performed; otherwise, value is ap_xlate_t * and
  + *             translation is performed; otherwise, value is apr_xlate_t * and
    *             translation will be performed
    */
   #define BO_WXLATE (4)
   /* BO_RXLATE - translate-charset-on-read setting; if value is NULL, no
  - *             translation is performed; otherwise, value is ap_xlate_t * and
  + *             translation is performed; otherwise, value is apr_xlate_t * and
    *             translation will be performed
    */
   #define BO_RXLATE (5)
   #endif /*APACHE_XLATE*/
   
   /* Stream creation and modification */
  -API_EXPORT(BUFF *) ap_bcreate(ap_pool_t *p, int flags);
  +API_EXPORT(BUFF *) ap_bcreate(apr_pool_t *p, int flags);
   
   API_EXPORT(void) ap_bpush_iol(BUFF *fb, ap_iol *iol);
   API_EXPORT(void) ap_bpop_iol(ap_iol **iol, BUFF *fb);
   
   /* XXX - unused right now - mvsk */
  -API_EXPORT(BUFF *) ap_bopenf(ap_pool_t *a, const char *name, int flg, int mode);
  +API_EXPORT(BUFF *) ap_bopenf(apr_pool_t *a, const char *name, int flg, int mode);
   
  -API_EXPORT(ap_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval);
  -API_EXPORT(ap_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval);
  +API_EXPORT(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval);
  +API_EXPORT(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval);
   API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value);
  -API_EXPORT(ap_status_t) ap_bclose(BUFF *fb);
  +API_EXPORT(apr_status_t) ap_bclose(BUFF *fb);
   
   #define ap_bgetflag(fb, flag)	((fb)->flags & (flag))
   
   /* Error handling */
   API_EXPORT(void) ap_bonerror(BUFF *fb,
  -                             void (*error) (BUFF *, int, void *, ap_status_t),
  +                             void (*error) (BUFF *, int, void *, apr_status_t),
                                void *data);
  -API_EXPORT(ap_status_t) ap_berror(BUFF *fb);
  +API_EXPORT(apr_status_t) ap_berror(BUFF *fb);
   
   /* I/O */
   /* read bytes into the specified buffer.
    * *bytes_read is set to the number of bytes read.  it is possible for
    * bytes to have been read even if an error (or APR_EOF) is returned.
    */
  -API_EXPORT(ap_status_t) ap_bread_core(BUFF *fb, void *buf, ap_size_t nbyte,
  -                                 ap_ssize_t *bytes_read);
  +API_EXPORT(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
  +                                 apr_ssize_t *bytes_read);
   API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
   API_EXPORT(int) ap_blookc(BUFF *fb);
   /* write bytes from the specified buffer.
    * *bytes_written is set to the number of bytes written.  it is possible
    * for both an error to be returned, and bytes to have been written.
    */
  -API_EXPORT(ap_status_t) ap_bwrite_core(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                  ap_ssize_t *bytes_written);
  +API_EXPORT(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                  apr_ssize_t *bytes_written);
   #ifdef APACHE_XLATE
   #define ap_bwrite(fb,buf,nbyte,bytes_written) \
   (fb)->b_write_ops.bwrite(fb,buf,nbyte,bytes_written)
  @@ -268,8 +268,8 @@
   ap_bread_core(fb,buf,nbyte,bytes_read)
   #endif /*APACHE_XLATE*/
       
  -API_EXPORT(ap_status_t) ap_bflush(BUFF *fb);
  -API_EXPORT(ap_status_t) ap_bshutdown(BUFF *fb, int how);
  +API_EXPORT(apr_status_t) ap_bflush(BUFF *fb);
  +API_EXPORT(apr_status_t) ap_bshutdown(BUFF *fb, int how);
   API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
   API_EXPORT_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt,...)
   				__attribute__((format(printf,2,3)));
  
  
  
  1.47      +47 -47    apache-2.0/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- http_config.h	2000/07/30 18:25:46	1.46
  +++ http_config.h	2000/08/02 05:25:28	1.47
  @@ -294,10 +294,10 @@
       ap_directive_t *directive;
   
       /** Pool to allocate new storage in */
  -    ap_pool_t *pool;
  +    apr_pool_t *pool;
       /** Pool for scratch memory; persists during configuration, but 
        *  wiped before the first request is served...  */
  -    ap_pool_t *temp_pool;
  +    apr_pool_t *temp_pool;
       /** Server_rec being configured for */
       server_rec *server;
       /** If configuring for a directory, pathname of that directory.  
  @@ -371,35 +371,35 @@
        *  @param p The pool to use for all allocations.
        *  @param dir The directory currently being processed.
        *  @return The per-directory structure created
  -     *  @deffunc void *create_dir_config(ap_pool_t *p, char *dir)
  +     *  @deffunc void *create_dir_config(apr_pool_t *p, char *dir)
        */
  -    void *(*create_dir_config) (ap_pool_t *p, char *dir);
  +    void *(*create_dir_config) (apr_pool_t *p, char *dir);
       /** Function to allow all modules to merge the per directory configuration
        *  structures for two directories.
        *  @param p The pool to use for all allocations.
        *  @param base_conf The directory structure created for the parent directory.
        *  @param new_conf The directory structure currently being processed.
        *  @return The new per-directory structure created
  -     *  @deffunc void *merge_dir_config(ap_pool_t *p, void *base_conf, void *new_conf)
  +     *  @deffunc void *merge_dir_config(apr_pool_t *p, void *base_conf, void *new_conf)
        */
  -    void *(*merge_dir_config) (ap_pool_t *p, void *base_conf, void *new_conf);
  +    void *(*merge_dir_config) (apr_pool_t *p, void *base_conf, void *new_conf);
       /** Function to allow all modules to create per server configuration
        *  structures.
        *  @param p The pool to use for all allocations.
        *  @param s The server currently being processed.
        *  @return The per-server structure created
  -     *  @deffunc void *create_server_config(ap_pool_t *p, server_rec *dir)
  +     *  @deffunc void *create_server_config(apr_pool_t *p, server_rec *dir)
        */
  -    void *(*create_server_config) (ap_pool_t *p, server_rec *s);
  +    void *(*create_server_config) (apr_pool_t *p, server_rec *s);
       /** Function to allow all modules to merge the per server configuration
        *  structures for two servers.
        *  @param p The pool to use for all allocations.
        *  @param base_conf The directory structure created for the parent directory.
        *  @param new_conf The directory structure currently being processed.
        *  @return The new per-directory structure created
  -     *  @deffunc void *merge_dir_config(ap_pool_t *p, void *base_conf, void *new_conf)
  +     *  @deffunc void *merge_dir_config(apr_pool_t *p, void *base_conf, void *new_conf)
        */
  -    void *(*merge_server_config) (ap_pool_t *p, void *base_conf, void *new_conf);
  +    void *(*merge_server_config) (apr_pool_t *p, void *base_conf, void *new_conf);
   
       /** A command_rec table that describes all of the directives this module
        * defines. */
  @@ -518,9 +518,9 @@
    * it relativizes it wrt server_root.
    * @param p pool to allocate data out of
    * @param fname The file name
  - * @deffunc const char *ap_server_root_relative(ap_pool_t *p, const char *fname)
  + * @deffunc const char *ap_server_root_relative(apr_pool_t *p, const char *fname)
    */
  -API_EXPORT(const char *) ap_server_root_relative(ap_pool_t *p, const char *fname);
  +API_EXPORT(const char *) ap_server_root_relative(apr_pool_t *p, const char *fname);
   
   /* Finally, the hook for dynamically loading modules in... */
   
  @@ -581,13 +581,13 @@
   API_EXPORT(module *) ap_find_linked_module(const char *name);
   
   /**
  - * Open a configfile_t as ap_file_t
  + * Open a configfile_t as apr_file_t
    * @param ret_cfg open configfile_t struct pointer
    * @param p The pool to allocate the structure out of
    * @param name the name of the file to open
  - * @deffunc ap_status_t ap_pcfg_openfile(configfile_t **ret_cfg, ap_pool_t *p, const char *name)
  + * @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
    */
  -API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **, ap_pool_t *p, const char *name);
  +API_EXPORT(apr_status_t) ap_pcfg_openfile(configfile_t **, apr_pool_t *p, const char *name);
   
   /**
    * Allocate a configfile_t handle with user defined functions and params 
  @@ -597,9 +597,9 @@
    * @param getc_func The getch function
    * @param gets_func The getstr function
    * @param close_func The close function
  - * @deffunc configfile_t *ap_pcfg_open_custom(ap_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))
  + * @deffunc configfile_t *ap_pcfg_open_custom(apr_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))
    */
  -API_EXPORT(configfile_t *) ap_pcfg_open_custom(ap_pool_t *p, const char *descr,
  +API_EXPORT(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,
       void *param,
       int(*getc_func)(void*),
       void *(*gets_func) (void *buf, size_t bufsiz, void *param),
  @@ -651,9 +651,9 @@
    * @param curr_parent The current parent node
    * @param orig_directive The directive to read until hit.
    * @return Error string on failure, NULL on success
  - * @deffunc char *ap_build_cont_config(ap_pool_t *p, ap_pool_t *temp_pool, cmd_parms *parms, ap_directive_t **current, ap_directive_t **curr_parent, char *orig_directive)
  + * @deffunc char *ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool, cmd_parms *parms, ap_directive_t **current, ap_directive_t **curr_parent, char *orig_directive)
   */
  -const char * ap_build_cont_config(ap_pool_t *p, ap_pool_t *temp_pool,
  +const char * ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool,
                                           cmd_parms *parms,
                                           ap_directive_t **current,
                                           ap_directive_t **curr_parent,
  @@ -666,11 +666,11 @@
    * @param temp_pool The temporary pool
    * @param conftree Place to store the root node of the config tree
    * @return Error string on erro, NULL otherwise
  - * @deffunc const char *ap_build_config(cmd_parms *parms, ap_pool_t *conf_pool, ap_pool_t *temp_pool, ap_directive_t **conftree)
  + * @deffunc const char *ap_build_config(cmd_parms *parms, apr_pool_t *conf_pool, apr_pool_t *temp_pool, ap_directive_t **conftree)
    */
   API_EXPORT(const char *) ap_build_config(cmd_parms *parms,
  -					 ap_pool_t *conf_pool,
  -					 ap_pool_t *temp_pool,
  +					 apr_pool_t *conf_pool,
  +					 apr_pool_t *temp_pool,
   					 ap_directive_t **conftree);
   
   /**
  @@ -742,7 +742,7 @@
    *  @param s The server to configure for.
    *  @param m The module to configure
    */
  -void ap_single_module_configure(ap_pool_t *p, server_rec *s, module *m);
  +void ap_single_module_configure(apr_pool_t *p, server_rec *s, module *m);
   
   /* For http_main.c... */
   /**
  @@ -773,9 +773,9 @@
    * @param config_name The name of the config file
    * @param conftree Place to store the root of the config tree
    * @return The setup server_rec list.
  - * @deffunc server_rec *ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree)
  + * @deffunc server_rec *ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree)
    */
  -API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);
  +API_EXPORT(server_rec*) ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree);
   
   /**
    * Run all post config hooks for loaded modules.
  @@ -783,9 +783,9 @@
    * @param plog The logging pool
    * @param ptemp The temporary pool
    * @param s The list of server_rec structures
  - * @deffunc void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
  + * @deffunc void ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
    */
  -API_EXPORT(void) ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s);
  +API_EXPORT(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s);
   
   /**
    * Run all rewrite args hooks for loaded modules
  @@ -805,9 +805,9 @@
    * Setup all virtual hosts
    * @param p The pool to allocate out of
    * @param main_server The head of the server_rec list
  - * @deffunc void ap_fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server)
  + * @deffunc void ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
    */
  -API_EXPORT(void) ap_fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server);
  +API_EXPORT(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server);
   
   /* For http_request.c... */
   
  @@ -816,15 +816,15 @@
    * @param p The pool to allocate the config vector out of
    * @return The config vector
    */
  -void *ap_create_request_config(ap_pool_t *p);
  +void *ap_create_request_config(apr_pool_t *p);
   
   /**
    * Setup the config vector for per dir module configs
    * @param p The pool to allocate the config vector out of
    * @return The config vector
  - * @deffunc void *ap_create_per_dir_config(ap_pool_t *p)
  + * @deffunc void *ap_create_per_dir_config(apr_pool_t *p)
    */
  -CORE_EXPORT(void *) ap_create_per_dir_config(ap_pool_t *p);
  +CORE_EXPORT(void *) ap_create_per_dir_config(apr_pool_t *p);
   
   /**
    * Run all of the modules merge per dir config functions
  @@ -832,7 +832,7 @@
    * @param base The base directory config structure
    * @param new The new directory config structure
    */
  -void *ap_merge_per_dir_configs(ap_pool_t *p, void *base, void *new);
  +void *ap_merge_per_dir_configs(apr_pool_t *p, void *base, void *new);
   
   /* For http_connection.c... */
   /**
  @@ -840,7 +840,7 @@
    * @param p The pool to allocate the config vector out of
    * @return The config vector
    */
  -void *ap_create_conn_config(ap_pool_t *p);
  +void *ap_create_conn_config(apr_pool_t *p);
   
   /* For http_core.c... (<Directory> command and virtual hosts) */
   
  @@ -863,9 +863,9 @@
    * @param main_server The main server for this Apache configuration
    * @param ps Place to store the new server_rec
    * return Error string on error, NULL on success
  - * @deffunc const char *ap_init_virtual_host(ap_pool_t *p, const char *hostname, server_rec *main_server, server_rec **ps)
  + * @deffunc const char *ap_init_virtual_host(apr_pool_t *p, const char *hostname, server_rec *main_server, server_rec **ps)
    */
  -CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname,
  +CORE_EXPORT(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
   				server_rec *main_server, server_rec **);
   
   /**
  @@ -877,7 +877,7 @@
    * @param ptem Pool for temporary allocation
    */
   void ap_process_resource_config(server_rec *s, const char *fname, 
  -                 ap_directive_t **conftree, ap_pool_t *p, ap_pool_t *ptemp);
  +                 ap_directive_t **conftree, apr_pool_t *p, apr_pool_t *ptemp);
   
   /**
    * Process all directives in the config tree
  @@ -887,7 +887,7 @@
    * @param ptemp The pool for temporary allocations
    */
   API_EXPORT(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
  -                                        ap_pool_t *p, ap_pool_t *ptemp);
  +                                        apr_pool_t *p, apr_pool_t *ptemp);
   
   
   /* For individual MPMs... */
  @@ -896,7 +896,7 @@
    * @param pchild The pool for child process allocations
    * @param s The list of all server_recs
    */
  -void ap_child_init_hook(ap_pool_t *pchild, server_rec *s);
  +void ap_child_init_hook(apr_pool_t *pchild, server_rec *s);
   
   /* Module-method dispatchers, also for http_request.c */
   /**
  @@ -954,10 +954,10 @@
    * @param pconf The config pool
    * @param plog The logging streams pool
    * @param ptemp The temporary pool
  - * @deffunc void ap_run_pre_config(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp)
  + * @deffunc void ap_run_pre_config(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp)
    */
   AP_DECLARE_HOOK(void,pre_config,
  -	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp))
  +	     (apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp))
   
   /**
    * Run the post_config function for each module
  @@ -965,10 +965,10 @@
    * @param plog The logging streams pool
    * @param ptemp The temporary pool
    * @param s The list of server_recs
  - * @deffunc void ap_run_post_config(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp, server_rec *s)
  + * @deffunc void ap_run_post_config(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp, server_rec *s)
    */
   AP_DECLARE_HOOK(void,post_config,
  -	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
  +	     (apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp,server_rec *s))
   
   /**
    * Run the open_logs functions for each module
  @@ -976,18 +976,18 @@
    * @param plog The logging streams pool
    * @param ptemp The temporary pool
    * @param s The list of server_recs
  - * @deffunc void ap_run_open_logs(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp, server_rec *s)
  + * @deffunc void ap_run_open_logs(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp, server_rec *s)
    */
   AP_DECLARE_HOOK(void,open_logs,
  -	     (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
  +	     (apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp,server_rec *s))
   
   /**
    * Run the child_init functions for each module
    * @param pchild The child pool
    * @param s The list of server_recs in this server 
  - * @deffunc void ap_run_child_init(ap_pool_t *pchild, server_rec *s)
  + * @deffunc void ap_run_child_init(apr_pool_t *pchild, server_rec *s)
    */
  -AP_DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))
  +AP_DECLARE_HOOK(void,child_init,(apr_pool_t *pchild, server_rec *s))
   
   #ifdef __cplusplus
   }
  
  
  
  1.22      +3 -3      apache-2.0/src/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_connection.h	2000/07/31 03:54:20	1.21
  +++ http_connection.h	2000/08/02 05:25:28	1.22
  @@ -76,7 +76,7 @@
    * @param addr The server's local address
    * @param id ID of this connection; unique at any point in time.
    */
  -conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  +conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, BUFF *inout,
   			    const struct sockaddr_in *remaddr,
   			    const struct sockaddr_in *saddr, long id);
   
  @@ -89,8 +89,8 @@
    * @param conn_socket The socket we are creating the connection on.
    * @param id ID of this connection; unique at any point in time.
    */
  -conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  -                                ap_socket_t *conn_socket, long id);
  +conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, BUFF *inout,
  +                                apr_socket_t *conn_socket, long id);
   
   /**
    * This is the protocol module driver.  This calls all of the
  
  
  
  1.22      +7 -7      apache-2.0/src/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_core.h	2000/07/11 00:06:22	1.21
  +++ http_core.h	2000/08/02 05:25:28	1.22
  @@ -131,7 +131,7 @@
   /* Used for constructing self-referencing URLs, and things like SERVER_PORT,
    * and SERVER_NAME.
    */
  -API_EXPORT(char *) ap_construct_url(ap_pool_t *p, const char *uri, request_rec *r);
  +API_EXPORT(char *) ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r);
   API_EXPORT(const char *) ap_get_server_name(request_rec *r);
   API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
   API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
  @@ -155,7 +155,7 @@
   API_EXPORT(const char *) ap_auth_type (request_rec *);
   API_EXPORT(const char *) ap_auth_name (request_rec *);     
   API_EXPORT(int) ap_satisfies (request_rec *r);
  -API_EXPORT(const ap_array_header_t *) ap_requires (request_rec *);    
  +API_EXPORT(const apr_array_header_t *) ap_requires (request_rec *);    
   
   #ifdef WIN32
   /* 
  @@ -218,7 +218,7 @@
       int satisfy;
       char *ap_auth_type;
       char *ap_auth_name;
  -    ap_array_header_t *ap_requires;
  +    apr_array_header_t *ap_requires;
   
       /* Custom response config. These can contain text or a URL to redirect to.
        * if response_code_strings is NULL then there are none in the config,
  @@ -279,7 +279,7 @@
       int loglevel;
       
       /* Access control */
  -    ap_array_header_t *sec;
  +    apr_array_header_t *sec;
       regex_t *r;
   
   #ifdef WIN32
  @@ -306,12 +306,12 @@
       /* Access control */
   
       char *access_name;
  -    ap_array_header_t *sec;
  -    ap_array_header_t *sec_url;
  +    apr_array_header_t *sec;
  +    apr_array_header_t *sec_url;
   } core_server_config;
   
   /* for http_config.c */
  -void ap_core_reorder_directories(ap_pool_t *, server_rec *);
  +void ap_core_reorder_directories(apr_pool_t *, server_rec *);
   
   /* for mod_perl */
   CORE_EXPORT(void) ap_add_per_dir_conf (server_rec *s, void *dir_config);
  
  
  
  1.18      +13 -13    apache-2.0/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- http_log.h	2000/07/31 03:54:20	1.17
  +++ http_log.h	2000/08/02 05:25:28	1.18
  @@ -118,7 +118,7 @@
    * @param s_main The main server
    * @param p The pool to allocate out of
    */
  -void ap_open_logs (server_rec *s_main, ap_pool_t *p);
  +void ap_open_logs (server_rec *s_main, apr_pool_t *p);
   
   /* 
    * The three primary logging functions, ap_log_error, ap_log_rerror, and 
  @@ -147,10 +147,10 @@
    * denial-of-service attack and other messy behavior.  Instead, use a 
    * simple format string like "%s", followed by the string containing the 
    * untrusted data.
  - * @deffunc void ap_log_error(const char *file, int line, int level, ap_status_t status, const server_rec *s, const char *fmt, ...) 
  + * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...) 
    */
   API_EXPORT(void) ap_log_error(const char *file, int line, int level, 
  -                             ap_status_t status, const server_rec *s, 
  +                             apr_status_t status, const server_rec *s, 
                                const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
   
  @@ -171,10 +171,10 @@
    * denial-of-service attack and other messy behavior.  Instead, use a 
    * simple format string like "%s", followed by the string containing the 
    * untrusted data.
  - * @deffunc void ap_log_error(const char *file, int line, int level, ap_status_t status, ap_pool_t *p, const char *fmt, ...) 
  + * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, apr_pool_t *p, const char *fmt, ...) 
    */
   API_EXPORT(void) ap_log_perror(const char *file, int line, int level, 
  -                             ap_status_t status, ap_pool_t *p, 
  +                             apr_status_t status, apr_pool_t *p, 
                                const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
   
  @@ -195,10 +195,10 @@
    * denial-of-service attack and other messy behavior.  Instead, use a 
    * simple format string like "%s", followed by the string containing the 
    * untrusted data.
  - * @deffunc void ap_log_error(const char *file, int line, int level, ap_status_t status, request_rec *s, const char *fmt, ...) 
  + * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, request_rec *s, const char *fmt, ...) 
    */
   API_EXPORT(void) ap_log_rerror(const char *file, int line, int level, 
  -                               ap_status_t status, const request_rec *s, 
  +                               apr_status_t status, const request_rec *s, 
                                  const char *fmt, ...)
   			    __attribute__((format(printf,6,7)));
   
  @@ -214,7 +214,7 @@
    * @param p The pool to use for logging
    * @param fname The name of the file to log to
    */
  -void ap_log_pid (ap_pool_t *p, const char *fname);
  +void ap_log_pid (apr_pool_t *p, const char *fname);
   /* These are for legacy code, new code should use ap_log_error,
    * or ap_log_rerror.
    */
  @@ -234,16 +234,16 @@
    */
   struct piped_log {
       /** The pool to use for the piped log */
  -    ap_pool_t *p;
  +    apr_pool_t *p;
       /** The pipe between the server and the logging process */
  -    ap_file_t *fds[2];
  +    apr_file_t *fds[2];
       /* XXX - an #ifdef that needs to be eliminated from public view. Shouldn't
        * be hard */
   #ifdef HAVE_RELIABLE_PIPED_LOGS
       /** The name of the program the logging process is running */
       char *program;
       /** The pid of the logging process */
  -    ap_proc_t *pid;
  +    apr_proc_t *pid;
   #endif
   };
   
  @@ -252,9 +252,9 @@
    * @param p The pool to allocate out of
    * @param program The program to run in the logging process
    * @return The piped log structure
  - * @deffunc piped_log *ap_open_piped_log(ap_pool_t *p, const char *program)
  + * @deffunc piped_log *ap_open_piped_log(apr_pool_t *p, const char *program)
    */
  -API_EXPORT(piped_log *) ap_open_piped_log (ap_pool_t *p, const char *program);
  +API_EXPORT(piped_log *) ap_open_piped_log (apr_pool_t *p, const char *program);
   
   /**
    * Close the piped log and kill the logging process
  
  
  
  1.11      +4 -4      apache-2.0/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_main.h	2000/05/29 04:17:41	1.10
  +++ http_main.h	2000/08/02 05:25:28	1.11
  @@ -60,7 +60,7 @@
   #define APACHE_HTTP_MAIN_H
   
   /* AP_SERVER_BASEARGS is the command argument list parsed by http_main.c
  - * in ap_getopt() format.  Use this for default'ing args that the MPM
  + * in apr_getopt() format.  Use this for default'ing args that the MPM
    * can safely ignore and pass on from its rewrite_args() handler.
    */
   #define AP_SERVER_BASEARGS "C:c:D:d:f:vVlLth?"
  @@ -73,9 +73,9 @@
   extern API_VAR_EXPORT const char *ap_server_root;
   
   /* for -C, -c and -D switches */
  -extern API_VAR_EXPORT ap_array_header_t *ap_server_pre_read_config;
  -extern API_VAR_EXPORT ap_array_header_t *ap_server_post_read_config;
  -extern API_VAR_EXPORT ap_array_header_t *ap_server_config_defines;
  +extern API_VAR_EXPORT apr_array_header_t *ap_server_pre_read_config;
  +extern API_VAR_EXPORT apr_array_header_t *ap_server_post_read_config;
  +extern API_VAR_EXPORT apr_array_header_t *ap_server_config_defines;
   
   #ifdef __cplusplus
   }
  
  
  
  1.20      +6 -6      apache-2.0/src/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- http_protocol.h	2000/07/11 03:48:17	1.19
  +++ http_protocol.h	2000/08/02 05:25:28	1.20
  @@ -119,7 +119,7 @@
   
   API_EXPORT(int) ap_set_content_length(request_rec *r, long length);
   API_EXPORT(int) ap_set_keepalive(request_rec *r);
  -API_EXPORT(ap_time_t) ap_rationalize_mtime(request_rec *r, ap_time_t mtime);
  +API_EXPORT(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime);
   API_EXPORT(char *) ap_make_etag(request_rec *r, int force_weak);
   API_EXPORT(void) ap_set_etag(request_rec *r);
   API_EXPORT(void) ap_set_last_modified(request_rec *r);
  @@ -136,13 +136,13 @@
    * (Ditto the send_header stuff).
    */
   
  -API_EXPORT(ap_status_t) ap_send_fd(ap_file_t *fd, request_rec *r, ap_off_t offset, 
  -                                   ap_size_t length, ap_size_t *nbytes);
  +API_EXPORT(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +                                   apr_size_t length, apr_size_t *nbytes);
   
   API_EXPORT(long) ap_send_fb(BUFF *f, request_rec *r);
   API_EXPORT(long) ap_send_fb_length(BUFF *f, request_rec *r, long length);
   
  -API_EXPORT(size_t) ap_send_mmap(ap_mmap_t *mm, request_rec *r, size_t offset,
  +API_EXPORT(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
                                size_t length);
   
   /* Hmmm... could macrofy these for now, and maybe forever, though the
  @@ -182,8 +182,8 @@
   /* Sending a byterange */
   
   API_EXPORT(int) ap_set_byterange(request_rec *r);
  -API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
  -				  ap_size_t *length);
  +API_EXPORT(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
  +				  apr_size_t *length);
   
   /* Support for the Basic authentication protocol.  Note that there's
    * nothing that prevents these from being in mod_auth.c, except that other
  
  
  
  1.13      +2 -2      apache-2.0/src/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- http_request.h	2000/06/24 16:27:47	1.12
  +++ http_request.h	2000/08/02 05:25:29	1.13
  @@ -82,7 +82,7 @@
    * (e.g., for includes), a module may call for the request to be run
    * by calling run_sub_req.  The space allocated to create sub_reqs can be
    * reclaimed by calling destroy_sub_req --- be sure to copy anything you care
  - * about which was allocated in its ap_pool_t elsewhere before doing this.
  + * about which was allocated in its apr_pool_t elsewhere before doing this.
    */
   
   API_EXPORT(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
  @@ -105,7 +105,7 @@
   API_EXPORT(void) ap_internal_redirect_handler(const char *new_uri, request_rec *);
   API_EXPORT(int) ap_some_auth_required(request_rec *r);
   API_EXPORT(int) ap_is_initial_req(request_rec *r);
  -API_EXPORT(void) ap_update_mtime(request_rec *r, ap_time_t dependency_mtime);
  +API_EXPORT(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime);
   
   #ifdef CORE_PRIVATE
   /* Function called by main.c to handle first-level request */
  
  
  
  1.7       +3 -3      apache-2.0/src/include/http_vhost.h
  
  Index: http_vhost.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_vhost.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_vhost.h	2000/06/17 11:13:04	1.6
  +++ http_vhost.h	2000/08/02 05:25:29	1.7
  @@ -60,13 +60,13 @@
   #endif
   
   /* called before any config is read */
  -void ap_init_vhost_config(ap_pool_t *p);
  +void ap_init_vhost_config(apr_pool_t *p);
   
   /* called after the config has been read */
  -void ap_fini_vhost_config(ap_pool_t *p, server_rec *main_server);
  +void ap_fini_vhost_config(apr_pool_t *p, server_rec *main_server);
   
   /* handle addresses in <VirtualHost> statement */
  -const char *ap_parse_vhost_addrs(ap_pool_t *p, const char *hostname, server_rec *s);
  +const char *ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s);
   
   /* handle NameVirtualHost directive */
   const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy,
  
  
  
  1.67      +59 -59    apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- httpd.h	2000/07/29 19:50:07	1.66
  +++ httpd.h	2000/08/02 05:25:29	1.67
  @@ -366,7 +366,7 @@
   #define APEXIT_CHILDFATAL	0xf
   
   API_EXPORT(const char *) ap_get_server_version(void);
  -API_EXPORT(void) ap_add_version_component(ap_pool_t *pconf, const char *component);
  +API_EXPORT(void) ap_add_version_component(apr_pool_t *pconf, const char *component);
   API_EXPORT(const char *) ap_get_server_built(void);
   
   /* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
  @@ -386,7 +386,7 @@
   
   /* The size of the static array in http_protocol.c for storing
    * all of the potential response status-lines (a sparse table).
  - * A future version should dynamically generate the ap_table_t at startup.
  + * A future version should dynamically generate the apr_table_t at startup.
    */
   #define RESPONSE_CODES 55
   
  @@ -558,15 +558,15 @@
   
   struct ap_rr_xlate {
       /* contents are experimental! expect it to change! */
  -    ap_xlate_t *to_net;
  +    apr_xlate_t *to_net;
       int to_net_sb; /* whether or not write translation is single-byte-only */
  -    ap_xlate_t *from_net;
  +    apr_xlate_t *from_net;
   };
   #endif /*APACHE_XLATE*/
   
   struct process_rec {
  -    ap_pool_t *pool;  /* Global pool. Please try to cleared on _all_ exits */
  -    ap_pool_t *pconf; /* aka configuration pool, cleared on restarts */
  +    apr_pool_t *pool;  /* Global pool. Please try to cleared on _all_ exits */
  +    apr_pool_t *pconf; /* aka configuration pool, cleared on restarts */
       int argc;
       char *const *argv;
       const char *short_name;
  @@ -574,7 +574,7 @@
   
   struct request_rec {
   
  -    ap_pool_t *pool;
  +    apr_pool_t *pool;
       conn_rec *connection;
       server_rec *server;
   
  @@ -602,7 +602,7 @@
       int proto_num;		/* Number version of protocol; 1.1 = 1001 */
       const char *hostname;	/* Host, as set by full URI or Host: */
   
  -    ap_time_t request_time;	/* When the request started */
  +    apr_time_t request_time;	/* When the request started */
   
       const char *status_line;	/* Status line, if set by script */
       int status;			/* In any case */
  @@ -638,7 +638,7 @@
   
       int sent_bodyct;		/* byte count in stream is for body */
       long bytes_sent;		/* body byte count, for easy access */
  -    ap_time_t mtime;		/* Time the resource was last modified */
  +    apr_time_t mtime;		/* Time the resource was last modified */
   
       /* HTTP/1.1 connection-level features */
   
  @@ -662,15 +662,15 @@
        * latter are printed even on error, and persist across internal redirects
        * (so the headers printed for ErrorDocument handlers will have them).
        *
  -     * The 'notes' ap_table_t is for notes from one module to another, with no
  +     * The 'notes' apr_table_t is for notes from one module to another, with no
        * other set purpose in mind...
        */
   
  -    ap_table_t *headers_in;
  -    ap_table_t *headers_out;
  -    ap_table_t *err_headers_out;
  -    ap_table_t *subprocess_env;
  -    ap_table_t *notes;
  +    apr_table_t *headers_in;
  +    apr_table_t *headers_out;
  +    apr_table_t *err_headers_out;
  +    apr_table_t *subprocess_env;
  +    apr_table_t *notes;
   
       /* content_type, handler, content_encoding, content_language, and all
        * content_languages MUST be lowercased strings.  They may be pointers
  @@ -681,7 +681,7 @@
   
       const char *content_encoding;
       const char *content_language;	/* for back-compat. only -- do not use */
  -    ap_array_header_t *content_languages;	/* array of (char*) */
  +    apr_array_header_t *content_languages;	/* array of (char*) */
   
       char *vlist_validator;      /* variant list validator (if negotiated) */
       
  @@ -702,7 +702,7 @@
       char *filename;
       char *path_info;
       char *args;			/* QUERY_ARGS, if any */
  -    ap_finfo_t finfo;		/* ST_MODE set to zero if no such file */
  +    apr_finfo_t finfo;		/* ST_MODE set to zero if no such file */
       uri_components parsed_uri;	/* components of uri, dismantled */
   
       /* Various other config info which may change with .htaccess files
  @@ -725,7 +725,7 @@
       struct ap_rr_xlate *rrx;
   #endif /*APACHE_XLATE*/
   
  -    struct ap_filter_t *filters;
  +    struct apr_filter_t *filters;
   
   /* Things placed at the end of the record to avoid breaking binary
    * compatibility.  It would be nice to remember to reorder the entire
  @@ -740,7 +740,7 @@
   
   struct conn_rec {
   
  -    ap_pool_t *pool;
  +    apr_pool_t *pool;
       server_rec *base_server;	/* Physical vhost this conn come in on */
       void *vhost_lookup_data;	/* used by http_vhost.c */
   
  @@ -776,7 +776,7 @@
       long id;                    /* ID of this connection; unique at any
                                    * point in time */
       void *conn_config;		/* Notes on *this* connection */
  -    ap_table_t *notes;  /* send note from one module to another, must
  +    apr_table_t *notes;  /* send note from one module to another, must
                            * remain valid for all requests on this conn */
   };
   
  @@ -790,7 +790,7 @@
   typedef struct server_addr_rec server_addr_rec;
   struct server_addr_rec {
       server_addr_rec *next;
  -    ap_in_addr host_addr;	/* The bound address, for this server */
  +    apr_in_addr host_addr;	/* The bound address, for this server */
       unsigned short host_port;	/* The bound port, for this server */
       char *virthost;		/* The name given in <VirtualHost> */
   };
  @@ -812,7 +812,7 @@
       /* Log files --- note that transfer log is now in the modules... */
   
       char *error_fname;
  -    ap_file_t *error_log;
  +    apr_file_t *error_log;
       int loglevel;
   
       /* Module-specific configuration for server, and defaults... */
  @@ -835,8 +835,8 @@
       const char *path;		/* Pathname for ServerPath */
       int pathlen;		/* Length of path */
   
  -    ap_array_header_t *names;	/* Normal names for ServerAlias servers */
  -    ap_array_header_t *wild_names;	/* Wildcarded names for ServerAlias servers */
  +    apr_array_header_t *names;	/* Normal names for ServerAlias servers */
  +    apr_array_header_t *wild_names;	/* Wildcarded names for ServerAlias servers */
   
       uid_t server_uid;        /* effective user id when calling exec wrapper */
       gid_t server_gid;        /* effective group id when calling exec wrapper */
  @@ -894,69 +894,69 @@
   
   /* Time */
   
  -API_EXPORT(char *) ap_field_noparam(ap_pool_t *p, const char *intype);
  -API_EXPORT(char *) ap_ht_time(ap_pool_t *p, ap_time_t t, const char *fmt, int gmt);
  +API_EXPORT(char *) ap_field_noparam(apr_pool_t *p, const char *intype);
  +API_EXPORT(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt);
   
   /* String handling. The *_nc variants allow you to use non-const char **s as
      arguments (unfortunately C won't automatically convert a char ** to a const
      char **) */
   
  -API_EXPORT(char *) ap_getword(ap_pool_t *p, const char **line, char stop);
  -API_EXPORT(char *) ap_getword_nc(ap_pool_t *p, char **line, char stop);
  -API_EXPORT(char *) ap_getword_white(ap_pool_t *p, const char **line);
  -API_EXPORT(char *) ap_getword_white_nc(ap_pool_t *p, char **line);
  -API_EXPORT(char *) ap_getword_nulls(ap_pool_t *p, const char **line, char stop);
  -API_EXPORT(char *) ap_getword_nulls_nc(ap_pool_t *p, char **line, char stop);
  -API_EXPORT(char *) ap_getword_conf(ap_pool_t *p, const char **line);
  -API_EXPORT(char *) ap_getword_conf_nc(ap_pool_t *p, char **line);
  -API_EXPORT(const char *) ap_resolve_env(ap_pool_t *p, const char * word); 
  +API_EXPORT(char *) ap_getword(apr_pool_t *p, const char **line, char stop);
  +API_EXPORT(char *) ap_getword_nc(apr_pool_t *p, char **line, char stop);
  +API_EXPORT(char *) ap_getword_white(apr_pool_t *p, const char **line);
  +API_EXPORT(char *) ap_getword_white_nc(apr_pool_t *p, char **line);
  +API_EXPORT(char *) ap_getword_nulls(apr_pool_t *p, const char **line, char stop);
  +API_EXPORT(char *) ap_getword_nulls_nc(apr_pool_t *p, char **line, char stop);
  +API_EXPORT(char *) ap_getword_conf(apr_pool_t *p, const char **line);
  +API_EXPORT(char *) ap_getword_conf_nc(apr_pool_t *p, char **line);
  +API_EXPORT(const char *) ap_resolve_env(apr_pool_t *p, const char * word); 
   
   API_EXPORT(const char *) ap_size_list_item(const char **field, int *len);
  -API_EXPORT(char *) ap_get_list_item(ap_pool_t *p, const char **field);
  -API_EXPORT(int) ap_find_list_item(ap_pool_t *p, const char *line, const char *tok);
  +API_EXPORT(char *) ap_get_list_item(apr_pool_t *p, const char **field);
  +API_EXPORT(int) ap_find_list_item(apr_pool_t *p, const char *line, const char *tok);
   
  -API_EXPORT(char *) ap_get_token(ap_pool_t *p, const char **accept_line, int accept_white);
  -API_EXPORT(int) ap_find_token(ap_pool_t *p, const char *line, const char *tok);
  -API_EXPORT(int) ap_find_last_token(ap_pool_t *p, const char *line, const char *tok);
  +API_EXPORT(char *) ap_get_token(apr_pool_t *p, const char **accept_line, int accept_white);
  +API_EXPORT(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok);
  +API_EXPORT(int) ap_find_last_token(apr_pool_t *p, const char *line, const char *tok);
   
   API_EXPORT(int) ap_is_url(const char *u);
   API_EXPORT(int) ap_unescape_url(char *url);
   API_EXPORT(void) ap_no2slash(char *name);
   API_EXPORT(void) ap_getparents(char *name);
  -API_EXPORT(char *) ap_escape_path_segment(ap_pool_t *p, const char *s);
  -API_EXPORT(char *) ap_os_escape_path(ap_pool_t *p, const char *path, int partial);
  +API_EXPORT(char *) ap_escape_path_segment(apr_pool_t *p, const char *s);
  +API_EXPORT(char *) ap_os_escape_path(apr_pool_t *p, const char *path, int partial);
   #define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
  -API_EXPORT(char *) ap_escape_html(ap_pool_t *p, const char *s);
  -API_EXPORT(char *) ap_construct_server(ap_pool_t *p, const char *hostname,
  +API_EXPORT(char *) ap_escape_html(apr_pool_t *p, const char *s);
  +API_EXPORT(char *) ap_construct_server(apr_pool_t *p, const char *hostname,
   				    unsigned port, const request_rec *r);
  -API_EXPORT(char *) ap_escape_shell_cmd(ap_pool_t *p, const char *s);
  +API_EXPORT(char *) ap_escape_shell_cmd(apr_pool_t *p, const char *s);
   
   API_EXPORT(int) ap_count_dirs(const char *path);
   API_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
  -API_EXPORT(char *) ap_make_dirstr_parent(ap_pool_t *p, const char *s);
  +API_EXPORT(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s);
   /* deprecated.  The previous two routines are preferred. */
  -API_EXPORT(char *) ap_make_dirstr(ap_pool_t *a, const char *s, int n);
  -API_EXPORT(char *) ap_make_full_path(ap_pool_t *a, const char *dir, const char *f);
  +API_EXPORT(char *) ap_make_dirstr(apr_pool_t *a, const char *s, int n);
  +API_EXPORT(char *) ap_make_full_path(apr_pool_t *a, const char *dir, const char *f);
   
   API_EXPORT(int) ap_is_matchexp(const char *str);
   API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
   API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
   API_EXPORT(char *) ap_strcasestr(const char *s1, const char *s2);
  -API_EXPORT(char *) ap_pbase64decode(ap_pool_t *p, const char *bufcoded);
  -API_EXPORT(char *) ap_pbase64encode(ap_pool_t *p, char *string); 
  -API_EXPORT(char *) ap_uudecode(ap_pool_t *p, const char *bufcoded);
  -API_EXPORT(char *) ap_uuencode(ap_pool_t *p, char *string); 
  +API_EXPORT(char *) ap_pbase64decode(apr_pool_t *p, const char *bufcoded);
  +API_EXPORT(char *) ap_pbase64encode(apr_pool_t *p, char *string); 
  +API_EXPORT(char *) ap_uudecode(apr_pool_t *p, const char *bufcoded);
  +API_EXPORT(char *) ap_uuencode(apr_pool_t *p, char *string); 
   
   #include "pcreposix.h"
   
  -API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern,
  +API_EXPORT(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
   				   int cflags);
  -API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t *reg);
  +API_EXPORT(void) ap_pregfree(apr_pool_t *p, regex_t *reg);
   API_EXPORT(int)    ap_regexec(regex_t *preg, const char *string,
                                 size_t nmatch, regmatch_t pmatch[], int eflags);
   API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, 
                                  char *errbuf, size_t errbuf_size);
  -API_EXPORT(char *) ap_pregsub(ap_pool_t *p, const char *input, const char *source,
  +API_EXPORT(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
                                 size_t nmatch, regmatch_t pmatch[]);
   
   API_EXPORT(void) ap_content_type_tolower(char *);
  @@ -964,7 +964,7 @@
   API_EXPORT(int) ap_ind(const char *, char);	/* Sigh... */
   API_EXPORT(int) ap_rind(const char *, char);
   
  -API_EXPORT(char *) ap_escape_quotes (ap_pool_t *p, const char *instring);
  +API_EXPORT(char *) ap_escape_quotes (apr_pool_t *p, const char *instring);
   
   /* Misc system hackery */
   
  @@ -975,14 +975,14 @@
   API_EXPORT(int) ap_get_max_daemons(void);
   
   #ifdef _OSD_POSIX
  -extern const char *os_set_account(ap_pool_t *p, const char *account);
  +extern const char *os_set_account(apr_pool_t *p, const char *account);
   extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process);
   #endif /* _OSD_POSIX */
   
  -char *ap_get_local_host(ap_pool_t *);
  +char *ap_get_local_host(apr_pool_t *);
   unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
   
  -API_EXPORT(char *) ap_escape_quotes(ap_pool_t *p, const char *instr);
  +API_EXPORT(char *) ap_escape_quotes(apr_pool_t *p, const char *instr);
   
   /*
    * Redefine assert() to something more useful for an Apache...
  
  
  
  1.7       +2 -2      apache-2.0/src/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_common.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mpm_common.h	2000/07/26 14:12:38	1.6
  +++ mpm_common.h	2000/08/02 05:25:29	1.7
  @@ -79,8 +79,8 @@
   #endif
           
   void ap_reclaim_child_processes(int terminate);
  -void ap_wait_or_timeout(ap_wait_t *status, ap_proc_t *ret, ap_pool_t *p);
  -void ap_process_child_status(ap_proc_t *pid, ap_wait_t status);
  +void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p);
  +void ap_process_child_status(apr_proc_t *pid, ap_wait_t status);
   #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
   void ap_sock_disable_nagle(int s);
   #else
  
  
  
  1.6       +4 -4      apache-2.0/src/include/mpm_status.h
  
  Index: mpm_status.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_status.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mpm_status.h	2000/04/14 15:58:17	1.5
  +++ mpm_status.h	2000/08/02 05:25:29	1.6
  @@ -64,7 +64,7 @@
   
   typedef struct {
       long conn_id;
  -    ap_table_t *data;
  +    apr_table_t *data;
   } ap_status_table_row_t;
   
   /**
  @@ -81,7 +81,7 @@
    * Get an array of current connection IDs.
    *
    */
  -API_EXPORT(ap_array_header_t *) ap_get_connections(ap_pool_t *p);
  +API_EXPORT(apr_array_header_t *) ap_get_connections(apr_pool_t *p);
   
   /**
    * Get an array of keys from a given connection.
  @@ -89,7 +89,7 @@
    * conn_id = Connection ID
    *
    */
  -API_EXPORT(ap_array_header_t *) ap_get_connection_keys(ap_pool_t *p,
  +API_EXPORT(apr_array_header_t *) ap_get_connection_keys(apr_pool_t *p,
                                                          long conn_id);
   
   /**
  @@ -122,7 +122,7 @@
    * p = context, generally of the request
    *
    */
  -API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_pool_t *p);
  +API_EXPORT(apr_array_header_t *) ap_get_status_table(apr_pool_t *p);
   
   #endif /* APACHE_SERVER_STATS_H */
   
  
  
  
  1.3       +6 -6      apache-2.0/src/include/util_charset.h
  
  Index: util_charset.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_charset.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_charset.h	2000/05/25 20:51:25	1.2
  +++ util_charset.h	2000/08/02 05:25:29	1.3
  @@ -67,8 +67,8 @@
   
   #include "apr_xlate.h"
   
  -extern ap_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
  -extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
  +extern apr_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
  +extern apr_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
   
   /* Save & Restore the current conversion settings
    *
  @@ -85,7 +85,7 @@
    */
   
   #define AP_PUSH_INPUTCONVERSION_STATE(_buff, _newx) \
  -        ap_xlate_t *saved_input_xlate; \
  +        apr_xlate_t *saved_input_xlate; \
           ap_bgetopt(_buff, BO_RXLATE, &saved_input_xlate); \
           ap_bsetopt(_buff, BO_RXLATE, &(_newx))
   
  @@ -93,7 +93,7 @@
           ap_bsetopt(_buff, BO_RXLATE, &saved_input_xlate)
   
   #define AP_PUSH_OUTPUTCONVERSION_STATE(_buff, _newx) \
  -        ap_xlate_t *saved_output_xlate; \
  +        apr_xlate_t *saved_output_xlate; \
           ap_bgetopt(_buff, BO_WXLATE, &saved_output_xlate); \
           ap_bsetopt(_buff, BO_WXLATE, &(_newx))
   
  @@ -103,8 +103,8 @@
   /* ap_set_content_xlate() is called by Apache core or a module to set
    * up character set translation (a.k.a. recoding) for content.
    */
  -API_EXPORT(ap_status_t) ap_set_content_xlate(request_rec *r, int output,
  -                                             ap_xlate_t *xlate);
  +API_EXPORT(apr_status_t) ap_set_content_xlate(request_rec *r, int output,
  +                                             apr_xlate_t *xlate);
   
   #ifdef __cplusplus
   }
  
  
  
  1.13      +2 -2      apache-2.0/src/include/util_date.h
  
  Index: util_date.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util_date.h	2000/07/28 01:57:04	1.12
  +++ util_date.h	2000/08/02 05:25:29	1.13
  @@ -69,10 +69,10 @@
   
   #include "apr_time.h"
   
  -#define BAD_DATE (ap_time_t)0
  +#define BAD_DATE (apr_time_t)0
   
   API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
  -API_EXPORT(ap_time_t) ap_parseHTTPdate(const char *date);
  +API_EXPORT(apr_time_t) ap_parseHTTPdate(const char *date);
   
   #ifdef __cplusplus
   }
  
  
  
  1.5       +2 -2      apache-2.0/src/include/util_ebcdic.h
  
  Index: util_ebcdic.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_ebcdic.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_ebcdic.h	2000/05/17 03:19:36	1.4
  +++ util_ebcdic.h	2000/08/02 05:25:31	1.5
  @@ -68,9 +68,9 @@
   #include "apr_xlate.h"
   #include "util_charset.h"
   
  -ap_status_t ap_init_ebcdic(ap_pool_t *);
  +apr_status_t ap_init_ebcdic(apr_pool_t *);
   
  -ap_xlate_t *ap_checkconv(struct request_rec *);
  +apr_xlate_t *ap_checkconv(struct request_rec *);
   
   #ifdef __cplusplus
   }
  
  
  
  1.2       +10 -10    apache-2.0/src/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_filter.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- util_filter.h	2000/07/28 20:30:53	1.1
  +++ util_filter.h	2000/08/02 05:25:31	1.2
  @@ -92,10 +92,10 @@
    */
   
   /* forward declare the filter type */
  -typedef struct ap_filter_t ap_filter_t;
  +typedef struct apr_filter_t apr_filter_t;
   
   /*
  - * ap_filter_func:
  + * apr_filter_func:
    *
    * This function type is used for filter callbacks. It will be passed a
    * pointer to "this" filter, and a "bucket" containing the content to be
  @@ -114,7 +114,7 @@
    * next/prev to insert/remove/replace elements in the bucket list, but
    * the types and values of the individual buckets should not be altered.
    */
  -typedef ap_status_t (*ap_filter_func)();
  +typedef apr_status_t (*apr_filter_func)();
   
   /*
    * ap_filter_type:
  @@ -146,7 +146,7 @@
   } ap_filter_type;
   
   /*
  - * ap_filter_t:
  + * apr_filter_t:
    *
    * This is the request-time context structure for an installed filter (in
    * the output filter chain). It provides the callback to use for filtering,
  @@ -159,13 +159,13 @@
    * the state directly with the request. A callback should not change any of
    * the other fields.
    */
  -struct ap_filter_t {
  -    ap_filter_func filter_func;
  +struct apr_filter_t {
  +    apr_filter_func filter_func;
   
       void *ctx;
   
       ap_filter_type ftype;
  -    ap_filter_t *next;
  +    apr_filter_t *next;
   };
   
   /*
  @@ -178,7 +178,7 @@
    * The filter's callback and type should be passed.
    */
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    ap_filter_func filter_func,
  +                                    apr_filter_func filter_func,
                                       ap_filter_type ftype);
   
   /*
  @@ -198,9 +198,9 @@
   
   /*
    * Things to do later:
  - * Add parameters to ap_filter_func type.  Those parameters will be something
  + * Add parameters to apr_filter_func type.  Those parameters will be something
    *     like:
  - *         (request_rec *r, ap_filter_t *filter, ap_data_list *the_data)
  + *         (request_rec *r, apr_filter_t *filter, ap_data_list *the_data)
    *      obviously, the request_rec is the current request, and the filter
    *      is the current filter stack.  The data_list is a bucket list or
    *      bucket_brigade, but I am trying to keep this patch neutral.  (If this
  
  
  
  1.13      +6 -6      apache-2.0/src/include/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_md5.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util_md5.h	2000/05/15 17:51:18	1.12
  +++ util_md5.h	2000/08/02 05:25:31	1.13
  @@ -65,14 +65,14 @@
   
   #include "apr_md5.h"
   
  -API_EXPORT(char *) ap_md5(ap_pool_t *a, const unsigned char *string);
  -API_EXPORT(char *) ap_md5_binary(ap_pool_t *a, const unsigned char *buf, int len);
  -API_EXPORT(char *) ap_md5contextTo64(ap_pool_t *p, ap_md5_ctx_t *context);
  +API_EXPORT(char *) ap_md5(apr_pool_t *a, const unsigned char *string);
  +API_EXPORT(char *) ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len);
  +API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *p, ap_md5_ctx_t *context);
   #ifdef APACHE_XLATE
  -API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile,
  -                                ap_xlate_t *xlate);
  +API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
  +                                apr_xlate_t *xlate);
   #else
  -API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile);
  +API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
   #endif
   
   #ifdef __cplusplus
  
  
  
  1.9       +3 -3      apache-2.0/src/include/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_script.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_script.h	2000/04/14 15:58:17	1.8
  +++ util_script.h	2000/08/02 05:25:31	1.9
  @@ -71,17 +71,17 @@
   #endif
   #endif
   
  -API_EXPORT(char **) ap_create_environment(ap_pool_t *p, ap_table_t *t);
  +API_EXPORT(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t);
   API_EXPORT(int) ap_find_path_info(const char *uri, const char *path_info);
   API_EXPORT(void) ap_add_cgi_vars(request_rec *r);
   API_EXPORT(void) ap_add_common_vars(request_rec *r);
  -API_EXPORT(int) ap_scan_script_header_err(request_rec *r, ap_file_t *f, char *buffer);
  +API_EXPORT(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer);
   API_EXPORT(int) ap_scan_script_header_err_buff(request_rec *r, BUFF *f,
                                                  char *buffer);
   API_EXPORT(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
   				       int (*getsfunc) (char *, int, void *),
   				       void *getsfunc_data);
  -API_EXPORT(void) ap_send_size(ap_ssize_t size, request_rec *r);
  +API_EXPORT(void) ap_send_size(apr_ssize_t size, request_rec *r);
   
   #ifdef __cplusplus
   }
  
  
  
  1.7       +5 -5      apache-2.0/src/include/util_uri.h
  
  Index: util_uri.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- util_uri.h	2000/05/28 03:52:38	1.6
  +++ util_uri.h	2000/08/02 05:25:31	1.7
  @@ -114,12 +114,12 @@
   /* util_uri.c */
   API_EXPORT(unsigned short) ap_default_port_for_scheme(const char *scheme_str);
   API_EXPORT(unsigned short) ap_default_port_for_request(const request_rec *r);
  -API_EXPORT(struct hostent *) ap_pduphostent(ap_pool_t *p, const struct hostent *hp);
  -API_EXPORT(struct hostent *) ap_pgethostbyname(ap_pool_t *p, const char *hostname);
  -API_EXPORT(char *) ap_unparse_uri_components(ap_pool_t *p, const uri_components *uptr,
  +API_EXPORT(struct hostent *) ap_pduphostent(apr_pool_t *p, const struct hostent *hp);
  +API_EXPORT(struct hostent *) ap_pgethostbyname(apr_pool_t *p, const char *hostname);
  +API_EXPORT(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components *uptr,
       unsigned flags);
  -API_EXPORT(int) ap_parse_uri_components(ap_pool_t *p, const char *uri, uri_components *uptr);
  -API_EXPORT(int) ap_parse_hostinfo_components(ap_pool_t *p, const char *hostinfo, uri_components *uptr);
  +API_EXPORT(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_components *uptr);
  +API_EXPORT(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr);
   /* called by the core in main() */
   API_EXPORT(void) ap_util_uri_init(void);
   
  
  
  
  1.2       +8 -8      apache-2.0/src/include/util_xml.h
  
  Index: util_xml.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_xml.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- util_xml.h	2000/07/03 22:28:38	1.1
  +++ util_xml.h	2000/08/02 05:25:31	1.2
  @@ -80,7 +80,7 @@
       ap_text *last;
   } ap_text_header;
   
  -API_EXPORT(void) ap_text_append(ap_pool_t *p, ap_text_header *hdr,
  +API_EXPORT(void) ap_text_append(apr_pool_t *p, ap_text_header *hdr,
                                   const char *text);
   
   
  @@ -186,15 +186,15 @@
   typedef struct ap_xml_doc
   {
       ap_xml_elem *root;		/* root element */
  -    ap_array_header_t *namespaces;	/* array of namespaces used */
  +    apr_array_header_t *namespaces;	/* array of namespaces used */
   } ap_xml_doc;
   
   API_EXPORT(int) ap_xml_parse_input(request_rec *r, ap_xml_doc **pdoc);
   
   
   /* Converts an XML element tree to flat text */
  -API_EXPORT(void) ap_xml_to_text(ap_pool_t *p, const ap_xml_elem *elem,
  -				int style, ap_array_header_t *namespaces,
  +API_EXPORT(void) ap_xml_to_text(apr_pool_t *p, const ap_xml_elem *elem,
  +				int style, apr_array_header_t *namespaces,
   				int *ns_map, const char **pbuf, size_t *psize);
   
   /* style argument values: */
  @@ -203,17 +203,17 @@
   #define AP_XML_X2T_LANG_INNER	2	/* xml:lang + inner contents */
   #define AP_XML_X2T_FULL_NS_LANG	3	/* FULL + ns defns + xml:lang */
   
  -API_EXPORT(const char *) ap_xml_empty_elem(ap_pool_t *p,
  +API_EXPORT(const char *) ap_xml_empty_elem(apr_pool_t *p,
                                              const ap_xml_elem *elem);
   
  -API_EXPORT(const char *) ap_xml_quote_string(ap_pool_t *p, const char *s,
  +API_EXPORT(const char *) ap_xml_quote_string(apr_pool_t *p, const char *s,
                                                int quotes);
  -API_EXPORT(void) ap_xml_quote_elem(ap_pool_t *p, ap_xml_elem *elem);
  +API_EXPORT(void) ap_xml_quote_elem(apr_pool_t *p, ap_xml_elem *elem);
   
   /* manage an array of unique URIs: ap_xml_insert_uri() and AP_XML_URI_ITEM() */
   
   /* return the URI's (existing) index, or insert it and return a new index */
  -API_EXPORT(int) ap_xml_insert_uri(ap_array_header_t *uri_array,
  +API_EXPORT(int) ap_xml_insert_uri(apr_array_header_t *uri_array,
                                     const char *uri);
   #define AP_XML_GET_URI_ITEM(ary, i)    (((const char * const *)(ary)->elts)[i])
   
  
  
  
  1.21      +22 -22    apache-2.0/src/lib/apr/buckets/ap_buf.c
  
  Index: ap_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_buf.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ap_buf.c	2000/08/01 15:41:54	1.20
  +++ ap_buf.c	2000/08/02 05:25:37	1.21
  @@ -63,7 +63,7 @@
   #include <sys/uio.h>
   #include "apr_buf.h"
   
  -APR_EXPORT(ap_status_t) ap_bucket_destroy(ap_bucket *e)
  +APR_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e)
   {
       if (e->free) {
           e->free(e);
  @@ -72,7 +72,7 @@
       return APR_SUCCESS;
   }
   
  -static ap_status_t ap_bucket_list_destroy(ap_bucket *e)
  +static apr_status_t ap_bucket_list_destroy(ap_bucket *e)
   {
       ap_bucket *cur = e;
       ap_bucket *next;
  @@ -85,9 +85,9 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(ap_status_t) ap_brigade_destroy(void *data)
  +APR_EXPORT(apr_status_t) ap_brigade_destroy(void *data)
   {
  -    ap_bucket_brigade *b = data;
  +    apr_bucket_brigade *b = data;
   
       ap_bucket_list_destroy(b->head);
       /* The brigade itself is allocated out of a pool, so we don't actually 
  @@ -97,20 +97,20 @@
       return APR_SUCCESS;
   }
   
  -APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(ap_pool_t *p)
  +APR_EXPORT(apr_bucket_brigade *) ap_brigade_create(apr_pool_t *p)
   {
  -    ap_bucket_brigade *b;
  +    apr_bucket_brigade *b;
   
  -    b = ap_palloc(p, sizeof(*b));
  +    b = apr_palloc(p, sizeof(*b));
       b->p = p;
       b->head = b->tail = NULL;
   
  -    ap_register_cleanup(b->p, b, ap_brigade_destroy, 
  +    apr_register_cleanup(b->p, b, ap_brigade_destroy, 
                           ap_brigade_destroy);
       return b;
   }
   
  -APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b, 
  +APR_EXPORT(void) ap_brigade_append_buckets(apr_bucket_brigade *b, 
                                                     ap_bucket *e)
   {
       ap_bucket *cur = e;
  @@ -128,7 +128,7 @@
       }
   }
   
  -APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *b, 
  +APR_EXPORT(int) ap_brigade_to_iovec(apr_bucket_brigade *b, 
                                              struct iovec *vec, int nvec)
   {
       ap_bucket *e;
  @@ -146,8 +146,8 @@
       return vec - orig;
   }
   
  -APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
  -                                            ap_bucket_brigade *b)
  +APR_EXPORT(void) ap_brigade_catenate(apr_bucket_brigade *a, 
  +                                            apr_bucket_brigade *b)
   {
       if (b->head) {
           if (a->tail) {
  @@ -163,7 +163,7 @@
       }
   }
   
  -APR_EXPORT(void) ap_consume_buckets(ap_bucket_brigade *b, int nvec)
  +APR_EXPORT(void) ap_consume_buckets(apr_bucket_brigade *b, int nvec)
   {
       int i;   
   
  @@ -179,14 +179,14 @@
       }
   }
   
  -APR_EXPORT(ap_status_t) ap_brigade_to_iol(ap_ssize_t *total_bytes,
  -                                                 ap_bucket_brigade *b, 
  +APR_EXPORT(apr_status_t) ap_brigade_to_iol(apr_ssize_t *total_bytes,
  +                                                 apr_bucket_brigade *b, 
                                                    ap_iol *iol)
   {
  -    ap_status_t status;
  +    apr_status_t status;
       int iov_used;
       struct iovec vec[16];   /* seems like a reasonable number to me */
  -    ap_ssize_t bytes = 0;
  +    apr_ssize_t bytes = 0;
   
       *total_bytes = 0;
       do {
  @@ -211,12 +211,12 @@
       return 0;
   }    
   
  -APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
  +APR_EXPORT(int) ap_brigade_vputstrs(apr_bucket_brigade *b, va_list va)
   {
       ap_bucket *r;
       const char *x;
       int j, k, rv;
  -    ap_ssize_t i;
  +    apr_ssize_t i;
   
       if (b->tail && b->tail->color == AP_BUCKET_rwmem) {
           ap_bucket *rw;
  @@ -263,7 +263,7 @@
       return k;
   }
   
  -APR_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...)
  +APR_EXPORT(int) ap_brigade_printf(apr_bucket_brigade *b, const char *fmt, ...)
   {
       va_list ap;
       int res;
  @@ -274,7 +274,7 @@
       return res;
   }
   
  -APR_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va)
  +APR_EXPORT(int) ap_brigade_vprintf(apr_bucket_brigade *b, const char *fmt, va_list va)
   {
       /* THIS IS A HACK.  This needs to be replaced with a function to printf
        * directly into a bucket.  I'm being lazy right now.  RBB
  @@ -283,7 +283,7 @@
       ap_bucket *r;
       int res, i;
   
  -    res = ap_vsnprintf(buf, 4096, fmt, va);
  +    res = apr_vsnprintf(buf, 4096, fmt, va);
   
       r = ap_bucket_rwmem_create(buf, strlen(buf), &i);
       ap_brigade_append_buckets(b, r);
  
  
  
  1.3       +31 -31    apache-2.0/src/lib/apr/buckets/ap_filter.h
  
  Index: ap_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_filter.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_filter.h	2000/07/13 16:26:37	1.2
  +++ ap_filter.h	2000/08/02 05:25:38	1.3
  @@ -123,11 +123,11 @@
    */
   
   /* forward declare some types */
  -typedef struct ap_filter_t ap_filter_t;
  -typedef struct ap_bucket_t ap_bucket_t;
  +typedef struct apr_filter_t apr_filter_t;
  +typedef struct apr_bucket_t apr_bucket_t;
   
   /*
  - * ap_filter_bucket_cb:
  + * apr_filter_bucket_cb:
    *
    * This function type is used for filter callbacks. It will be passed a
    * pointer to "this" filter, and a "bucket" containing the content to be
  @@ -146,8 +146,8 @@
    * next/prev to insert/remove/replace elements in the bucket list, but
    * the types and values of the individual buckets should not be altered.
    */
  -typedef void (*ap_filter_bucket_cb)(ap_filter_t *filter,
  -                                    ap_bucket_t *bucket);
  +typedef void (*apr_filter_bucket_cb)(apr_filter_t *filter,
  +                                    apr_bucket_t *bucket);
   
   /*
    * ap_filter_type:
  @@ -179,7 +179,7 @@
   } ap_filter_type;
   
   /*
  - * ap_filter_t:
  + * apr_filter_t:
    *
    * This is the request-time context structure for an installed filter (in
    * the output filter chain). It provides the callback to use for filtering,
  @@ -192,21 +192,21 @@
    * the state directly with the request. A callback should not change any of
    * the other fields.
    */
  -struct ap_filter_t {
  -    ap_filter_bucket_cb bucket_cb;
  +struct apr_filter_t {
  +    apr_filter_bucket_cb bucket_cb;
       request_rec *r;
   
       void *ctx;
   
       ap_filter_type ftype;
  -    ap_filter_t *next;
  +    apr_filter_t *next;
   };
   
   /*
    * ap_bucket_type:
    *
    * This enumeration is used to specify what type of bucket is present when
  - * an ap_bucket_t is provided.
  + * an apr_bucket_t is provided.
    *
    * AP_BUCKET_PTRLEN:
    *     This bucket type defines a simple pointer/length pair for the content.
  @@ -245,7 +245,7 @@
    *
    * AP_BUCKET_FILE:
    *     This bucket type refers to an open file, from the current position
  - *     and extending for ->flen bytes. Since there are some ap_file_t
  + *     and extending for ->flen bytes. Since there are some apr_file_t
    *     implementations/types that are not seekable, it may be impossible to
    *     "rewind" the file's current position after reading the contenxt.
    *     Therefore, it is important to note that once the content has been
  @@ -277,7 +277,7 @@
   } ap_bucket_type;
   
   /*
  - * ap_bucket_t:
  + * apr_bucket_t:
    *
    * The actual bucket definition. The type is determined by the ->type field.
    * Which fields are valid/useful in the bucket is determined by the type,
  @@ -287,20 +287,20 @@
    * remove, or replace elements in a list of buckets. Generally, a filter
    * should not change any bucket values other than these link pointers.
    */
  -struct ap_bucket_t {
  +struct apr_bucket_t {
       ap_bucket_type type;
   
       const char *buf;            /* AP_BUCKET_PTRLEN */
  -    ap_size_t len;              /* AP_BUCKET_PTRLEN */
  +    apr_size_t len;              /* AP_BUCKET_PTRLEN */
   
       const char *fmt;            /* AP_BUCKET_PRINTF */
       va_list va;                 /* AP_BUCKET_STRINGS, _PRINTF */
   
  -    ap_file_t *file;            /* AP_BUCKET_FILE */
  -    ap_ssize_t flen;            /* AP_BUCKET_FILE */
  +    apr_file_t *file;            /* AP_BUCKET_FILE */
  +    apr_ssize_t flen;            /* AP_BUCKET_FILE */
   
  -    ap_bucket_t *next;          /* next bucket in list */
  -    ap_bucket_t *prev;          /* previous bucket in list */
  +    apr_bucket_t *next;          /* next bucket in list */
  +    apr_bucket_t *prev;          /* previous bucket in list */
   };
   
   /*
  @@ -323,25 +323,25 @@
    *                   used to send from current-position to the end-of-file.
    * ap_fc_putbucket(): write a bucket into the filter chain
    */
  -API_EXPORT(void) ap_fc_write(ap_filter_t *filter, const char *buf,
  -                             ap_size_t len);
  -API_EXPORT(void) ap_fc_putc(ap_filter_t *filter, int c);
  -API_EXPORT(void) ap_fc_puts(ap_filter_t *filter, const char *str);
  +API_EXPORT(void) ap_fc_write(apr_filter_t *filter, const char *buf,
  +                             apr_size_t len);
  +API_EXPORT(void) ap_fc_putc(apr_filter_t *filter, int c);
  +API_EXPORT(void) ap_fc_puts(apr_filter_t *filter, const char *str);
   
  -API_EXPORT_NONSTD(void) ap_fc_putstrs(ap_filter_t *filter, ...);
  -API_EXPORT(void) ap_fc_vputstrs(ap_filter_t *filter, va_list va);
  +API_EXPORT_NONSTD(void) ap_fc_putstrs(apr_filter_t *filter, ...);
  +API_EXPORT(void) ap_fc_vputstrs(apr_filter_t *filter, va_list va);
   
  -API_EXPORT_NONSTD(void) ap_fc_printf(ap_filter_t *filter,
  +API_EXPORT_NONSTD(void) ap_fc_printf(apr_filter_t *filter,
                                        const char *fmt, ...);
  -API_EXPORT(void) ap_fc_vprintf(ap_filter_t *filter,
  +API_EXPORT(void) ap_fc_vprintf(apr_filter_t *filter,
                                  const char *fmt, va_list va);
   
  -API_EXPORT(void) ap_fc_sendfile(ap_filter_t *filter, ap_file_t *file,
  -                                ap_ssize_t flen);
  -#define AP_FC_SENDFILE_ALL ((ap_ssize_t) -1)
  +API_EXPORT(void) ap_fc_sendfile(apr_filter_t *filter, apr_file_t *file,
  +                                apr_ssize_t flen);
  +#define AP_FC_SENDFILE_ALL ((apr_ssize_t) -1)
   
   /* note: bucket->next and ->prev may be changed upon return from this */
  -API_EXPORT(void) ap_fc_putbucket(ap_filter_t *filter, ap_bucket_t *bucket);
  +API_EXPORT(void) ap_fc_putbucket(apr_filter_t *filter, apr_bucket_t *bucket);
   
   
   /*
  @@ -354,7 +354,7 @@
    * The filter's callback and type should be passed.
    */
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    ap_filter_bucket_cb bucket_cb,
  +                                    apr_filter_bucket_cb bucket_cb,
                                       ap_filter_type ftype);
   
   /*
  
  
  
  1.11      +13 -13    apache-2.0/src/lib/apr/buckets/ap_mmap_buf.c
  
  Index: ap_mmap_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_mmap_buf.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_mmap_buf.c	2000/07/31 22:28:57	1.10
  +++ ap_mmap_buf.c	2000/08/02 05:25:38	1.11
  @@ -61,21 +61,21 @@
   
   static const char * mmap_get_str(ap_bucket *e)
   {
  -    ap_bucket_mmap *b = (ap_bucket_mmap *)e->data;
  +    apr_bucket_mmap *b = (apr_bucket_mmap *)e->data;
       return b->alloc_addr;
   }
   
   static int mmap_get_len(ap_bucket *e)
   {
  -    ap_bucket_mmap *b = (ap_bucket_mmap *)e->data;
  +    apr_bucket_mmap *b = (apr_bucket_mmap *)e->data;
       return b->len;
   }
   
  -static ap_status_t mmap_bucket_insert(ap_bucket *e, const void *buf, 
  -                                      ap_size_t nbytes, ap_ssize_t *w)
  +static apr_status_t mmap_bucket_insert(ap_bucket *e, const void *buf, 
  +                                      apr_size_t nbytes, apr_ssize_t *w)
   {
  -    ap_bucket_mmap *b = (ap_bucket_mmap *)e->data;
  -    ap_mmap_t *mm = (ap_mmap_t *)buf;
  +    apr_bucket_mmap *b = (apr_bucket_mmap *)e->data;
  +    apr_mmap_t *mm = (apr_mmap_t *)buf;
   
       b->alloc_addr = mm->mm;
       b->len = nbytes;
  @@ -83,15 +83,15 @@
       return APR_SUCCESS;
   }
       
  -static ap_status_t mmap_split(ap_bucket *e, ap_size_t nbyte)
  +static apr_status_t mmap_split(ap_bucket *e, apr_size_t nbyte)
   {
       ap_bucket *newbuck;
  -    ap_bucket_mmap *a = (ap_bucket_mmap *)e->data;
  -    ap_bucket_mmap *b;
  -    ap_ssize_t dump;
  +    apr_bucket_mmap *a = (apr_bucket_mmap *)e->data;
  +    apr_bucket_mmap *b;
  +    apr_ssize_t dump;
   
       newbuck = ap_bucket_mmap_create(a->alloc_addr, a->len, &dump);
  -    b = (ap_bucket_mmap *)newbuck->data;
  +    b = (apr_bucket_mmap *)newbuck->data;
       a->alloc_addr = a->alloc_addr + nbyte;
       a->len = b->len - nbyte;
   
  @@ -105,10 +105,10 @@
   }
   
   APR_EXPORT(ap_bucket *) ap_bucket_mmap_create(const void *buf, 
  -                                      ap_size_t nbytes, ap_ssize_t *w)
  +                                      apr_size_t nbytes, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  -    ap_bucket_mmap *b;
  +    apr_bucket_mmap *b;
   
       newbuf            = calloc(1, sizeof(*newbuf));
       b                 = malloc(sizeof(*b));
  
  
  
  1.11      +12 -12    apache-2.0/src/lib/apr/buckets/ap_rmem_buf.c
  
  Index: ap_rmem_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_rmem_buf.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_rmem_buf.c	2000/07/31 22:28:58	1.10
  +++ ap_rmem_buf.c	2000/08/02 05:25:38	1.11
  @@ -65,25 +65,25 @@
   
   static const char * rmem_get_str(ap_bucket *e)
   {
  -    ap_bucket_rmem *b = (ap_bucket_rmem *)e->data;
  +    apr_bucket_rmem *b = (apr_bucket_rmem *)e->data;
       return b->start;
   }
   
   static int rmem_get_len(ap_bucket *e)
   {
  -    ap_bucket_rmem *b = (ap_bucket_rmem *)e->data;
  +    apr_bucket_rmem *b = (apr_bucket_rmem *)e->data;
       return (char *)b->end - (char *)b->start;
   }
   
  -static ap_status_t rmem_split(ap_bucket *e, ap_size_t nbyte)
  +static apr_status_t rmem_split(ap_bucket *e, apr_size_t nbyte)
   {
       ap_bucket *newbuck;
  -    ap_bucket_rmem *a = (ap_bucket_rmem *)e->data; 
  -    ap_bucket_rmem *b; 
  -    ap_ssize_t dump;
  +    apr_bucket_rmem *a = (apr_bucket_rmem *)e->data; 
  +    apr_bucket_rmem *b; 
  +    apr_ssize_t dump;
   
       newbuck = ap_bucket_rmem_create(a->start, a->alloc_len, &dump);
  -    b = (ap_bucket_rmem *)newbuck->data;
  +    b = (apr_bucket_rmem *)newbuck->data;
   
       b->alloc_len = a->alloc_len - nbyte;
       a->alloc_len = nbyte;
  @@ -106,10 +106,10 @@
    * It is worth noting that if an error occurs, the buffer is in an unknown
    * state.
    */
  -static ap_status_t rmem_insert(ap_bucket *e, const void *buf,
  -                               ap_size_t nbyte, ap_ssize_t *w)
  +static apr_status_t rmem_insert(ap_bucket *e, const void *buf,
  +                               apr_size_t nbyte, apr_ssize_t *w)
   {
  -    ap_bucket_rmem *b = (ap_bucket_rmem *)e->data;
  +    apr_bucket_rmem *b = (apr_bucket_rmem *)e->data;
   
       if (nbyte == 0) {
           *w = 0;
  @@ -126,10 +126,10 @@
   }
   
   APR_EXPORT(ap_bucket *) ap_bucket_rmem_create(const void *buf,
  -                               ap_size_t nbyte, ap_ssize_t *w)
  +                               apr_size_t nbyte, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  -    ap_bucket_rmem *b;
  +    apr_bucket_rmem *b;
   
       newbuf                = calloc(1, sizeof(*newbuf));
       b                     = malloc(sizeof(*b)); 
  
  
  
  1.11      +13 -13    apache-2.0/src/lib/apr/buckets/ap_rwmem_buf.c
  
  Index: ap_rwmem_buf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_rwmem_buf.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap_rwmem_buf.c	2000/07/31 22:28:58	1.10
  +++ ap_rwmem_buf.c	2000/08/02 05:25:38	1.11
  @@ -65,31 +65,31 @@
   
   static const char * rwmem_get_str(ap_bucket *e)
   {
  -    ap_bucket_rwmem *b = (ap_bucket_rwmem *)e->data;
  +    apr_bucket_rwmem *b = (apr_bucket_rwmem *)e->data;
       return b->start;
   }
   
   static int rwmem_get_len(ap_bucket *e)
   {
  -    ap_bucket_rwmem *b = (ap_bucket_rwmem *)e->data;
  +    apr_bucket_rwmem *b = (apr_bucket_rwmem *)e->data;
       return (char *)b->end - (char *)b->start;
   }
   
   static void rwmem_destroy(void *e)
   {
  -    ap_bucket_rwmem *d = (ap_bucket_rwmem *)e;
  +    apr_bucket_rwmem *d = (apr_bucket_rwmem *)e;
       free(d->alloc_addr);
   }
   
  -static ap_status_t rwmem_split(ap_bucket *e, ap_size_t nbyte)
  +static apr_status_t rwmem_split(ap_bucket *e, apr_size_t nbyte)
   {
       ap_bucket *newbuck;
  -    ap_bucket_rwmem *a = (ap_bucket_rwmem *)e;
  -    ap_bucket_rwmem *b;
  -    ap_ssize_t dump; 
  +    apr_bucket_rwmem *a = (apr_bucket_rwmem *)e;
  +    apr_bucket_rwmem *b;
  +    apr_ssize_t dump; 
   
       newbuck = ap_bucket_rwmem_create(a->alloc_addr, a->alloc_len, &dump);
  -    b = (ap_bucket_rwmem *)newbuck->data;
  +    b = (apr_bucket_rwmem *)newbuck->data;
   
       b->alloc_addr = a->alloc_addr;
       b->alloc_len = a->alloc_len;
  @@ -111,12 +111,12 @@
    * It is worth noting that if an error occurs, the buffer is in an unknown
    * state.
    */
  -static ap_status_t rwmem_insert(ap_bucket *e, const void *buf,
  -                                ap_size_t nbyte, ap_ssize_t *w)
  +static apr_status_t rwmem_insert(ap_bucket *e, const void *buf,
  +                                apr_size_t nbyte, apr_ssize_t *w)
   {
       int amt;
       int total;
  -    ap_bucket_rwmem *b = (ap_bucket_rwmem *)e->data;
  +    apr_bucket_rwmem *b = (apr_bucket_rwmem *)e->data;
   
       if (nbyte == 0) {
           *w = 0;
  @@ -143,10 +143,10 @@
   }
   
   APR_EXPORT(ap_bucket *) ap_bucket_rwmem_create(const void *buf,
  -                                ap_size_t nbyte, ap_ssize_t *w)
  +                                apr_size_t nbyte, apr_ssize_t *w)
   {
       ap_bucket *newbuf;
  -    ap_bucket_rwmem *b;
  +    apr_bucket_rwmem *b;
   
       newbuf = calloc(1, sizeof(*newbuf));
       b = malloc(sizeof(*b));
  
  
  
  1.22      +31 -31    apache-2.0/src/lib/apr/buckets/apr_buf.h
  
  Index: apr_buf.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/apr_buf.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_buf.h	2000/08/01 15:41:54	1.21
  +++ apr_buf.h	2000/08/02 05:25:38	1.22
  @@ -169,23 +169,23 @@
       const char *(*read)(ap_bucket *e);  /* Get the string */
   
       /* Write into a bucket.  The buf is a different type based on the
  -     * bucket type used.  For example, with AP_BUCKET_mmap it is an ap_mmap_t
  -     * for AP_BUCKET_file it is an ap_file_t, and for AP_BUCKET_rwmem it is
  +     * bucket type used.  For example, with AP_BUCKET_mmap it is an apr_mmap_t
  +     * for AP_BUCKET_file it is an apr_file_t, and for AP_BUCKET_rwmem it is
        * a char *.  The nbytes is the amount of actual data in buf.  This is
        * not the sizeof(buf), it is the actual number of bytes in the char *
        * that buf resolves to.  written is how much of that data was inserted
        * into the bucket.
        */ 
  -    int (*write)(ap_bucket *e, const void *buf, ap_size_t nbytes, ap_ssize_t *w);
  +    int (*write)(ap_bucket *e, const void *buf, apr_size_t nbytes, apr_ssize_t *w);
      
       /* Split one bucket into to at the specified position */
  -    ap_status_t (*split)(ap_bucket *e, ap_size_t nbytes);
  +    apr_status_t (*split)(ap_bucket *e, apr_size_t nbytes);
   
       ap_bucket *next;                     /* The next node in the bucket list */
       ap_bucket *prev;                     /* The prev node in the bucket list */
   };
   
  -typedef struct ap_bucket_brigade ap_bucket_brigade;
  +typedef struct apr_bucket_brigade apr_bucket_brigade;
   /*
    * This is the basic bucket brigade.  That means it is a list of buckets.
    * It has a pool out of which the buckets and the bucket brigade are allocated.
  @@ -196,8 +196,8 @@
    * the end.  By walking the list, it is also possible to insert in the middle
    * of the list.
    */
  -struct ap_bucket_brigade {
  -    ap_pool_t *p;                       /* The pool to associate this with.
  +struct apr_bucket_brigade {
  +    apr_pool_t *p;                       /* The pool to associate this with.
                                              I do not allocate out of the pool,
                                              but this lets me register a cleanup
                                              to put a limit on the brigade's 
  @@ -208,7 +208,7 @@
   
   /*    ******  Different bucket types   *****/
   
  -typedef struct ap_bucket_rmem ap_bucket_rmem;
  +typedef struct apr_bucket_rmem apr_bucket_rmem;
   /*
    * The Read only bucket type.  This is basically for memory allocated off the
    * stack or literal strings.  It cannot be modified, and the lifetime is
  @@ -216,14 +216,14 @@
    * two different types.  This contains a pointer to the front and end of the
    * string so that it is possible to remove characters at either end.
    */
  -struct ap_bucket_rmem {
  +struct apr_bucket_rmem {
       size_t  alloc_len;                  /* how much was allocated */
       const void    *start;               /* Where does the actual data start
                                              in the alloc'ed block */
       const void    *end;                 /* where does the data actually end? */
   };
   
  -typedef struct ap_bucket_rwmem ap_bucket_rwmem;
  +typedef struct apr_bucket_rwmem apr_bucket_rwmem;
   /*
    * The read/write memory bucket type.  This is for data that has been 
    * allocated out of the heap.  This bucket actually starts by allocating
  @@ -246,7 +246,7 @@
    * easily add and remove characters at either end.  Oh, the start cannot be
    * after the end either.
    */
  -struct ap_bucket_rwmem {
  +struct apr_bucket_rwmem {
       void    *alloc_addr;                /* Where does the data start */
       size_t  alloc_len;                  /* how much was allocated */
       void    *start;                     /* Where does the actual data start
  @@ -254,7 +254,7 @@
       void    *end;                       /* where does the data actually end? */
   };
   
  -typedef struct ap_bucket_mmap ap_bucket_mmap;
  +typedef struct apr_bucket_mmap apr_bucket_mmap;
   
   /* 
    * The mmap bucket type.  This is basically just an allocation address and a
  @@ -262,7 +262,7 @@
    * has a reference count in it, and a pointer to the beginning and end of
    * the data the bucket is referencing.
    */
  -struct ap_bucket_mmap {
  +struct apr_bucket_mmap {
       void      *alloc_addr;   /* Where does the mmap start? */
       int       len;           /* The amount of data in the mmap that we are 
                                 * referencing with this bucket.  This may be 
  @@ -274,36 +274,36 @@
   /*   ******  Bucket Brigade Functions  *****  */
   
   /* Create a new bucket brigade.  The bucket brigade is originally empty. */
  -APR_EXPORT(ap_bucket_brigade *) ap_brigade_create(ap_pool_t *p);
  +APR_EXPORT(apr_bucket_brigade *) ap_brigade_create(apr_pool_t *p);
   
   /* destroy an enitre bucket brigade.  This includes destroying all of the
    * buckets within the bucket brigade's bucket list. */
  -APR_EXPORT(ap_status_t) ap_brigade_destroy(void *b);
  +APR_EXPORT(apr_status_t) ap_brigade_destroy(void *b);
   
   /* append bucket(s) to a bucket_brigade.  This is the correct way to add
    * buckets to the end of a bucket briagdes bucket list.  This will accept
    * a list of buckets of any length.
    */
  -APR_EXPORT(void) ap_brigade_append_buckets(ap_bucket_brigade *b,
  +APR_EXPORT(void) ap_brigade_append_buckets(apr_bucket_brigade *b,
                                                     ap_bucket *e);
   
   /* consume nbytes from beginning of b -- call ap_bucket_destroy as
       appropriate, and/or modify start on last element */
  -APR_EXPORT(void) ap_brigade_consume(ap_bucket_brigade *, int nbytes);
  +APR_EXPORT(void) ap_brigade_consume(apr_bucket_brigade *, int nbytes);
   
   /* create an iovec of the elements in a bucket_brigade... return number 
    * of elements used.  This is useful for writing to a file or to the
    * network efficiently.
    */
  -APR_EXPORT(int) ap_brigade_to_iovec(ap_bucket_brigade *, 
  +APR_EXPORT(int) ap_brigade_to_iovec(apr_bucket_brigade *, 
                                              struct iovec *vec, int nvec);
   
   /* catenate bucket_brigade b onto bucket_brigade a, bucket_brigade b is 
    * empty after this.  Neither bucket brigade can be NULL, but either one of
    * them can be emtpy when calling this function.
    */
  -APR_EXPORT(void) ap_brigade_catenate(ap_bucket_brigade *a, 
  -                                            ap_bucket_brigade *b);
  +APR_EXPORT(void) ap_brigade_catenate(apr_bucket_brigade *a, 
  +                                            apr_bucket_brigade *b);
   
   /* Destroy the first nvec buckets.  This is very much like ap_brigade_consume
    * except instead of specifying the number of bytes to consume, it consumes
  @@ -312,7 +312,7 @@
    * vectors, we would destroy those 16 buckets.  My gut is that this is the
    * wrong approach.  I plan to change this soon-ish.
    */
  -APR_EXPORT(void) ap_consume_buckets(ap_bucket_brigade *b, int nvec);
  +APR_EXPORT(void) ap_consume_buckets(apr_bucket_brigade *b, int nvec);
   
   /* save the buf out to the specified iol.  This can be used to flush the
    * data to the disk, or to send it out to the network.  This is a poor 
  @@ -320,10 +320,10 @@
    * also required.  Once filters have been finished, the whole concept of
    * iol's can just go away, and this function can go away with it.  The
    * correct solution, is to have the functions that are currently calling 
  - * this just call either ap_sendv or ap_writev directly.
  + * this just call either apr_sendv or apr_writev directly.
    */
  -APR_EXPORT(ap_status_t) ap_brigade_to_iol(ap_ssize_t *total_bytes,
  -                                                 ap_bucket_brigade *a, 
  +APR_EXPORT(apr_status_t) ap_brigade_to_iol(apr_ssize_t *total_bytes,
  +                                                 apr_bucket_brigade *a, 
                                                    ap_iol *iol);
   
   /*
  @@ -337,7 +337,7 @@
    * filters will be removing some of the data.  This may be a dubios
    * optimization, I just don't know.
    */
  -APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va);
  +APR_EXPORT(int) ap_brigade_vputstrs(apr_bucket_brigade *b, va_list va);
   
   /*
    * Both of these functions evaluate the printf and put the resulting string
  @@ -345,8 +345,8 @@
    * two of them, is that the ap_r* functions needed both.  I would love to be
    * able to remove one, but I don't think it's feasible.
    */
  -APR_EXPORT(int) ap_brigade_printf(ap_bucket_brigade *b, const char *fmt, ...);
  -APR_EXPORT(int) ap_brigade_vprintf(ap_bucket_brigade *b, const char *fmt, va_list va);
  +APR_EXPORT(int) ap_brigade_printf(apr_bucket_brigade *b, const char *fmt, ...);
  +APR_EXPORT(int) ap_brigade_vprintf(apr_bucket_brigade *b, const char *fmt, va_list va);
   
   /*   ******  Bucket Functions  *****  */
   
  @@ -356,7 +356,7 @@
    * when the bucket with the last reference is destroyed.  Rwmem buckets
    * always have their data destroyed currently.
    */
  -APR_EXPORT(ap_status_t) ap_bucket_destroy(ap_bucket *e);
  +APR_EXPORT(apr_status_t) ap_bucket_destroy(ap_bucket *e);
   
   /* get the length of the data in the bucket that is currently being
    * referenced.  The bucket may contain more data, but if the start or end
  @@ -379,16 +379,16 @@
   
   /* Create a read/write memory bucket */
   APR_EXPORT(ap_bucket *) ap_bucket_rwmem_create(const void *buf,
  -                                ap_size_t nbyte, ap_ssize_t *w);
  +                                apr_size_t nbyte, apr_ssize_t *w);
   
   
   /* Create a mmap memory bucket */
   APR_EXPORT(ap_bucket *) ap_bucket_mmap_create(const void *buf,
  -                                      ap_size_t nbytes, ap_ssize_t *w);
  +                                      apr_size_t nbytes, apr_ssize_t *w);
   
   /* Create a read only memory bucket. */
   APR_EXPORT(ap_bucket *) ap_bucket_rmem_create(const void *buf,
  -                               ap_size_t nbyte, ap_ssize_t *w);
  +                               apr_size_t nbyte, apr_ssize_t *w);
   
   /* Create an End of Stream bucket */
   APR_EXPORT(ap_bucket *) ap_bucket_eos_create(void);
  
  
  
  1.2       +7 -7      apache-2.0/src/lib/apr/buckets/filters.c
  
  Index: filters.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/filters.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filters.c	2000/07/12 11:04:08	1.1
  +++ filters.c	2000/08/02 05:25:38	1.2
  @@ -68,7 +68,7 @@
    */
   typedef struct ap_filter_rec_t {
       const char *name;
  -    ap_filter_bucket_cb bucket_cb;
  +    apr_filter_bucket_cb bucket_cb;
       ap_filter_type ftype;
   
       struct ap_filter_rec_t *next;
  @@ -96,17 +96,17 @@
                                          || (before_this)->r != (f)->r)
   
   
  -static ap_status_t filter_cleanup(void *ctx)
  +static apr_status_t filter_cleanup(void *ctx)
   {
       registered_filters = NULL;
       return APR_SUCCESS;
   }
   
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    ap_filter_bucket_cb bucket_cb,
  +                                    apr_filter_bucket_cb bucket_cb,
                                       ap_filter_type ftype)
   {
  -    ap_filter_rec_t *frec = ap_palloc(FILTER_POOL, sizeof(*frec));
  +    ap_filter_rec_t *frec = apr_palloc(FILTER_POOL, sizeof(*frec));
   
       frec->name = name;
       frec->bucket_cb = bucket_cb;
  @@ -115,7 +115,7 @@
       frec->next = registered_filters;
       registered_filters = frec;
   
  -    ap_register_cleanup(FILTER_POOL, NULL, filter_cleanup, NULL);
  +    apr_register_cleanup(FILTER_POOL, NULL, filter_cleanup, NULL);
   }
   
   API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r)
  @@ -124,7 +124,7 @@
   
       for (; frec != NULL; frec = frec->next) {
           if (!strcasecmp(name, frec->name)) {
  -            ap_filter_t *f = ap_pcalloc(r->pool, sizeof(*f));
  +            apr_filter_t *f = apr_pcalloc(r->pool, sizeof(*f));
   
               f->bucket_cb = frec->bucket_cb;
               f->r = r;
  @@ -136,7 +136,7 @@
                   r->filters = f;
               }
               else {
  -                ap_filter_t *fscan = r->filters;
  +                apr_filter_t *fscan = r->filters;
                   while (!INSERT_BEFORE(f, fscan->next))
                       fscan = fscan->next;
                   f->next = fscan->next;
  
  
  
  1.5       +7 -7      apache-2.0/src/lib/apr/buckets/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/util_filter.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_filter.c	2000/07/25 03:31:41	1.4
  +++ util_filter.c	2000/08/02 05:25:39	1.5
  @@ -66,7 +66,7 @@
    */
   typedef struct ap_filter_rec_t {
       const char *name;
  -    ap_filter_func filter_func;
  +    apr_filter_func filter_func;
       ap_filter_type ftype;
   
       struct ap_filter_rec_t *next;
  @@ -93,17 +93,17 @@
                                          || (before_this)->ftype > (f)->ftype)
   
   
  -static ap_status_t filter_cleanup(void *ctx)
  +static apr_status_t filter_cleanup(void *ctx)
   {
       registered_filters = NULL;
       return APR_SUCCESS;
   }
   
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    ap_filter_func filter_func,
  +                                    apr_filter_func filter_func,
                                       ap_filter_type ftype)
   {
  -    ap_filter_rec_t *frec = ap_palloc(FILTER_POOL, sizeof(*frec));
  +    ap_filter_rec_t *frec = apr_palloc(FILTER_POOL, sizeof(*frec));
   
       frec->name = name;
       frec->filter_func = filter_func;
  @@ -112,7 +112,7 @@
       frec->next = registered_filters;
       registered_filters = frec;
   
  -    ap_register_cleanup(FILTER_POOL, NULL, filter_cleanup, NULL);
  +    apr_register_cleanup(FILTER_POOL, NULL, filter_cleanup, NULL);
   }
   
   API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r)
  @@ -121,7 +121,7 @@
   
       for (; frec != NULL; frec = frec->next) {
           if (!strcasecmp(name, frec->name)) {
  -            ap_filter_t *f = ap_pcalloc(r->pool, sizeof(*f));
  +            apr_filter_t *f = apr_pcalloc(r->pool, sizeof(*f));
   
               f->filter_func = frec->filter_func;
               f->ctx = ctx;
  @@ -132,7 +132,7 @@
                   r->filters = f;
               }
               else {
  -                ap_filter_t *fscan = r->filters;
  +                apr_filter_t *fscan = r->filters;
                   while (!INSERT_BEFORE(f, fscan->next))
                       fscan = fscan->next;
                   f->next = fscan->next;
  
  
  
  1.5       +10 -10    apache-2.0/src/lib/apr/buckets/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/util_filter.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- util_filter.h	2000/07/25 03:31:41	1.4
  +++ util_filter.h	2000/08/02 05:25:39	1.5
  @@ -92,10 +92,10 @@
    */
   
   /* forward declare the filter type */
  -typedef struct ap_filter_t ap_filter_t;
  +typedef struct apr_filter_t apr_filter_t;
   
   /*
  - * ap_filter_func:
  + * apr_filter_func:
    *
    * This function type is used for filter callbacks. It will be passed a
    * pointer to "this" filter, and a "bucket" containing the content to be
  @@ -114,7 +114,7 @@
    * next/prev to insert/remove/replace elements in the bucket list, but
    * the types and values of the individual buckets should not be altered.
    */
  -typedef ap_status_t (*ap_filter_func)();
  +typedef apr_status_t (*apr_filter_func)();
   
   /*
    * ap_filter_type:
  @@ -146,7 +146,7 @@
   } ap_filter_type;
   
   /*
  - * ap_filter_t:
  + * apr_filter_t:
    *
    * This is the request-time context structure for an installed filter (in
    * the output filter chain). It provides the callback to use for filtering,
  @@ -159,13 +159,13 @@
    * the state directly with the request. A callback should not change any of
    * the other fields.
    */
  -struct ap_filter_t {
  -    ap_filter_func filter_func;
  +struct apr_filter_t {
  +    apr_filter_func filter_func;
   
       void *ctx;
   
       ap_filter_type ftype;
  -    ap_filter_t *next;
  +    apr_filter_t *next;
   };
   
   /*
  @@ -178,7 +178,7 @@
    * The filter's callback and type should be passed.
    */
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    ap_filter_func filter_func,
  +                                    apr_filter_func filter_func,
                                       ap_filter_type ftype);
   
   /*
  @@ -198,9 +198,9 @@
   
   /*
    * Things to do later:
  - * Add parameters to ap_filter_func type.  Those parameters will be something
  + * Add parameters to apr_filter_func type.  Those parameters will be something
    *     like:
  - *         (request_rec *r, ap_filter_t *filter, ap_data_list *the_data)
  + *         (request_rec *r, apr_filter_t *filter, ap_data_list *the_data)
    *      obviously, the request_rec is the current request, and the filter
    *      is the current filter stack.  The data_list is a bucket list or
    *      bucket_brigade, but I am trying to keep this patch neutral.  (If this
  
  
  
  1.7       +6 -6      apache-2.0/src/lib/apr/dso/aix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dso.c	2000/07/15 01:07:43	1.6
  +++ dso.c	2000/08/02 05:25:40	1.7
  @@ -132,21 +132,21 @@
    * add the basic "wrappers" here.
    */
   
  -ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
  -                        ap_pool_t *ctx)
  +apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, 
  +                        apr_pool_t *ctx)
   {
       void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
   
       if(os_handle == NULL)
           return APR_EDSOOPEN;
   
  -    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
  +    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
       (*res_handle)->handle = (void*)os_handle;
       (*res_handle)->cont = ctx;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
  +apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
   {
       if (dlclose(handle->handle) != 0)
           return APR_EINIT;
  @@ -154,8 +154,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       ap_dso_handle_t *handle, 
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
  +                       apr_dso_handle_t *handle, 
                          const char *symname)
   {
       void *retval = dlsym(handle->handle, symname);
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/dso/aix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dso.h	2000/06/01 01:01:12	1.5
  +++ dso.h	2000/08/02 05:25:40	1.6
  @@ -68,8 +68,8 @@
   const char *dlerror(void);
   int dlclose(void *handle);
   
  -struct ap_dso_handle_t {
  -    ap_pool_t  *cont;
  +struct apr_dso_handle_t {
  +    apr_pool_t  *cont;
       void          *handle;
   };
   
  
  
  
  1.10      +6 -6      apache-2.0/src/lib/apr/dso/beos/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- dso.c	2000/07/15 01:07:43	1.9
  +++ dso.c	2000/08/02 05:25:41	1.10
  @@ -56,21 +56,21 @@
   
   #if APR_HAS_DSO
   
  -ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
  -              ap_pool_t *ctx)
  +apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
  +              apr_pool_t *ctx)
   {
       image_id newid;
   
       if((newid = load_add_on(path)) < B_NO_ERROR)
           return APR_EINIT;
   
  -    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
  +    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
       (*res_handle)->handle = newid;
       (*res_handle)->cont = ctx;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
  +apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
   {
       if(unload_add_on(handle->handle) < B_NO_ERROR)
         return APR_EINIT;
  @@ -78,7 +78,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, ap_dso_handle_t *handle,
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t *handle,
                  const char *symname)
   {
       int err;
  @@ -95,7 +95,7 @@
       return APR_SUCCESS;
   }
   
  -const char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
  +const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
   {
       strncpy(strerror(errno), buffer, buflen);
       return buffer;
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/dso/beos/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- dso.h	2000/06/17 11:32:36	1.8
  +++ dso.h	2000/08/02 05:25:42	1.9
  @@ -66,9 +66,9 @@
   
   #if APR_HAS_DSO
   
  -struct ap_dso_handle_t {
  +struct apr_dso_handle_t {
       image_id       handle;    /* Handle to the DSO loaded */
  -    ap_pool_t   *cont;
  +    apr_pool_t   *cont;
   };
   
   #endif
  
  
  
  1.12      +13 -13    apache-2.0/src/lib/apr/dso/os2/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- dso.c	2000/07/15 01:07:44	1.11
  +++ dso.c	2000/08/02 05:25:42	1.12
  @@ -60,38 +60,38 @@
   
   #if APR_HAS_DSO
   
  -static ap_status_t dso_cleanup(void *thedso)
  +static apr_status_t dso_cleanup(void *thedso)
   {
  -    ap_dso_handle_t *dso = thedso;
  -    return ap_dso_unload(dso);
  +    apr_dso_handle_t *dso = thedso;
  +    return apr_dso_unload(dso);
   }
   
   
  -ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_pool_t *ctx)
  +apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx)
   {
       char failed_module[20];
       HMODULE handle;
       int rc;
   
  -    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
  +    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
       (*res_handle)->cont = ctx;
       (*res_handle)->load_error = APR_SUCCESS;
       (*res_handle)->failed_module = NULL;
   
       if ((rc = DosLoadModule(failed_module, sizeof(failed_module), path, &handle)) != 0) {
           (*res_handle)->load_error = APR_OS2_STATUS(rc);
  -        (*res_handle)->failed_module = ap_pstrdup(ctx, failed_module);
  +        (*res_handle)->failed_module = apr_pstrdup(ctx, failed_module);
           return APR_OS2_STATUS(rc);
       }
   
       (*res_handle)->handle  = handle;
  -    ap_register_cleanup(ctx, *res_handle, dso_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
  +apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
   {
       int rc;
   
  @@ -108,8 +108,8 @@
   
   
   
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       ap_dso_handle_t *handle, 
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
  +                       apr_dso_handle_t *handle, 
                          const char *symname)
   {
       PFN func;
  @@ -127,14 +127,14 @@
   
   
   
  -char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
  +char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
   {
       char message[200];
  -    ap_strerror(dso->load_error, message, sizeof(message));
  +    apr_strerror(dso->load_error, message, sizeof(message));
       strcat(message, " (");
       strcat(message, dso->failed_module);
       strcat(message, ")");
  -    ap_cpystrn(buffer, message, buflen);
  +    apr_cpystrn(buffer, message, buflen);
       return buffer;
   }
   
  
  
  
  1.11      +3 -3      apache-2.0/src/lib/apr/dso/os2/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- dso.h	2000/06/01 01:01:13	1.10
  +++ dso.h	2000/08/02 05:25:42	1.11
  @@ -66,10 +66,10 @@
   
   #if APR_HAS_DSO
   
  -struct ap_dso_handle_t {
  -    ap_pool_t  *cont;       /* Context for returning error strings */
  +struct apr_dso_handle_t {
  +    apr_pool_t  *cont;       /* Context for returning error strings */
       HMODULE       handle;     /* Handle to the DSO loaded            */
  -    ap_status_t   load_error;
  +    apr_status_t   load_error;
       char          *failed_module;
   };
   
  
  
  
  1.23      +7 -7      apache-2.0/src/lib/apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- dso.c	2000/07/30 01:58:18	1.22
  +++ dso.c	2000/08/02 05:25:43	1.23
  @@ -56,8 +56,8 @@
   
   #if APR_HAS_DSO
   
  -ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
  -                        ap_pool_t *ctx)
  +apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, 
  +                        apr_pool_t *ctx)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
       shl_t os_handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
  @@ -68,7 +68,7 @@
       void *os_handle = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
   #endif    
   
  -    *res_handle = ap_pcalloc(ctx, sizeof(**res_handle));
  +    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
   
       if(os_handle == NULL) {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
  @@ -86,7 +86,7 @@
       return APR_SUCCESS;
   }
       
  -ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
  +apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
       shl_unload((shl_t)handle->handle);
  @@ -99,8 +99,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       ap_dso_handle_t *handle, 
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
  +                       apr_dso_handle_t *handle, 
                          const char *symname)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
  @@ -141,7 +141,7 @@
   #endif /* not HP-UX; use dlsym()/dlerror() */
   }
   
  -const char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
  +const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
   {
       if (dso->errormsg)
           return dso->errormsg;
  
  
  
  1.11      +2 -2      apache-2.0/src/lib/apr/dso/unix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- dso.h	2000/06/11 15:01:52	1.10
  +++ dso.h	2000/08/02 05:25:43	1.11
  @@ -85,8 +85,8 @@
   #define DLSYM_NEEDS_UNDERSCORE
   #endif
   
  -struct ap_dso_handle_t {
  -    ap_pool_t  *cont;
  +struct apr_dso_handle_t {
  +    apr_pool_t  *cont;
       void          *handle;
       const char *errormsg;
   };
  
  
  
  1.10      +8 -8      apache-2.0/src/lib/apr/dso/win32/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- dso.c	2000/07/15 01:07:45	1.9
  +++ dso.c	2000/08/02 05:25:43	1.10
  @@ -56,11 +56,11 @@
   
   #if APR_HAS_DSO
   
  -ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, 
  -                        ap_pool_t *ctx)
  +apr_status_t apr_dso_load(struct apr_dso_handle_t **res_handle, const char *path, 
  +                        apr_pool_t *ctx)
   {
       HINSTANCE os_handle = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
  -    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
  +    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
   
       if(os_handle == NULL) {
           (*res_handle)->load_error = GetLastError();
  @@ -73,7 +73,7 @@
       return APR_SUCCESS;
   }
       
  -ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
  +apr_status_t apr_dso_unload(struct apr_dso_handle_t *handle)
   {
       if (!FreeLibrary(handle->handle)) {
           return GetLastError();
  @@ -81,8 +81,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       struct ap_dso_handle_t *handle, 
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
  +                       struct apr_dso_handle_t *handle, 
                          const char *symname)
   {
       FARPROC retval = GetProcAddress(handle->handle, symname);
  @@ -95,9 +95,9 @@
       return APR_SUCCESS;
   }
   
  -const char *ap_dso_error(ap_dso_handle_t *dso, char *buf, ap_size_t bufsize)
  +const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize)
   {
  -    return ap_strerror(dso->load_error, buf, bufsize);
  +    return apr_strerror(dso->load_error, buf, bufsize);
   }
   
   #endif
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/dso/win32/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dso.h	2000/06/01 01:01:15	1.5
  +++ dso.h	2000/08/02 05:25:43	1.6
  @@ -63,10 +63,10 @@
   
   #if APR_HAS_DSO
   
  -struct ap_dso_handle_t {
  -    ap_pool_t  *cont;
  +struct apr_dso_handle_t {
  +    apr_pool_t  *cont;
       void          *handle;
  -    ap_status_t   load_error;
  +    apr_status_t   load_error;
   };
   
   #endif
  
  
  
  1.14      +19 -19    apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- dir.c	2000/04/28 18:27:35	1.13
  +++ dir.c	2000/08/02 05:25:44	1.14
  @@ -60,23 +60,23 @@
   #define INCL_DOS
   #include <os2.h>
   
  -static ap_status_t dir_cleanup(void *thedir)
  +static apr_status_t dir_cleanup(void *thedir)
   {
  -    ap_dir_t *dir = thedir;
  -    return ap_closedir(dir);
  +    apr_dir_t *dir = thedir;
  +    return apr_closedir(dir);
   }
   
   
   
  -ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cntxt)
  +apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cntxt)
   {
  -    ap_dir_t *thedir = (ap_dir_t *)ap_palloc(cntxt, sizeof(ap_dir_t));
  +    apr_dir_t *thedir = (apr_dir_t *)apr_palloc(cntxt, sizeof(apr_dir_t));
       
       if (thedir == NULL)
           return APR_ENOMEM;
       
       thedir->cntxt = cntxt;
  -    thedir->dirname = ap_pstrdup(cntxt, dirname);
  +    thedir->dirname = apr_pstrdup(cntxt, dirname);
   
       if (thedir->dirname == NULL)
           return APR_ENOMEM;
  @@ -84,13 +84,13 @@
       thedir->handle = 0;
       thedir->validentry = FALSE;
       *new = thedir;
  -    ap_register_cleanup(cntxt, thedir, dir_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(cntxt, thedir, dir_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_closedir(ap_dir_t *thedir)
  +apr_status_t apr_closedir(apr_dir_t *thedir)
   {
       int rv = 0;
       
  @@ -107,14 +107,14 @@
   
   
   
  -ap_status_t ap_readdir(ap_dir_t *thedir)
  +apr_status_t apr_readdir(apr_dir_t *thedir)
   {
       int rv;
       ULONG entries = 1;
       
       if (thedir->handle == 0) {
           thedir->handle = HDIR_CREATE;
  -        rv = DosFindFirst(ap_pstrcat(thedir->cntxt, thedir->dirname, "/*", NULL), &thedir->handle, 
  +        rv = DosFindFirst(apr_pstrcat(thedir->cntxt, thedir->dirname, "/*", NULL), &thedir->handle, 
                             FILE_ARCHIVED|FILE_DIRECTORY|FILE_SYSTEM|FILE_HIDDEN|FILE_READONLY, 
                             &thedir->entry, sizeof(thedir->entry), &entries, FIL_STANDARD);
       } else {
  @@ -136,28 +136,28 @@
   
   
   
  -ap_status_t ap_rewinddir(ap_dir_t *thedir)
  +apr_status_t apr_rewinddir(apr_dir_t *thedir)
   {
  -    return ap_closedir(thedir);
  +    return apr_closedir(thedir);
   }
   
   
   
  -ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, apr_pool_t *cont)
   {
       return APR_OS2_STATUS(DosCreateDir(path, NULL));
   }
   
   
   
  -ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
  +apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont)
   {
       return APR_OS2_STATUS(DosDeleteDir(path));
   }
   
   
   
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir)
   {
       if (thedir->validentry) {
           *size = thedir->entry.cbFile;
  @@ -169,7 +169,7 @@
   
   
   
  -ap_status_t ap_dir_entry_mtime(ap_time_t *time, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_mtime(apr_time_t *time, apr_dir_t *thedir)
   {
       if (thedir->validentry) {
           ap_os2_time_to_ap_time(time, thedir->entry.fdateLastWrite, thedir->entry.ftimeLastWrite);
  @@ -181,7 +181,7 @@
   
   
   
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
   {
       int rc;
       HFILE hFile;
  @@ -193,7 +193,7 @@
               *type = APR_DIR;
               return APR_SUCCESS;
           } else {
  -            rc = DosOpen(ap_pstrcat(thedir->cntxt, thedir->dirname, "/", thedir->entry.achName, NULL) ,
  +            rc = DosOpen(apr_pstrcat(thedir->cntxt, thedir->dirname, "/", thedir->entry.achName, NULL) ,
                            &hFile, &action, 0, 0,
                            OPEN_ACTION_FAIL_IF_NEW|OPEN_ACTION_OPEN_IF_EXISTS, OPEN_SHARE_DENYNONE|OPEN_ACCESS_READONLY,
                            NULL);
  @@ -216,7 +216,7 @@
   
   
   
  -ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir)
  +apr_status_t apr_get_dir_filename(char **new, apr_dir_t *thedir)
   {
       if (thedir->validentry) {
           *new = thedir->entry.achName;
  
  
  
  1.15      +6 -6      apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- filedup.c	2000/04/28 06:18:56	1.14
  +++ filedup.c	2000/08/02 05:25:44	1.15
  @@ -60,13 +60,13 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p)
  +apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
   {
       int rv;
  -    ap_file_t *dup_file;
  +    apr_file_t *dup_file;
   
       if (*new_file == NULL) {
  -        dup_file = (ap_file_t *)ap_palloc(p, sizeof(ap_file_t));
  +        dup_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t));
   
           if (dup_file == NULL) {
               return APR_ENOMEM;
  @@ -84,7 +84,7 @@
           return APR_OS2_STATUS(rv);
       }
   
  -    dup_file->fname = ap_pstrdup(dup_file->cntxt, old_file->fname);
  +    dup_file->fname = apr_pstrdup(dup_file->cntxt, old_file->fname);
       dup_file->buffered = old_file->buffered;
       dup_file->isopen = old_file->isopen;
       dup_file->flags = old_file->flags;
  @@ -92,8 +92,8 @@
       dup_file->pipe = old_file->pipe;
   
       if (*new_file == NULL) {
  -        ap_register_cleanup(dup_file->cntxt, dup_file, apr_file_cleanup,
  -                            ap_null_cleanup);
  +        apr_register_cleanup(dup_file->cntxt, dup_file, apr_file_cleanup,
  +                            apr_null_cleanup);
           *new_file = dup_file;
       }
   
  
  
  
  1.20      +8 -8      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- fileio.h	2000/07/07 06:01:20	1.19
  +++ fileio.h	2000/08/02 05:25:44	1.20
  @@ -67,14 +67,14 @@
   
   #define APR_FILE_BUFSIZE 4096
   
  -struct ap_file_t {
  -    ap_pool_t *cntxt;
  +struct apr_file_t {
  +    apr_pool_t *cntxt;
       HFILE filedes;
       char * fname;
       int isopen;
       int buffered;
       int eof_hit;
  -    ap_int32_t flags;
  +    apr_int32_t flags;
       int timeout;
       int pipe;
       HEV pipeSem;
  @@ -85,19 +85,19 @@
       unsigned long dataRead;   // amount of valid data read into buffer
       int direction;            // buffer being used for 0 = read, 1 = write
       unsigned long filePtr;    // position in file of handle
  -    ap_lock_t *mutex;         // mutex semaphore, must be owned to access the above fields
  +    apr_lock_t *mutex;         // mutex semaphore, must be owned to access the above fields
   };
   
  -struct ap_dir_t {
  -    ap_pool_t *cntxt;
  +struct apr_dir_t {
  +    apr_pool_t *cntxt;
       char *dirname;
       ULONG handle;
       FILEFINDBUF3 entry;
       int validentry;
   };
   
  -ap_status_t apr_file_cleanup(void *);
  -ap_status_t ap_os2_time_to_ap_time(ap_time_t *result, FDATE os2date, FTIME os2time);
  +apr_status_t apr_file_cleanup(void *);
  +apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time);
   
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.11      +6 -6      apache-2.0/src/lib/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- filestat.c	2000/07/03 12:06:27	1.10
  +++ filestat.c	2000/08/02 05:25:46	1.11
  @@ -61,7 +61,7 @@
   #include <os2.h>
   
   
  -static void FS3_to_finfo(ap_finfo_t *finfo, FILESTATUS3 *fstatus)
  +static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
   {
       finfo->protection = (fstatus->attrFile & FILE_READONLY) ? 0555 : 0777;
   
  @@ -82,7 +82,7 @@
   
   
   
  -static ap_status_t handle_type(ap_filetype_e *ftype, HFILE file)
  +static apr_status_t handle_type(ap_filetype_e *ftype, HFILE file)
   {
       ULONG filetype, fileattr, rc;
   
  @@ -110,7 +110,7 @@
   
   
   
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
  +apr_status_t apr_getfileinfo(apr_finfo_t *finfo, apr_file_t *thefile)
   {
       ULONG rc;
       FILESTATUS3 fstatus;
  @@ -137,13 +137,13 @@
       return APR_OS2_STATUS(rc);
   }
   
  -ap_status_t ap_setfileperms(const char *fname, ap_fileperms_t perms)
  +apr_status_t apr_setfileperms(const char *fname, apr_fileperms_t perms)
   {
       return APR_ENOTIMPL;
   }
   
   
  -ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
  +apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
   {
       ULONG rc;
       FILESTATUS3 fstatus;
  @@ -156,7 +156,7 @@
           FS3_to_finfo(finfo, &fstatus);
           return APR_SUCCESS;
       } else if (rc == ERROR_INVALID_ACCESS) {
  -        memset(finfo, 0, sizeof(ap_finfo_t));
  +        memset(finfo, 0, sizeof(apr_finfo_t));
           finfo->protection = 0444;
           finfo->filetype = APR_CHR;
           return APR_SUCCESS;
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c
  
  Index: maperrorcode.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maperrorcode.c	2000/04/20 14:29:27	1.8
  +++ maperrorcode.c	2000/08/02 05:25:46	1.9
  @@ -115,7 +115,7 @@
   
   #define MAPSIZE (sizeof(errormap)/sizeof(errormap[0]))
   
  -int ap_canonical_error(ap_status_t err)
  +int apr_canonical_error(apr_status_t err)
   {
       int rv = -1, index;
   
  @@ -129,7 +129,7 @@
       if (index<MAPSIZE)
           rv = errormap[index][1];
       else
  -        fprintf(stderr, "ap_canonical_error: Unknown OS/2 error code %d\n", err );
  +        fprintf(stderr, "apr_canonical_error: Unknown OS/2 error code %d\n", err );
           
       return rv;
   }
  
  
  
  1.30      +23 -23    apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- open.c	2000/07/07 06:01:20	1.29
  +++ open.c	2000/08/02 05:25:47	1.30
  @@ -58,21 +58,21 @@
   #include "apr_portable.h"
   #include <string.h>
   
  -ap_status_t apr_file_cleanup(void *thefile)
  +apr_status_t apr_file_cleanup(void *thefile)
   {
  -    ap_file_t *file = thefile;
  -    return ap_close(file);
  +    apr_file_t *file = thefile;
  +    return apr_close(file);
   }
   
   
   
  -ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t perm, ap_pool_t *cntxt)
  +apr_status_t apr_open(apr_file_t **new, const char *fname, apr_int32_t flag,  apr_fileperms_t perm, apr_pool_t *cntxt)
   {
       int oflags = 0;
       int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
       int rv;
       ULONG action;
  -    ap_file_t *dafile = (ap_file_t *)ap_palloc(cntxt, sizeof(ap_file_t));
  +    apr_file_t *dafile = (apr_file_t *)apr_palloc(cntxt, sizeof(apr_file_t));
   
       *new = dafile;
       dafile->cntxt = cntxt;
  @@ -95,8 +95,8 @@
       dafile->buffered = (flag & APR_BUFFERED) > 0;
   
       if (dafile->buffered) {
  -        dafile->buffer = ap_palloc(cntxt, APR_FILE_BUFSIZE);
  -        rv = ap_create_lock(&dafile->mutex, APR_MUTEX, APR_INTRAPROCESS, NULL, cntxt);
  +        dafile->buffer = apr_palloc(cntxt, APR_FILE_BUFSIZE);
  +        rv = apr_create_lock(&dafile->mutex, APR_MUTEX, APR_INTRAPROCESS, NULL, cntxt);
   
           if (rv)
               return rv;
  @@ -135,26 +135,26 @@
           return APR_OS2_STATUS(rv);
       
       dafile->isopen = TRUE;
  -    dafile->fname = ap_pstrdup(cntxt, fname);
  +    dafile->fname = apr_pstrdup(cntxt, fname);
       dafile->filePtr = 0;
       dafile->bufpos = 0;
       dafile->dataRead = 0;
       dafile->direction = 0;
       dafile->pipe = FALSE;
   
  -    ap_register_cleanup(dafile->cntxt, dafile, apr_file_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(dafile->cntxt, dafile, apr_file_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_close(ap_file_t *file)
  +apr_status_t apr_close(apr_file_t *file)
   {
       ULONG rc;
  -    ap_status_t status;
  +    apr_status_t status;
       
       if (file && file->isopen) {
  -        ap_flush(file);
  +        apr_flush(file);
           rc = DosClose(file->filedes);
       
           if (rc == 0) {
  @@ -170,14 +170,14 @@
       }
   
       if (file->buffered)
  -        ap_destroy_lock(file->mutex);
  +        apr_destroy_lock(file->mutex);
   
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_remove_file(const char *path, ap_pool_t *cntxt)
  +apr_status_t apr_remove_file(const char *path, apr_pool_t *cntxt)
   {
       ULONG rc = DosDelete(path);
       return APR_OS2_STATUS(rc);
  @@ -185,8 +185,8 @@
   
   
   
  -ap_status_t ap_rename_file(const char *from_path, const char *to_path,
  -                           ap_pool_t *p)
  +apr_status_t apr_rename_file(const char *from_path, const char *to_path,
  +                           apr_pool_t *p)
   {
       ULONG rc = DosMove(from_path, to_path);
   
  @@ -203,7 +203,7 @@
   
   
   
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file)
  +apr_status_t apr_get_os_file(apr_os_file_t *thefile, apr_file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  @@ -215,11 +215,11 @@
   
   
   
  -ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_pool_t *cont)
  +apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, apr_pool_t *cont)
   {
  -    ap_os_file_t *dafile = thefile;
  +    apr_os_file_t *dafile = thefile;
       if ((*file) == NULL) {
  -        (*file) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
  +        (*file) = (apr_file_t *)apr_palloc(cont, sizeof(apr_file_t));
           (*file)->cntxt = cont;
       }
       (*file)->filedes = *dafile;
  @@ -233,7 +233,7 @@
   
   
   
  -ap_status_t ap_eof(ap_file_t *fptr)
  +apr_status_t apr_eof(apr_file_t *fptr)
   {
       if (!fptr->isopen || fptr->eof_hit == 1) {
           return APR_EOF;
  @@ -243,9 +243,9 @@
   
   
   
  -ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
  +apr_status_t apr_open_stderr(apr_file_t **thefile, apr_pool_t *cont)
   {
  -    (*thefile) = ap_palloc(cont, sizeof(ap_file_t));
  +    (*thefile) = apr_palloc(cont, sizeof(apr_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.25      +9 -9      apache-2.0/src/lib/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- pipe.c	2000/06/25 08:19:24	1.24
  +++ pipe.c	2000/08/02 05:25:47	1.25
  @@ -60,7 +60,7 @@
   #include <string.h>
   #include <process.h>
   
  -ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
  +apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *cont)
   {
       ULONG filedes[2];
       ULONG rc, action;
  @@ -90,7 +90,7 @@
           return APR_OS2_STATUS(rc);
       }
   
  -    (*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
  +    (*in) = (apr_file_t *)apr_palloc(cont, sizeof(apr_file_t));
       rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
   
       if (rc) {
  @@ -114,31 +114,31 @@
   
       (*in)->cntxt = cont;
       (*in)->filedes = filedes[0];
  -    (*in)->fname = ap_pstrdup(cont, pipename);
  +    (*in)->fname = apr_pstrdup(cont, pipename);
       (*in)->isopen = TRUE;
       (*in)->buffered = FALSE;
       (*in)->flags = 0;
       (*in)->pipe = 1;
       (*in)->timeout = -1;
  -    ap_register_cleanup(cont, *in, apr_file_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(cont, *in, apr_file_cleanup, apr_null_cleanup);
   
  -    (*out) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
  +    (*out) = (apr_file_t *)apr_palloc(cont, sizeof(apr_file_t));
       (*out)->cntxt = cont;
       (*out)->filedes = filedes[1];
  -    (*out)->fname = ap_pstrdup(cont, pipename);
  +    (*out)->fname = apr_pstrdup(cont, pipename);
       (*out)->isopen = TRUE;
       (*out)->buffered = FALSE;
       (*out)->flags = 0;
       (*out)->pipe = 1;
       (*out)->timeout = -1;
  -    ap_register_cleanup(cont, *out, apr_file_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(cont, *out, apr_file_cleanup, apr_null_cleanup);
   
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_create_namedpipe(const char *filename, ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_create_namedpipe(const char *filename, apr_fileperms_t perm, apr_pool_t *cont)
   {
       /* Not yet implemented, interface not suitable */
       return APR_ENOTIMPL;
  @@ -146,7 +146,7 @@
   
    
   
  -ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_interval_time_t timeout)
  +apr_status_t apr_set_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t timeout)
   {
       if (thepipe->pipe == 1) {
           thepipe->timeout = timeout;
  
  
  
  1.29      +26 -26    apache-2.0/src/lib/apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- readwrite.c	2000/06/17 17:04:15	1.28
  +++ readwrite.c	2000/08/02 05:25:47	1.29
  @@ -62,7 +62,7 @@
   #include <os2.h>
   #include <malloc.h>
   
  -ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes)
   {
       ULONG rc = 0;
       ULONG bytesread;
  @@ -77,10 +77,10 @@
           ULONG blocksize;
           ULONG size = *nbytes;
   
  -        ap_lock(thefile->mutex);
  +        apr_lock(thefile->mutex);
   
           if (thefile->direction == 1) {
  -            ap_flush(thefile);
  +            apr_flush(thefile);
               thefile->bufpos = 0;
               thefile->direction = 0;
               thefile->dataRead = 0;
  @@ -106,7 +106,7 @@
           }
   
           *nbytes = rc == 0 ? pos - (char *)buf : 0;
  -        ap_unlock(thefile->mutex);
  +        apr_unlock(thefile->mutex);
           return APR_OS2_STATUS(rc);
       } else {
           if (thefile->pipe)
  @@ -138,7 +138,7 @@
   
   
   
  -ap_status_t ap_write(ap_file_t *thefile, const void *buf, ap_ssize_t *nbytes)
  +apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
   {
       ULONG rc = 0;
       ULONG byteswritten;
  @@ -153,7 +153,7 @@
           int blocksize;
           int size = *nbytes;
   
  -        ap_lock(thefile->mutex);
  +        apr_lock(thefile->mutex);
   
           if ( thefile->direction == 0 ) {
               // Position file pointer for writing at the offset we are logically reading from
  @@ -166,7 +166,7 @@
   
           while (rc == 0 && size > 0) {
               if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
  -                rc = ap_flush(thefile);
  +                rc = apr_flush(thefile);
   
               blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
               memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
  @@ -175,7 +175,7 @@
               size -= blocksize;
           }
   
  -        ap_unlock(thefile->mutex);
  +        apr_unlock(thefile->mutex);
           return APR_OS2_STATUS(rc);
       } else {
           rc = DosWrite(thefile->filedes, buf, *nbytes, &byteswritten);
  @@ -194,7 +194,7 @@
   
   #ifdef HAVE_WRITEV
   
  -ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes)
  +apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_ssize_t *nbytes)
   {
       int bytes;
       if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
  @@ -210,7 +210,7 @@
   
   
   
  -ap_status_t ap_putc(char ch, ap_file_t *thefile)
  +apr_status_t apr_putc(char ch, apr_file_t *thefile)
   {
       ULONG rc;
       ULONG byteswritten;
  @@ -230,15 +230,15 @@
   
   
   
  -ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
  +apr_status_t apr_ungetc(char ch, apr_file_t *thefile)
   {
  -    ap_off_t offset = -1;
  -    return ap_seek(thefile, APR_CUR, &offset);
  +    apr_off_t offset = -1;
  +    return apr_seek(thefile, APR_CUR, &offset);
   }
   
   
   
  -ap_status_t ap_getc(char *ch, ap_file_t *thefile)
  +apr_status_t apr_getc(char *ch, apr_file_t *thefile)
   {
       ULONG rc;
       int bytesread;
  @@ -248,7 +248,7 @@
       }
   
       bytesread = 1;
  -    rc = ap_read(thefile, ch, &bytesread);
  +    rc = apr_read(thefile, ch, &bytesread);
   
       if (rc) {
           return rc;
  @@ -264,17 +264,17 @@
   
   
   
  -ap_status_t ap_puts(const char *str, ap_file_t *thefile)
  +apr_status_t apr_puts(const char *str, apr_file_t *thefile)
   {
  -    ap_ssize_t len;
  +    apr_ssize_t len;
   
       len = strlen(str);
  -    return ap_write(thefile, str, &len); 
  +    return apr_write(thefile, str, &len); 
   }
   
   
   
  -ap_status_t ap_flush(ap_file_t *thefile)
  +apr_status_t apr_flush(apr_file_t *thefile)
   {
       if (thefile->buffered) {
           ULONG written = 0;
  @@ -299,15 +299,15 @@
   
   
   
  -ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
  +apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
   {
       ssize_t readlen;
  -    ap_status_t rv = APR_SUCCESS;
  +    apr_status_t rv = APR_SUCCESS;
       int i;    
   
       for (i = 0; i < len-1; i++) {
           readlen = 1;
  -        rv = ap_read(thefile, str+i, &readlen);
  +        rv = apr_read(thefile, str+i, &readlen);
   
           if (readlen != 1) {
               rv = APR_EOF;
  @@ -325,7 +325,7 @@
   
   
   
  -APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
  +APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  @@ -337,8 +337,8 @@
           return 0;
       }
       va_start(ap, format);
  -    len = ap_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  -    cc = ap_puts(buf, fptr);
  +    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  +    cc = apr_puts(buf, fptr);
       va_end(ap);
       free(buf);
       return (cc == APR_SUCCESS) ? len : -1;
  @@ -346,7 +346,7 @@
   
   
   
  -ap_status_t ap_file_check_read(ap_file_t *fd)
  +apr_status_t ap_file_check_read(apr_file_t *fd)
   {
       int rc;
   
  
  
  
  1.9       +5 -5      apache-2.0/src/lib/apr/file_io/os2/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/seek.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- seek.c	2000/04/08 06:58:39	1.8
  +++ seek.c	2000/08/02 05:25:47	1.9
  @@ -63,13 +63,13 @@
   
   
   
  -static ap_status_t setptr(ap_file_t *thefile, unsigned long pos )
  +static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
   {
       long newbufpos;
       ULONG rc;
   
       if (thefile->direction == 1) {
  -        ap_flush(thefile);
  +        apr_flush(thefile);
           thefile->bufpos = thefile->direction = thefile->dataRead = 0;
       }
   
  @@ -89,7 +89,7 @@
   
   
   
  -ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +apr_status_t apr_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
   {
       if (!thefile->isopen) {
           return APR_EBADF;
  @@ -97,7 +97,7 @@
   
       if (thefile->buffered) {
           int rc = EINVAL;
  -        ap_finfo_t finfo;
  +        apr_finfo_t finfo;
   
           switch (where) {
           case APR_SET:
  @@ -109,7 +109,7 @@
               break;
   
           case APR_END:
  -            rc = ap_getfileinfo(&finfo, thefile);
  +            rc = apr_getfileinfo(&finfo, thefile);
               if (rc == APR_SUCCESS)
                   rc = setptr(thefile, finfo.size - *offset);
               break;
  
  
  
  1.36      +31 -31    apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- dir.c	2000/07/21 19:50:39	1.35
  +++ dir.c	2000/08/02 05:25:50	1.36
  @@ -56,9 +56,9 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  -static ap_status_t dir_cleanup(void *thedir)
  +static apr_status_t dir_cleanup(void *thedir)
   {
  -    ap_dir_t *dir = thedir;
  +    apr_dir_t *dir = thedir;
       if (closedir(dir->dirstruct) == 0) {
           return APR_SUCCESS;
       }
  @@ -67,50 +67,50 @@
       }
   } 
   
  -ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont)
  +apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
   {
       /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct 
        * dirent is declared with enough storage for the name.  On other
        * platforms (e.g., Solaris 8 for Intel), d_name is declared as a
        * one-byte array.  Note: gcc evaluates this at compile time.
        */
  -    ap_size_t dirent_size = 
  +    apr_size_t dirent_size = 
           (sizeof((*new)->entry->d_name) > 1 ? 
            sizeof(struct dirent) : sizeof (struct dirent) + 255);
   
  -    (*new) = (ap_dir_t *)ap_palloc(cont, sizeof(ap_dir_t));
  +    (*new) = (apr_dir_t *)apr_palloc(cont, sizeof(apr_dir_t));
   
       (*new)->cntxt = cont;
  -    (*new)->dirname = ap_pstrdup(cont, dirname);
  +    (*new)->dirname = apr_pstrdup(cont, dirname);
       (*new)->dirstruct = opendir(dirname);
  -    (*new)->entry = ap_pcalloc(cont, dirent_size);
  +    (*new)->entry = apr_pcalloc(cont, dirent_size);
   
       if ((*new)->dirstruct == NULL) {
           return errno;
       }    
       else {
  -        ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  -	                    ap_null_cleanup);
  +        apr_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  +	                    apr_null_cleanup);
           return APR_SUCCESS;
       }
   }
   
  -ap_status_t ap_closedir(ap_dir_t *thedir)
  +apr_status_t apr_closedir(apr_dir_t *thedir)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if ((rv = dir_cleanup(thedir)) == APR_SUCCESS) {
  -        ap_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
  +        apr_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
           return APR_SUCCESS;
       }
       return rv;
   }
   
  -ap_status_t ap_readdir(ap_dir_t *thedir)
  +apr_status_t apr_readdir(apr_dir_t *thedir)
   {
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
       && !defined(READDIR_IS_THREAD_SAFE)
  -    ap_status_t ret;
  +    apr_status_t ret;
   #endif
   
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
  @@ -135,15 +135,15 @@
   #endif
   }
   
  -ap_status_t ap_rewinddir(ap_dir_t *thedir)
  +apr_status_t apr_rewinddir(apr_dir_t *thedir)
   {
       rewinddir(thedir->dirstruct);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, apr_pool_t *cont)
   {
  -    mode_t mode = ap_unix_perms2mode(perm);
  +    mode_t mode = apr_unix_perms2mode(perm);
   
       if (mkdir(path, mode) == 0) {
           return APR_SUCCESS;
  @@ -153,7 +153,7 @@
       }
   }
   
  -ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
  +apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont)
   {
       if (rmdir(path) == 0) {
           return APR_SUCCESS;
  @@ -163,7 +163,7 @@
       }
   }
   
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;    
  @@ -172,7 +172,7 @@
           *size = -1;
           return APR_ENOFILE;
       }
  -    fname = ap_pstrcat(thedir->cntxt, thedir->dirname, "/", 
  +    fname = apr_pstrcat(thedir->cntxt, thedir->dirname, "/", 
                          thedir->entry->d_name, NULL);
       if (stat(fname, &filestat) == -1) {
           *size = -1;
  @@ -183,7 +183,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_mtime(apr_time_t *mtime, apr_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -193,18 +193,18 @@
           return APR_ENOFILE;
       }
   
  -    fname = ap_pstrcat(thedir->cntxt, thedir->dirname, "/", 
  +    fname = apr_pstrcat(thedir->cntxt, thedir->dirname, "/", 
                          thedir->entry->d_name, NULL);
       if (stat(fname, &filestat) == -1) {
           *mtime = -1;
           return errno;
       }
       
  -    ap_ansi_time_to_ap_time(mtime, filestat.st_mtime);
  +    apr_ansi_time_to_ap_time(mtime, filestat.st_mtime);
       return APR_SUCCESS;
   }
    
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -214,7 +214,7 @@
           return APR_ENOFILE;
       }
   
  -    fname = ap_pstrcat(thedir->cntxt, thedir->dirname, "/", 
  +    fname = apr_pstrcat(thedir->cntxt, thedir->dirname, "/", 
                          thedir->entry->d_name, NULL);
       if (stat(fname, &filestat) == -1) {
           *type = APR_REG;
  @@ -240,18 +240,18 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir)
  +apr_status_t apr_get_dir_filename(char **new, apr_dir_t *thedir)
   {
       /* Detect End-Of-File */
       if (thedir == NULL || thedir->entry == NULL) {
           *new = NULL;
           return APR_ENOENT;
       }
  -    (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->d_name);
  +    (*new) = apr_pstrdup(thedir->cntxt, thedir->entry->d_name);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir)
  +apr_status_t apr_get_os_dir(apr_os_dir_t **thedir, apr_dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  @@ -260,11 +260,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
  -                          ap_pool_t *cont)
  +apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir,
  +                          apr_pool_t *cont)
   {
       if ((*dir) == NULL) {
  -        (*dir) = (ap_dir_t *)ap_pcalloc(cont, sizeof(ap_dir_t));
  +        (*dir) = (apr_dir_t *)apr_pcalloc(cont, sizeof(apr_dir_t));
           (*dir)->cntxt = cont;
       }
       (*dir)->dirstruct = thedir;
  
  
  
  1.33      +11 -11    apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- fileacc.c	2000/07/21 19:50:39	1.32
  +++ fileacc.c	2000/08/02 05:25:50	1.33
  @@ -68,16 +68,16 @@
   #else
   #include "fileio.h"
   #endif
  -/* A file to put ALL of the accessor functions for ap_file_t types. */
  +/* A file to put ALL of the accessor functions for apr_file_t types. */
   
  -ap_status_t ap_get_filename(char **fname, ap_file_t *thefile)
  +apr_status_t apr_get_filename(char **fname, apr_file_t *thefile)
   {
  -    *fname = ap_pstrdup(thefile->cntxt, thefile->fname);
  +    *fname = apr_pstrdup(thefile->cntxt, thefile->fname);
       return APR_SUCCESS;
   }
   
   #if !defined(OS2) && !defined(WIN32)
  -mode_t ap_unix_perms2mode(ap_fileperms_t perms)
  +mode_t apr_unix_perms2mode(apr_fileperms_t perms)
   {
       mode_t mode = 0;
   
  @@ -105,9 +105,9 @@
       return mode;
   }
   
  -ap_fileperms_t ap_unix_mode2perms(mode_t mode)
  +apr_fileperms_t apr_unix_mode2perms(mode_t mode)
   {
  -    ap_fileperms_t perms = 0;
  +    apr_fileperms_t perms = 0;
   
       if (mode & S_IRUSR)
           perms |= APR_UREAD;
  @@ -134,13 +134,13 @@
   }
   #endif
   
  -ap_status_t ap_get_filedata(void **data, const char *key, ap_file_t *file)
  +apr_status_t apr_get_filedata(void **data, const char *key, apr_file_t *file)
   {    
  -    return ap_get_userdata(data, key, file->cntxt);
  +    return apr_get_userdata(data, key, file->cntxt);
   }
   
  -ap_status_t ap_set_filedata(ap_file_t *file, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_filedata(apr_file_t *file, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {    
  -    return ap_set_userdata(data, key, cleanup, file->cntxt);
  +    return apr_set_userdata(data, key, cleanup, file->cntxt);
   }
  
  
  
  1.25      +7 -7      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- filedup.c	2000/07/21 19:50:39	1.24
  +++ filedup.c	2000/08/02 05:25:50	1.25
  @@ -56,12 +56,12 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p)
  +apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
   {
       int have_file = 0;
   
       if ((*new_file) == NULL) {
  -        (*new_file) = (ap_file_t *)ap_pcalloc(p, sizeof(ap_file_t));
  +        (*new_file) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
           if ((*new_file) == NULL) {
               return APR_ENOMEM;
           }
  @@ -76,18 +76,18 @@
       else {
           (*new_file)->filedes = dup(old_file->filedes); 
       }
  -    (*new_file)->fname = ap_pstrdup(p, old_file->fname);
  +    (*new_file)->fname = apr_pstrdup(p, old_file->fname);
       (*new_file)->buffered = old_file->buffered;
       if ((*new_file)->buffered) {
   #if APR_HAS_THREADS
  -        ap_create_lock(&((*new_file)->thlock), APR_MUTEX, APR_INTRAPROCESS, NULL, 
  +        apr_create_lock(&((*new_file)->thlock), APR_MUTEX, APR_INTRAPROCESS, NULL, 
                          p);
   #endif
  -        (*new_file)->buffer = ap_palloc(p, APR_FILE_BUFSIZE);
  +        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
       }
       (*new_file)->blocking = old_file->blocking; /* this is the way dup() works */
  -    ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file), ap_unix_file_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup((*new_file)->cntxt, (void *)(*new_file), apr_unix_file_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  
  
  
  1.26      +9 -9      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- fileio.h	2000/07/03 12:06:29	1.25
  +++ fileio.h	2000/08/02 05:25:51	1.26
  @@ -112,14 +112,14 @@
   
   #define APR_FILE_BUFSIZE 4096
   
  -struct ap_file_t {
  -    ap_pool_t *cntxt;
  +struct apr_file_t {
  +    apr_pool_t *cntxt;
       int filedes;
       char * fname;
       int oflags;
       int eof_hit;
       int pipe;
  -    ap_interval_time_t timeout;
  +    apr_interval_time_t timeout;
       int buffered;
       enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
       int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
  @@ -131,21 +131,21 @@
       int direction;            /* buffer being used for 0 = read, 1 = write */
       unsigned long filePtr;    /* position in file of handle */
   #if APR_HAS_THREADS
  -    struct ap_lock_t *thlock;
  +    struct apr_lock_t *thlock;
   #endif
   };
   
  -struct ap_dir_t {
  -    ap_pool_t *cntxt;
  +struct apr_dir_t {
  +    apr_pool_t *cntxt;
       char *dirname;
       DIR *dirstruct;
       struct dirent *entry;
   };
   
  -ap_status_t ap_unix_file_cleanup(void *);
  +apr_status_t apr_unix_file_cleanup(void *);
   
  -mode_t ap_unix_perms2mode(ap_fileperms_t perms);
  -ap_fileperms_t ap_unix_mode2perms(mode_t mode);
  +mode_t apr_unix_perms2mode(apr_fileperms_t perms);
  +apr_fileperms_t apr_unix_mode2perms(mode_t mode);
   
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.29      +17 -17    apache-2.0/src/lib/apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- filestat.c	2000/07/03 22:08:30	1.28
  +++ filestat.c	2000/08/02 05:25:51	1.29
  @@ -80,21 +80,21 @@
       return type;
   }
   
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
  +apr_status_t apr_getfileinfo(apr_finfo_t *finfo, apr_file_t *thefile)
   {
       struct stat info;
   
       if (fstat(thefile->filedes, &info) == 0) {
  -        finfo->protection = ap_unix_mode2perms(info.st_mode);
  +        finfo->protection = apr_unix_mode2perms(info.st_mode);
           finfo->filetype = filetype_from_mode(info.st_mode);
           finfo->user = info.st_uid;
           finfo->group = info.st_gid;
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        ap_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  -        ap_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  -        ap_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
  +        apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  @@ -102,30 +102,30 @@
       }
   }
   
  -ap_status_t ap_setfileperms(const char *fname, ap_fileperms_t perms)
  +apr_status_t apr_setfileperms(const char *fname, apr_fileperms_t perms)
   {
  -    mode_t mode = ap_unix_perms2mode(perms);
  +    mode_t mode = apr_unix_perms2mode(perms);
   
       if (chmod(fname, mode) == -1)
           return errno;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
  +apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
   {
       struct stat info;
   
       if (stat(fname, &info) == 0) {
  -        finfo->protection = ap_unix_mode2perms(info.st_mode);
  +        finfo->protection = apr_unix_mode2perms(info.st_mode);
           finfo->filetype = filetype_from_mode(info.st_mode);
           finfo->user = info.st_uid;
           finfo->group = info.st_gid;
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        ap_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  -        ap_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  -        ap_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
  +        apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  @@ -133,21 +133,21 @@
       }
   }
   
  -ap_status_t ap_lstat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
  +apr_status_t apr_lstat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
   {
       struct stat info;
   
       if (lstat(fname, &info) == 0) {
  -        finfo->protection = ap_unix_mode2perms(info.st_mode);
  +        finfo->protection = apr_unix_mode2perms(info.st_mode);
           finfo->filetype = filetype_from_mode(info.st_mode);
           finfo->user = info.st_uid;
           finfo->group = info.st_gid;
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        ap_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  -        ap_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  -        ap_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
  +        apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  
  
  
  1.3       +12 -12    apache-2.0/src/lib/apr/file_io/unix/fullrw.c
  
  Index: fullrw.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fullrw.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- fullrw.c	2000/07/18 03:15:12	1.2
  +++ fullrw.c	2000/08/02 05:25:51	1.3
  @@ -55,16 +55,16 @@
   #include "apr_file_io.h"
   
   
  -ap_status_t ap_full_read(ap_file_t *thefile, void *buf, ap_size_t nbytes,
  -                         ap_size_t *bytes_read)
  +apr_status_t apr_full_read(apr_file_t *thefile, void *buf, apr_size_t nbytes,
  +                         apr_size_t *bytes_read)
   {
  -    ap_status_t status;
  -    ap_size_t total_read = 0;
  +    apr_status_t status;
  +    apr_size_t total_read = 0;
   
       do {
  -	ap_ssize_t amt = (ap_ssize_t)nbytes;
  +	apr_ssize_t amt = (apr_ssize_t)nbytes;
   
  -	status = ap_read(thefile, buf, &amt);
  +	status = apr_read(thefile, buf, &amt);
   	buf = (char *)buf + amt;
           nbytes -= amt;
           total_read += amt;
  @@ -76,16 +76,16 @@
       return status;
   }
   
  -ap_status_t ap_full_write(ap_file_t *thefile, const void *buf,
  -                          ap_size_t nbytes, ap_size_t *bytes_written)
  +apr_status_t apr_full_write(apr_file_t *thefile, const void *buf,
  +                          apr_size_t nbytes, apr_size_t *bytes_written)
   {
  -    ap_status_t status;
  -    ap_size_t total_written = 0;
  +    apr_status_t status;
  +    apr_size_t total_written = 0;
   
       do {
  -	ap_ssize_t amt = (ap_ssize_t)nbytes;
  +	apr_ssize_t amt = (apr_ssize_t)nbytes;
   
  -	status = ap_write(thefile, buf, &amt);
  +	status = apr_write(thefile, buf, &amt);
   	buf = (char *)buf + amt;
           nbytes -= amt;
           total_written += amt;
  
  
  
  1.63      +29 -29    apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- open.c	2000/07/21 19:50:39	1.62
  +++ open.c	2000/08/02 05:25:51	1.63
  @@ -56,9 +56,9 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_unix_file_cleanup(void *thefile)
  +apr_status_t apr_unix_file_cleanup(void *thefile)
   {
  -    ap_file_t *file = thefile;
  +    apr_file_t *file = thefile;
       int rv;
   
       rv = close(file->filedes);
  @@ -67,7 +67,7 @@
           file->filedes = -1;
   #if APR_HAS_THREADS
           if (file->thlock) {
  -            return ap_destroy_lock(file->thlock);
  +            return apr_destroy_lock(file->thlock);
           }
   #endif
           return APR_SUCCESS;
  @@ -78,15 +78,15 @@
       }
   }
   
  -ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,  ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_open(apr_file_t **new, const char *fname, apr_int32_t flag,  apr_fileperms_t perm, apr_pool_t *cont)
   {
       int oflags = 0;
   #if APR_HAS_THREADS
  -    ap_status_t rv;
  +    apr_status_t rv;
   #endif
   
       if ((*new) == NULL) {
  -        (*new) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
  +        (*new) = (apr_file_t *)apr_pcalloc(cont, sizeof(apr_file_t));
       }
   
       (*new)->cntxt = cont;
  @@ -106,15 +106,15 @@
           return APR_EACCES; 
       }
   
  -    (*new)->fname = ap_pstrdup(cont, fname);
  +    (*new)->fname = apr_pstrdup(cont, fname);
   
       (*new)->blocking = BLK_ON;
       (*new)->buffered = (flag & APR_BUFFERED) > 0;
   
       if ((*new)->buffered) {
  -        (*new)->buffer = ap_palloc(cont, APR_FILE_BUFSIZE);
  +        (*new)->buffer = apr_palloc(cont, APR_FILE_BUFSIZE);
   #if APR_HAS_THREADS
  -        rv = ap_create_lock(&((*new)->thlock), APR_MUTEX, APR_INTRAPROCESS, 
  +        rv = apr_create_lock(&((*new)->thlock), APR_MUTEX, APR_INTRAPROCESS, 
                               NULL, cont);
           if (rv) {
               return rv;
  @@ -146,7 +146,7 @@
           (*new)->filedes = open(fname, oflags, 0666);
       }
       else {
  -        (*new)->filedes = open(fname, oflags, ap_unix_perms2mode(perm));
  +        (*new)->filedes = open(fname, oflags, apr_unix_perms2mode(perm));
       }    
   
       if ((*new)->filedes < 0) {
  @@ -166,27 +166,27 @@
       (*new)->bufpos = 0;
       (*new)->dataRead = 0;
       (*new)->direction = 0;
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), ap_unix_file_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), apr_unix_file_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_close(ap_file_t *file)
  +apr_status_t apr_close(apr_file_t *file)
   {
  -    ap_status_t flush_rv = APR_SUCCESS, rv;
  +    apr_status_t flush_rv = APR_SUCCESS, rv;
   
       if (file->buffered) {
  -        flush_rv = ap_flush(file);
  +        flush_rv = apr_flush(file);
       }
   
  -    if ((rv = ap_unix_file_cleanup(file)) == APR_SUCCESS) {
  -        ap_kill_cleanup(file->cntxt, file, ap_unix_file_cleanup);
  +    if ((rv = apr_unix_file_cleanup(file)) == APR_SUCCESS) {
  +        apr_kill_cleanup(file->cntxt, file, apr_unix_file_cleanup);
           return APR_SUCCESS;
       }
       return rv ? rv : flush_rv;
   }
   
  -ap_status_t ap_remove_file(const char *path, ap_pool_t *cont)
  +apr_status_t apr_remove_file(const char *path, apr_pool_t *cont)
   {
       if (unlink(path) == 0) {
           return APR_SUCCESS;
  @@ -196,8 +196,8 @@
       }
   }
   
  -ap_status_t ap_rename_file(const char *from_path, const char *to_path,
  -                           ap_pool_t *p)
  +apr_status_t apr_rename_file(const char *from_path, const char *to_path,
  +                           apr_pool_t *p)
   {
       if (rename(from_path, to_path) != 0) {
           return errno;
  @@ -205,7 +205,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file)
  +apr_status_t apr_get_os_file(apr_os_file_t *thefile, apr_file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  @@ -215,13 +215,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile,
  +                           apr_pool_t *cont)
   {
       int *dafile = thefile;
       
       if ((*file) == NULL) {
  -        (*file) = ap_pcalloc(cont, sizeof(ap_file_t));
  +        (*file) = apr_pcalloc(cont, sizeof(apr_file_t));
           (*file)->cntxt = cont;
       }
       (*file)->eof_hit = 0;
  @@ -235,7 +235,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_eof(ap_file_t *fptr)
  +apr_status_t apr_eof(apr_file_t *fptr)
   {
       if (fptr->eof_hit == 1) {
           return APR_EOF;
  @@ -243,7 +243,7 @@
       return APR_SUCCESS;
   }   
   
  -ap_status_t ap_ferror(ap_file_t *fptr)
  +apr_status_t apr_ferror(apr_file_t *fptr)
   {
   /* This function should be removed ASAP.  It is next on my list once
    * I am sure nobody is using it.
  @@ -251,12 +251,12 @@
       return APR_SUCCESS;
   }   
   
  -/* ap_open_stderr() could just call ap_put_os_file() with
  +/* apr_open_stderr() could just call apr_put_os_file() with
    * STDERR_FILENO for the descriptor...
    */
  -ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
  +apr_status_t apr_open_stderr(apr_file_t **thefile, apr_pool_t *cont)
   {
  -    (*thefile) = ap_pcalloc(cont, sizeof(ap_file_t));
  +    (*thefile) = apr_pcalloc(cont, sizeof(apr_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.38      +11 -11    apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- pipe.c	2000/07/21 19:50:39	1.37
  +++ pipe.c	2000/08/02 05:25:51	1.38
  @@ -55,7 +55,7 @@
   #include "fileio.h"
   #include "apr_strings.h"
   
  -static ap_status_t pipeblock(ap_file_t *thepipe)
  +static apr_status_t pipeblock(apr_file_t *thepipe)
   {
   #if !BEOS /* this code won't work on BeOS */
         int fd_flags;
  @@ -91,7 +91,7 @@
       return APR_SUCCESS;
   }
   
  -static ap_status_t pipenonblock(ap_file_t *thepipe)
  +static apr_status_t pipenonblock(apr_file_t *thepipe)
   {
   #if !BEOS /* this code won't work on BeOS */
         int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
  @@ -126,7 +126,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_interval_time_t timeout)
  +apr_status_t apr_set_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t timeout)
   {
       if (thepipe->pipe == 1) {
           thepipe->timeout = timeout;
  @@ -145,7 +145,7 @@
       return APR_EINVAL;
   }
   
  -ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont)
  +apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *cont)
   {
       int filedes[2];
   
  @@ -153,11 +153,11 @@
           return errno;
       }
       
  -    (*in) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
  +    (*in) = (apr_file_t *)apr_pcalloc(cont, sizeof(apr_file_t));
       (*in)->cntxt = cont;
       (*in)->filedes = filedes[0];
       (*in)->pipe = 1;
  -    (*in)->fname = ap_pstrdup(cont, "PIPE");
  +    (*in)->fname = apr_pstrdup(cont, "PIPE");
       (*in)->buffered = 0;
       (*in)->blocking = BLK_ON;
       (*in)->timeout = -1;
  @@ -166,11 +166,11 @@
       (*in)->thlock = NULL;
   #endif
   
  -    (*out) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
  +    (*out) = (apr_file_t *)apr_pcalloc(cont, sizeof(apr_file_t));
       (*out)->cntxt = cont;
       (*out)->filedes = filedes[1];
       (*out)->pipe = 1;
  -    (*out)->fname = ap_pstrdup(cont, "PIPE");
  +    (*out)->fname = apr_pstrdup(cont, "PIPE");
       (*out)->buffered = 0;
       (*out)->blocking = BLK_ON;
       (*out)->timeout = -1;
  @@ -181,10 +181,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_namedpipe(const char *filename, 
  -                                ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_create_namedpipe(const char *filename, 
  +                                apr_fileperms_t perm, apr_pool_t *cont)
   {
  -    mode_t mode = ap_unix_perms2mode(perm);
  +    mode_t mode = apr_unix_perms2mode(perm);
   
       if (mkfifo(filename, mode) == -1) {
           return errno;
  
  
  
  1.57      +39 -39    apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- readwrite.c	2000/06/17 17:04:16	1.56
  +++ readwrite.c	2000/08/02 05:25:52	1.57
  @@ -62,7 +62,7 @@
   #endif
   
   #ifdef USE_WAIT_FOR_IO
  -static ap_status_t wait_for_io_or_timeout(ap_file_t *file, int for_read)
  +static apr_status_t wait_for_io_or_timeout(apr_file_t *file, int for_read)
   {
       struct timeval tv, *tvptr;
       fd_set fdset;
  @@ -101,10 +101,10 @@
   /* problems: 
    * 1) ungetchar not used for buffered files
    */
  -ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
  +apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes)
   {
  -    ap_ssize_t rv;
  -    ap_ssize_t bytes_read;
  +    apr_ssize_t rv;
  +    apr_ssize_t bytes_read;
   
       if (*nbytes <= 0) {
           *nbytes = 0;
  @@ -113,15 +113,15 @@
   
       if (thefile->buffered) {
           char *pos = (char *)buf;
  -        ap_uint64_t blocksize;
  -        ap_uint64_t size = *nbytes;
  +        apr_uint64_t blocksize;
  +        apr_uint64_t size = *nbytes;
   
   #if APR_HAS_THREADS
  -        ap_lock(thefile->thlock);
  +        apr_lock(thefile->thlock);
   #endif
   
           if (thefile->direction == 1) {
  -            ap_flush(thefile);
  +            apr_flush(thefile);
               thefile->bufpos = 0;
               thefile->direction = 0;
               thefile->dataRead = 0;
  @@ -156,7 +156,7 @@
               rv = 0;
           }
   #if APR_HAS_THREADS
  -        ap_unlock(thefile->thlock);
  +        apr_unlock(thefile->thlock);
   #endif
           return rv;
       }
  @@ -181,7 +181,7 @@
           if (rv == -1 && 
               (errno == EAGAIN || errno == EWOULDBLOCK) && 
               thefile->timeout != 0) {
  -            ap_status_t arv = wait_for_io_or_timeout(thefile, 1);
  +            apr_status_t arv = wait_for_io_or_timeout(thefile, 1);
               if (arv != APR_SUCCESS) {
                   *nbytes = bytes_read;
                   return arv;
  @@ -205,9 +205,9 @@
       }
   }
   
  -ap_status_t ap_write(ap_file_t *thefile, const void *buf, ap_ssize_t *nbytes)
  +apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
   {
  -    ap_size_t rv;
  +    apr_size_t rv;
   
       if (thefile->buffered) {
           char *pos = (char *)buf;
  @@ -215,14 +215,14 @@
           int size = *nbytes;
   
   #if APR_HAS_THREADS
  -        ap_lock(thefile->thlock);
  +        apr_lock(thefile->thlock);
   #endif
   
           if ( thefile->direction == 0 ) {
               /* Position file pointer for writing at the offset we are 
                * logically reading from
                */
  -            ap_int64_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
  +            apr_int64_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
               if (offset != thefile->filePtr)
                   lseek(thefile->filedes, offset, SEEK_SET);
               thefile->bufpos = thefile->dataRead = 0;
  @@ -232,7 +232,7 @@
   	rv = 0;
           while (rv == 0 && size > 0) {
               if (thefile->bufpos == APR_FILE_BUFSIZE)   /* write buffer is full*/
  -                ap_flush(thefile);
  +                apr_flush(thefile);
   
               blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? 
                           APR_FILE_BUFSIZE - thefile->bufpos : size;
  @@ -243,19 +243,19 @@
           }
   
   #if APR_HAS_THREADS
  -        ap_unlock(thefile->thlock);
  +        apr_unlock(thefile->thlock);
   #endif
           return rv;
       }
       else {
           do {
               rv = write(thefile->filedes, buf, *nbytes);
  -        } while (rv == (ap_size_t)-1 && errno == EINTR);
  +        } while (rv == (apr_size_t)-1 && errno == EINTR);
   #ifdef USE_WAIT_FOR_IO
  -        if (rv == (ap_size_t)-1 &&
  +        if (rv == (apr_size_t)-1 &&
               (errno == EAGAIN || errno == EWOULDBLOCK) && 
               thefile->timeout != 0) {
  -            ap_status_t arv = wait_for_io_or_timeout(thefile, 0);
  +            apr_status_t arv = wait_for_io_or_timeout(thefile, 0);
               if (arv != APR_SUCCESS) {
                   *nbytes = 0;
                   return arv;
  @@ -263,11 +263,11 @@
               else {
                   do {
                       rv = write(thefile->filedes, buf, *nbytes);
  -	        } while (rv == (ap_size_t)-1 && errno == EINTR);
  +	        } while (rv == (apr_size_t)-1 && errno == EINTR);
               }
           }  
   #endif
  -        if (rv == (ap_size_t)-1) {
  +        if (rv == (apr_size_t)-1) {
               (*nbytes) = 0;
               return errno;
           }
  @@ -276,8 +276,8 @@
       }
   }
   
  -ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec,
  -                      ap_size_t nvec, ap_ssize_t *nbytes)
  +apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec,
  +                      apr_size_t nvec, apr_ssize_t *nbytes)
   {
   #ifdef HAVE_WRITEV
       int bytes;
  @@ -292,11 +292,11 @@
       }
   #else
       *nbytes = vec[0].iov_len;
  -    return ap_write(thefile, vec[0].iov_base, nbytes);
  +    return apr_write(thefile, vec[0].iov_base, nbytes);
   #endif
   }
   
  -ap_status_t ap_putc(char ch, ap_file_t *thefile)
  +apr_status_t apr_putc(char ch, apr_file_t *thefile)
   {
       if (write(thefile->filedes, &ch, 1) != 1) {
           return errno;
  @@ -304,20 +304,20 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
  +apr_status_t apr_ungetc(char ch, apr_file_t *thefile)
   {
       thefile->ungetchar = (unsigned char)ch;
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_getc(char *ch, ap_file_t *thefile)
  +apr_status_t apr_getc(char *ch, apr_file_t *thefile)
   {
  -    ap_ssize_t nbytes = 1;
  +    apr_ssize_t nbytes = 1;
   
  -    return ap_read(thefile, ch, &nbytes);
  +    return apr_read(thefile, ch, &nbytes);
   }
   
  -ap_status_t ap_puts(const char *str, ap_file_t *thefile)
  +apr_status_t apr_puts(const char *str, apr_file_t *thefile)
   {
       ssize_t rv;
       int len;
  @@ -330,10 +330,10 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_flush(ap_file_t *thefile)
  +apr_status_t apr_flush(apr_file_t *thefile)
   {
       if (thefile->buffered) {
  -        ap_int64_t written = 0;
  +        apr_int64_t written = 0;
           int rc = 0;
   
           if (thefile->direction == 1 && thefile->bufpos) {
  @@ -352,10 +352,10 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
  +apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
   {
  -    ap_status_t rv = APR_SUCCESS; /* get rid of gcc warning */
  -    ap_ssize_t nbytes;
  +    apr_status_t rv = APR_SUCCESS; /* get rid of gcc warning */
  +    apr_ssize_t nbytes;
       char *final = str + len - 1;
   
       if (len <= 1) {  
  @@ -366,7 +366,7 @@
   
       while (str < final) { /* leave room for trailing '\0' */
           nbytes = 1;
  -        rv = ap_read(thefile, str, &nbytes);
  +        rv = apr_read(thefile, str, &nbytes);
           if (rv != APR_SUCCESS) {
               break;
           }
  @@ -383,7 +383,7 @@
       return rv;
   }
   
  -APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
  +APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  @@ -395,8 +395,8 @@
           return 0;
       }
       va_start(ap, format);
  -    len = ap_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  -    cc = ap_puts(buf, fptr);
  +    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  +    cc = apr_puts(buf, fptr);
       va_end(ap);
       free(buf);
       return (cc == APR_SUCCESS) ? len : -1;
  
  
  
  1.15      +6 -6      apache-2.0/src/lib/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- seek.c	2000/04/18 09:39:27	1.14
  +++ seek.c	2000/08/02 05:25:52	1.15
  @@ -54,13 +54,13 @@
   
   #include "fileio.h"
   
  -static ap_status_t setptr(ap_file_t *thefile, unsigned long pos )
  +static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
   {
       long newbufpos;
       int rc;
   
       if (thefile->direction == 1) {
  -        ap_flush(thefile);
  +        apr_flush(thefile);
           thefile->bufpos = thefile->direction = thefile->dataRead = 0;
       }
   
  @@ -85,14 +85,14 @@
   }
   
   
  -ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +apr_status_t apr_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
   {
  -    ap_off_t rv;
  +    apr_off_t rv;
   
   
       if (thefile->buffered) {
           int rc = EINVAL;
  -        ap_finfo_t finfo;
  +        apr_finfo_t finfo;
   
           switch (where) {
           case APR_SET:
  @@ -104,7 +104,7 @@
               break;
   
           case APR_END:
  -            rc = ap_getfileinfo(&finfo, thefile);
  +            rc = apr_getfileinfo(&finfo, thefile);
               if (rc == APR_SUCCESS)
                   rc = setptr(thefile, finfo.size - *offset);
               break;
  
  
  
  1.25      +29 -29    apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- dir.c	2000/07/25 00:42:11	1.24
  +++ dir.c	2000/08/02 05:25:55	1.25
  @@ -72,47 +72,47 @@
   #include <sys/stat.h>
   #endif
   
  -ap_status_t dir_cleanup(void *thedir)
  +apr_status_t dir_cleanup(void *thedir)
   {
  -    ap_dir_t *dir = thedir;
  +    apr_dir_t *dir = thedir;
       if (!CloseHandle(dir->dirhand)) {
           return GetLastError();
       }
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_pool_t *cont)
  +apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
   {
       char * temp;
  -    (*new) = ap_pcalloc(cont, sizeof(ap_dir_t));
  +    (*new) = apr_pcalloc(cont, sizeof(apr_dir_t));
       (*new)->cntxt = cont;
       (*new)->entry = NULL;
       temp = canonical_filename((*new)->cntxt, dirname);
       if (temp[strlen(temp)] == '/') {
  -    	(*new)->dirname = ap_pstrcat(cont, dirname, "*", NULL);
  +    	(*new)->dirname = apr_pstrcat(cont, dirname, "*", NULL);
       }
       else {
  -        (*new)->dirname = ap_pstrcat(cont, dirname, "/*", NULL);
  +        (*new)->dirname = apr_pstrcat(cont, dirname, "/*", NULL);
       }
       (*new)->dirhand = INVALID_HANDLE_VALUE;
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_closedir(ap_dir_t *thedir)
  +apr_status_t apr_closedir(apr_dir_t *thedir)
   {
       if (!FindClose(thedir->dirhand)) {
           return GetLastError();   
       }
  -    ap_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
  +    apr_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_readdir(ap_dir_t *thedir)
  +apr_status_t apr_readdir(apr_dir_t *thedir)
   {
       if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  -        thedir->entry = ap_pcalloc(thedir->cntxt, sizeof(WIN32_FIND_DATA));
  +        thedir->entry = apr_pcalloc(thedir->cntxt, sizeof(WIN32_FIND_DATA));
           thedir->dirhand = FindFirstFile(thedir->dirname, thedir->entry);
           if (thedir->dirhand == INVALID_HANDLE_VALUE) {
               return GetLastError();
  @@ -125,25 +125,25 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_rewinddir(ap_dir_t *thedir)
  +apr_status_t apr_rewinddir(apr_dir_t *thedir)
   {
  -    ap_status_t stat;
  -    ap_pool_t *cont = thedir->cntxt;
  -    char *temp = ap_pstrdup(cont, thedir->dirname);
  +    apr_status_t stat;
  +    apr_pool_t *cont = thedir->cntxt;
  +    char *temp = apr_pstrdup(cont, thedir->dirname);
       temp[strlen(temp) - 2] = '\0';   /*remove the \* at the end */
       if (thedir->dirhand == INVALID_HANDLE_VALUE) {
           return APR_SUCCESS;
       }
  -    if ((stat = ap_closedir(thedir)) == APR_SUCCESS) {
  -        if ((stat = ap_opendir(&thedir, temp, cont)) == APR_SUCCESS) {
  -            ap_readdir(thedir);
  +    if ((stat = apr_closedir(thedir)) == APR_SUCCESS) {
  +        if ((stat = apr_opendir(&thedir, temp, cont)) == APR_SUCCESS) {
  +            apr_readdir(thedir);
               return APR_SUCCESS;
           }
       }
       return stat;	
   }
   
  -ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, apr_pool_t *cont)
   {
       if (!CreateDirectory(path, NULL)) {
           return GetLastError();
  @@ -151,7 +151,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont)
  +apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont)
   {
       char *temp = canonical_filename(cont, path);
       if (!RemoveDirectory(temp)) {
  @@ -160,7 +160,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
           return APR_ENODIR;
  @@ -170,7 +170,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_mtime(ap_time_t *time, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_mtime(apr_time_t *time, apr_dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
           return APR_ENODIR;
  @@ -179,7 +179,7 @@
       return APR_SUCCESS;
   }
    
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
   {
       switch(thedir->entry->dwFileAttributes) {
       case FILE_ATTRIBUTE_DIRECTORY: {
  @@ -197,13 +197,13 @@
       }
   }
   
  -ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir)
  +apr_status_t apr_get_dir_filename(char **new, apr_dir_t *thedir)
   {
  -    (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->cFileName);
  +    (*new) = apr_pstrdup(thedir->cntxt, thedir->entry->cFileName);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir)
  +apr_status_t apr_get_os_dir(apr_os_dir_t **thedir, apr_dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  @@ -212,13 +212,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_pool_t *cont)
  +apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*dir) == NULL) {
  -        (*dir) = (ap_dir_t *)ap_pcalloc(cont, sizeof(ap_dir_t));
  +        (*dir) = (apr_dir_t *)apr_pcalloc(cont, sizeof(apr_dir_t));
           (*dir)->cntxt = cont;
       }
       (*dir)->dirhand = thedir;
  
  
  
  1.20      +8 -8      apache-2.0/src/lib/apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- filedup.c	2000/07/25 00:42:11	1.19
  +++ filedup.c	2000/08/02 05:25:55	1.20
  @@ -58,7 +58,7 @@
   #include "apr_strings.h"
   #include <string.h>
   
  -ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p)
  +apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
   {
       BOOLEAN isStdHandle = FALSE;
       HANDLE hCurrentProcess = GetCurrentProcess();
  @@ -68,8 +68,8 @@
               p = old_file->cntxt;
           }
               
  -        (*new_file) = (ap_file_t *) ap_pcalloc(p,
  -                                               sizeof(ap_file_t));
  +        (*new_file) = (apr_file_t *) apr_pcalloc(p,
  +                                               sizeof(apr_file_t));
           if ((*new_file) == NULL) {
               return APR_ENOMEM;
           }
  @@ -104,9 +104,9 @@
       }
   
       (*new_file)->cntxt = old_file->cntxt;
  -    (*new_file)->fname = ap_pstrdup(old_file->cntxt, old_file->fname);
  -    (*new_file)->demonfname = ap_pstrdup(old_file->cntxt, old_file->demonfname);
  -    (*new_file)->lowerdemonfname = ap_pstrdup(old_file->cntxt, old_file->lowerdemonfname);
  +    (*new_file)->fname = apr_pstrdup(old_file->cntxt, old_file->fname);
  +    (*new_file)->demonfname = apr_pstrdup(old_file->cntxt, old_file->demonfname);
  +    (*new_file)->lowerdemonfname = apr_pstrdup(old_file->cntxt, old_file->lowerdemonfname);
       (*new_file)->append = old_file->append;
   /*   (*new_file)->protection = old_file->protection;
       (*new_file)->user = old_file->user;
  @@ -118,8 +118,8 @@
       (*new_file)->buffered = FALSE;
   
       if (!isStdHandle) {
  -        ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file), file_cleanup,
  -                            ap_null_cleanup);
  +        apr_register_cleanup((*new_file)->cntxt, (void *)(*new_file), file_cleanup,
  +                            apr_null_cleanup);
       }
   
       return APR_SUCCESS;
  
  
  
  1.28      +19 -19    apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- fileio.h	2000/07/03 03:21:09	1.27
  +++ fileio.h	2000/08/02 05:25:55	1.28
  @@ -87,7 +87,7 @@
   
   #define APR_FILE_BUFSIZE 4096
   
  -/* quick run-down of fields in windows' ap_file_t structure that may have 
  +/* quick run-down of fields in windows' apr_file_t structure that may have 
    * obvious uses.
    * fname --  the filename as passed to the open call.
    * dwFileAttricutes -- Attributes used to open the file.
  @@ -100,12 +100,12 @@
    *           correctly when writing to a file with this flag set TRUE.
    */
   
  -struct ap_file_t {
  -    ap_pool_t *cntxt;
  +struct apr_file_t {
  +    apr_pool_t *cntxt;
       HANDLE filehand;
       BOOLEAN pipe;              // Is this a pipe of a file?
       OVERLAPPED *pOverlapped;
  -    ap_interval_time_t timeout;
  +    apr_interval_time_t timeout;
   
       /* File specific info */
       char *fname;
  @@ -117,38 +117,38 @@
       int ungetchar;             // Last char provided by an unget op. (-1 = no char)
       int append; 
       off_t size;
  -    ap_time_t atime;
  -    ap_time_t mtime;
  -    ap_time_t ctime;
  +    apr_time_t atime;
  +    apr_time_t mtime;
  +    apr_time_t ctime;
   
       /* Stuff for buffered mode */
       char *buffer;
  -    ap_ssize_t bufpos;        // Read/Write position in buffer
  -    ap_ssize_t dataRead;      // amount of valid data read into buffer
  +    apr_ssize_t bufpos;        // Read/Write position in buffer
  +    apr_ssize_t dataRead;      // amount of valid data read into buffer
       int direction;            // buffer being used for 0 = read, 1 = write
  -    ap_ssize_t filePtr;       // position in file of handle
  -    ap_lock_t *mutex;         // mutex semaphore, must be owned to access the above fields
  +    apr_ssize_t filePtr;       // position in file of handle
  +    apr_lock_t *mutex;         // mutex semaphore, must be owned to access the above fields
   
       /* Pipe specific info */
       
   };
   
  -struct ap_dir_t {
  -    ap_pool_t *cntxt;
  +struct apr_dir_t {
  +    apr_pool_t *cntxt;
       char *dirname;
       HANDLE dirhand;
       WIN32_FIND_DATA *entry;
   };
   
  -ap_status_t file_cleanup(void *);
  -/*mode_t get_fileperms(ap_fileperms_t);
  +apr_status_t file_cleanup(void *);
  +/*mode_t get_fileperms(apr_fileperms_t);
   */
  -APR_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont, 
  +APR_EXPORT(char *) ap_os_systemcase_filename(struct apr_pool_t *pCont, 
                                                const char *szFile);
  -char * canonical_filename(struct ap_pool_t *pCont, const char *szFile);
  +char * canonical_filename(struct apr_pool_t *pCont, const char *szFile);
   
  -ap_status_t ap_create_nt_pipe(ap_file_t **in, ap_file_t **out, 
  +apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
                                 BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  -                              ap_pool_t *p);
  +                              apr_pool_t *p);
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.23      +5 -5      apache-2.0/src/lib/apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- filestat.c	2000/07/03 12:06:38	1.22
  +++ filestat.c	2000/08/02 05:25:56	1.23
  @@ -79,7 +79,7 @@
   
       return type;
   }
  -BOOLEAN is_exe(const char* fname, ap_pool_t *cont) {
  +BOOLEAN is_exe(const char* fname, apr_pool_t *cont) {
       const char* exename;
       const char* ext;
       exename = strrchr(fname, '/');
  @@ -101,7 +101,7 @@
       return FALSE;
   }
   
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
  +apr_status_t apr_getfileinfo(apr_finfo_t *finfo, apr_file_t *thefile)
   {
       BY_HANDLE_FILE_INFORMATION FileInformation;
       DWORD FileType;
  @@ -182,12 +182,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setfileperms(const char *fname, ap_fileperms_t perms)
  +apr_status_t apr_setfileperms(const char *fname, apr_fileperms_t perms)
   {
       return APR_ENOTIMPL;
   }
   
  -ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont)
  +apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
   {
       /* WIN32_FILE_ATTRIBUTE_DATA is an exact subset of the first 
        * entries of WIN32_FIND_DATA
  @@ -195,7 +195,7 @@
       WIN32_FIND_DATA FileInformation;
       HANDLE hFind;
       ap_oslevel_e os_level;
  -    ap_status_t rv = APR_SUCCESS;
  +    apr_status_t rv = APR_SUCCESS;
   
       memset(finfo,'\0', sizeof(*finfo));
   
  
  
  
  1.46      +25 -25    apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- open.c	2000/07/25 00:42:12	1.45
  +++ open.c	2000/08/02 05:25:56	1.46
  @@ -64,9 +64,9 @@
   #include <sys/stat.h>
   #include "misc.h"
   
  -ap_status_t file_cleanup(void *thefile)
  +apr_status_t file_cleanup(void *thefile)
   {
  -    ap_file_t *file = thefile;
  +    apr_file_t *file = thefile;
       CloseHandle(file->filehand);
       file->filehand = INVALID_HANDLE_VALUE;
       if (file->pOverlapped) {
  @@ -75,18 +75,18 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_open(ap_file_t **new, const char *fname, 
  -                    ap_int32_t flag, ap_fileperms_t perm, ap_pool_t *cont)
  +apr_status_t apr_open(apr_file_t **new, const char *fname, 
  +                    apr_int32_t flag, apr_fileperms_t perm, apr_pool_t *cont)
   {
       DWORD oflags = 0;
       DWORD createflags = 0;
       DWORD attributes = 0;
       DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE;
       ap_oslevel_e level;
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if ((*new) == NULL) {
  -        (*new) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
  +        (*new) = (apr_file_t *)apr_pcalloc(cont, sizeof(apr_file_t));
       }
   
       (*new)->cntxt = cont;
  @@ -105,14 +105,14 @@
       (*new)->buffered = (flag & APR_BUFFERED) > 0;
   
       if ((*new)->buffered) {
  -        (*new)->buffer = ap_palloc(cont, APR_FILE_BUFSIZE);
  -        rv = ap_create_lock(&(*new)->mutex, APR_MUTEX, APR_INTRAPROCESS, NULL, cont);
  +        (*new)->buffer = apr_palloc(cont, APR_FILE_BUFSIZE);
  +        rv = apr_create_lock(&(*new)->mutex, APR_MUTEX, APR_INTRAPROCESS, NULL, cont);
   
           if (rv)
               return rv;
       }
   
  -    (*new)->fname = ap_pstrdup(cont, fname);
  +    (*new)->fname = apr_pstrdup(cont, fname);
   
       (*new)->demonfname = canonical_filename((*new)->cntxt, fname);
       (*new)->lowerdemonfname = strlwr((*new)->demonfname);
  @@ -178,26 +178,26 @@
       (*new)->direction = 0;
       (*new)->filePtr = 0;
   
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_close(ap_file_t *file)
  +apr_status_t apr_close(apr_file_t *file)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = file_cleanup(file)) == APR_SUCCESS) {
  -        ap_kill_cleanup(file->cntxt, file, file_cleanup);
  +        apr_kill_cleanup(file->cntxt, file, file_cleanup);
   
           if (file->buffered)
  -            ap_destroy_lock(file->mutex);
  +            apr_destroy_lock(file->mutex);
   
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t ap_remove_file(const char *path, ap_pool_t *cont)
  +apr_status_t apr_remove_file(const char *path, apr_pool_t *cont)
   {
       char *temp = canonical_filename(cont, path);
   
  @@ -209,8 +209,8 @@
       }
   }
   
  -ap_status_t ap_rename_file(const char *from_path, const char *to_path,
  -                           ap_pool_t *p)
  +apr_status_t apr_rename_file(const char *from_path, const char *to_path,
  +                           apr_pool_t *p)
   {
       const char *from_canon = canonical_filename(p, from_path);
       const char *to_canon = canonical_filename(p, to_path);
  @@ -235,7 +235,7 @@
       return err;
   }
   
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file)
  +apr_status_t apr_get_os_file(apr_os_file_t *thefile, apr_file_t *file)
   {
       if (file == NULL) {
           return APR_ENOFILE;
  @@ -244,21 +244,21 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, 
  +                           apr_pool_t *cont)
   {
       if ((*file) == NULL) {
           if (cont == NULL) {
               return APR_ENOPOOL;
           }
  -        (*file) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
  +        (*file) = (apr_file_t *)apr_pcalloc(cont, sizeof(apr_file_t));
           (*file)->cntxt = cont;
       }
       (*file)->filehand = *thefile;
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_eof(ap_file_t *fptr)
  +apr_status_t apr_eof(apr_file_t *fptr)
   {
       if (fptr->eof_hit == 1) {
           return APR_EOF;
  @@ -266,9 +266,9 @@
       return APR_SUCCESS;
   }   
   
  -ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont)
  +apr_status_t apr_open_stderr(apr_file_t **thefile, apr_pool_t *cont)
   {
  -    (*thefile) = ap_pcalloc(cont, sizeof(ap_file_t));
  +    (*thefile) = apr_pcalloc(cont, sizeof(apr_file_t));
       if ((*thefile) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.26      +16 -16    apache-2.0/src/lib/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- pipe.c	2000/07/25 00:42:12	1.25
  +++ pipe.c	2000/08/02 05:25:56	1.26
  @@ -63,13 +63,13 @@
   #include <sys/stat.h>
   #include "misc.h"
   
  -ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_interval_time_t timeout)
  +apr_status_t apr_set_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t timeout)
   {
       thepipe->timeout = timeout;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *p)
  +apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *p)
   {
       SECURITY_ATTRIBUTES sa;
   
  @@ -77,9 +77,9 @@
       sa.bInheritHandle = TRUE;
       sa.lpSecurityDescriptor = NULL;
   
  -    (*in) = (ap_file_t *)ap_pcalloc(p, sizeof(ap_file_t));
  +    (*in) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
       (*in)->cntxt = p;
  -    (*in)->fname = ap_pstrdup(p, "PIPE");
  +    (*in)->fname = apr_pstrdup(p, "PIPE");
       (*in)->pipe = 1;
       (*in)->timeout = -1;
       (*in)->ungetchar = -1;
  @@ -89,9 +89,9 @@
       (*in)->dataRead = 0;
       (*in)->direction = 0;
   
  -    (*out) = (ap_file_t *)ap_pcalloc(p, sizeof(ap_file_t));
  +    (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
       (*out)->cntxt = p;
  -    (*out)->fname = ap_pstrdup(p, "PIPE");
  +    (*out)->fname = apr_pstrdup(p, "PIPE");
       (*out)->pipe = 1;
       (*out)->timeout = -1;
       (*out)->ungetchar = -1;
  @@ -109,7 +109,7 @@
   }
   
   /* ap_create_nt_pipe()
  - * An internal (for now) APR function created for use by ap_create_process() 
  + * An internal (for now) APR function created for use by apr_create_process() 
    * when setting up pipes to communicate with the child process. 
    * ap_create_nt_pipe() allows setting the blocking mode of each end of 
    * the pipe when the pipe is created (rather than after the pipe is created). 
  @@ -118,7 +118,7 @@
    *
    * In general, we don't want to enable child side pipe handles for async i/o.
    * This prevents us from enabling both ends of the pipe for async i/o in 
  - * ap_create_pipe.
  + * apr_create_pipe.
    *
    * Why not use NamedPipes on NT which support setting pipe state to
    * non-blocking? On NT, even though you can set a pipe non-blocking, 
  @@ -128,9 +128,9 @@
    *
    * wgs
    */
  -ap_status_t ap_create_nt_pipe(ap_file_t **in, ap_file_t **out, 
  +apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
                                 BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  -                              ap_pool_t *p)
  +                              apr_pool_t *p)
   {
       ap_oslevel_e level;
       SECURITY_ATTRIBUTES sa;
  @@ -143,9 +143,9 @@
       sa.bInheritHandle = TRUE;
       sa.lpSecurityDescriptor = NULL;
   
  -    (*in) = (ap_file_t *)ap_pcalloc(p, sizeof(ap_file_t));
  +    (*in) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
       (*in)->cntxt = p;
  -    (*in)->fname = ap_pstrdup(p, "PIPE");
  +    (*in)->fname = apr_pstrdup(p, "PIPE");
       (*in)->pipe = 1;
       (*in)->timeout = -1;
       (*in)->ungetchar = -1;
  @@ -156,9 +156,9 @@
       (*in)->direction = 0;
       (*in)->pOverlapped = NULL;
   
  -    (*out) = (ap_file_t *)ap_pcalloc(p, sizeof(ap_file_t));
  +    (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
       (*out)->cntxt = p;
  -    (*out)->fname = ap_pstrdup(p, "PIPE");
  +    (*out)->fname = apr_pstrdup(p, "PIPE");
       (*out)->pipe = 1;
       (*out)->timeout = -1;
       (*out)->ungetchar = -1;
  @@ -174,7 +174,7 @@
           dwOpenMode = PIPE_ACCESS_INBOUND;
           if (bAsyncRead) {
               dwOpenMode |= FILE_FLAG_OVERLAPPED;
  -            (*in)->pOverlapped = (OVERLAPPED*) ap_pcalloc(p, sizeof(OVERLAPPED));
  +            (*in)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
               (*in)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
               /* register a cleanup for the event handle... */
           }
  @@ -196,7 +196,7 @@
           dwOpenMode = FILE_ATTRIBUTE_NORMAL;
           if (bAsyncWrite) {
               dwOpenMode |= FILE_FLAG_OVERLAPPED;
  -            (*out)->pOverlapped = (OVERLAPPED*) ap_pcalloc(p, sizeof(OVERLAPPED));
  +            (*out)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
               (*out)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
           }
           
  
  
  
  1.44      +38 -38    apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- readwrite.c	2000/07/03 03:21:11	1.43
  +++ readwrite.c	2000/08/02 05:25:57	1.44
  @@ -64,9 +64,9 @@
    * read_with_timeout() 
    * Uses async i/o to emulate unix non-blocking i/o with timeouts.
    */
  -static ap_status_t read_with_timeout(ap_file_t *file, void *buf, ap_ssize_t len, ap_ssize_t *nbytes)
  +static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_ssize_t len, apr_ssize_t *nbytes)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       *nbytes = 0;
   
       /* Handle the zero timeout non-blocking case */
  @@ -143,9 +143,9 @@
       return rv;
   }
   
  -ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *len)
  +apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *len)
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
       DWORD bytes_read = 0;
   
       if (*len <= 0) {
  @@ -167,13 +167,13 @@
       }
       if (thefile->buffered) {
           char *pos = (char *)buf;
  -        ap_ssize_t blocksize;
  -        ap_ssize_t size = *len;
  +        apr_ssize_t blocksize;
  +        apr_ssize_t size = *len;
   
  -        ap_lock(thefile->mutex);
  +        apr_lock(thefile->mutex);
   
           if (thefile->direction == 1) {
  -            ap_flush(thefile);
  +            apr_flush(thefile);
               thefile->bufpos = 0;
               thefile->direction = 0;
               thefile->dataRead = 0;
  @@ -207,10 +207,10 @@
           if (*len) {
               rv = 0;
           }
  -        ap_unlock(thefile->mutex);
  +        apr_unlock(thefile->mutex);
       } else {  
           /* Unbuffered i/o */
  -        ap_ssize_t nbytes;
  +        apr_ssize_t nbytes;
           rv = read_with_timeout(thefile, buf, *len, &nbytes);
           *len = nbytes;
       }
  @@ -218,9 +218,9 @@
       return rv;
   }
   
  -ap_status_t ap_write(ap_file_t *thefile, const void *buf, ap_ssize_t *nbytes)
  +apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       DWORD bwrote;
   
       if (thefile->buffered) {
  @@ -228,11 +228,11 @@
           int blocksize;
           int size = *nbytes;
   
  -        ap_lock(thefile->mutex);
  +        apr_lock(thefile->mutex);
   
           if (thefile->direction == 0) {
               // Position file pointer for writing at the offset we are logically reading from
  -            ap_ssize_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
  +            apr_ssize_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
               if (offset != thefile->filePtr)
                   SetFilePointer(thefile->filehand, offset, NULL, FILE_BEGIN);
               thefile->bufpos = thefile->dataRead = 0;
  @@ -241,7 +241,7 @@
   
           while (rv == 0 && size > 0) {
               if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
  -                rv = ap_flush(thefile);
  +                rv = apr_flush(thefile);
   
               blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
               memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
  @@ -250,7 +250,7 @@
               size -= blocksize;
           }
   
  -        ap_unlock(thefile->mutex);
  +        apr_unlock(thefile->mutex);
           return rv;
       } else {
           if (!thefile->pipe && thefile->append) {
  @@ -271,10 +271,10 @@
   /*
    * Too bad WriteFileGather() is not supported on 95&98 (or NT prior to SP2)
    */
  -ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, 
  -                      ap_ssize_t *nbytes)
  +apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, 
  +                      apr_ssize_t *nbytes)
   {
  -    ap_status_t rv = APR_SUCCESS;
  +    apr_status_t rv = APR_SUCCESS;
       int i;
       DWORD bwrote = 0;
       char *buf;
  @@ -283,7 +283,7 @@
       for (i = 0; i < nvec; i++) {
           buf = vec[i].iov_base;
           bwrote = vec[i].iov_len;
  -        rv = ap_write(thefile, buf, &bwrote);
  +        rv = apr_write(thefile, buf, &bwrote);
           *nbytes += bwrote;
           if (rv != APR_SUCCESS) {
               break;
  @@ -292,26 +292,26 @@
       return rv;
   }
   
  -ap_status_t ap_putc(char ch, ap_file_t *thefile)
  +apr_status_t apr_putc(char ch, apr_file_t *thefile)
   {
       DWORD len = 1;
   
  -    return ap_write(thefile, &ch, &len);
  +    return apr_write(thefile, &ch, &len);
   }
   
  -ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
  +apr_status_t apr_ungetc(char ch, apr_file_t *thefile)
   {
       thefile->ungetchar = (unsigned char) ch;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_getc(char *ch, ap_file_t *thefile)
  +apr_status_t apr_getc(char *ch, apr_file_t *thefile)
   {
  -    ap_status_t rc;
  +    apr_status_t rc;
       int bread;
   
       bread = 1;
  -    rc = ap_read(thefile, ch, &bread);
  +    rc = apr_read(thefile, ch, &bread);
   
       if (rc) {
           return rc;
  @@ -324,22 +324,22 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_puts(const char *str, ap_file_t *thefile)
  +apr_status_t apr_puts(const char *str, apr_file_t *thefile)
   {
       DWORD len = strlen(str);
   
  -    return ap_write(thefile, str, &len);
  +    return apr_write(thefile, str, &len);
   }
   
  -ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
  +apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
   {
  -    ap_ssize_t readlen;
  -    ap_status_t rv = APR_SUCCESS;
  +    apr_ssize_t readlen;
  +    apr_status_t rv = APR_SUCCESS;
       int i;    
   
       for (i = 0; i < len-1; i++) {
           readlen = 1;
  -        rv = ap_read(thefile, str+i, &readlen);
  +        rv = apr_read(thefile, str+i, &readlen);
   
           if (readlen != 1) {
               rv = APR_EOF;
  @@ -357,11 +357,11 @@
       return rv;
   }
   
  -ap_status_t ap_flush(ap_file_t *thefile)
  +apr_status_t apr_flush(apr_file_t *thefile)
   {
       if (thefile->buffered) {
           DWORD written = 0;
  -        ap_status_t rc = 0;
  +        apr_status_t rc = 0;
   
           if (thefile->direction == 1 && thefile->bufpos) {
               rc = WriteFile(thefile->filehand, thefile->buffer, thefile->bufpos, &written, NULL ) ? 0 : GetLastError();
  @@ -378,7 +378,7 @@
       }
   }
   
  -static int printf_flush(ap_vformatter_buff_t *vbuff)
  +static int printf_flush(apr_vformatter_buff_t *vbuff)
   {
       /* I would love to print this stuff out to the file, but I will
        * get that working later.  :)  For now, just return.
  @@ -386,7 +386,7 @@
       return -1;
   }
   
  -APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
  +APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
   {
       int cc;
       va_list ap;
  @@ -398,8 +398,8 @@
           return 0;
       }
       va_start(ap, format);
  -    len = ap_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  -    cc = ap_puts(buf, fptr);
  +    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
  +    cc = apr_puts(buf, fptr);
       va_end(ap);
       free(buf);
       return (cc == APR_SUCCESS) ? len : -1;
  
  
  
  1.9       +5 -5      apache-2.0/src/lib/apr/file_io/win32/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/seek.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- seek.c	2000/05/23 02:19:36	1.8
  +++ seek.c	2000/08/02 05:25:57	1.9
  @@ -57,13 +57,13 @@
   #include <errno.h>
   #include <string.h>
   
  -static ap_status_t setptr(ap_file_t *thefile, unsigned long pos )
  +static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
   {
       long newbufpos;
       DWORD rc;
   
       if (thefile->direction == 1) {
  -        ap_flush(thefile);
  +        apr_flush(thefile);
           thefile->bufpos = thefile->direction = thefile->dataRead = 0;
       }
   
  @@ -86,14 +86,14 @@
   
   
   
  -ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset)
  +apr_status_t apr_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
   {
       DWORD howmove;
       DWORD rv;
   
       if (thefile->buffered) {
           int rc = APR_EINVAL;
  -        ap_finfo_t finfo;
  +        apr_finfo_t finfo;
   
           switch (where) {
           case APR_SET:
  @@ -105,7 +105,7 @@
               break;
   
           case APR_END:
  -            rc = ap_getfileinfo(&finfo, thefile);
  +            rc = apr_getfileinfo(&finfo, thefile);
               if (rc == APR_SUCCESS)
                   rc = setptr(thefile, finfo.size - *offset);
               break;
  
  
  
  1.10      +24 -24    apache-2.0/src/lib/apr/i18n/unix/xlate.c
  
  Index: xlate.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/i18n/unix/xlate.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- xlate.c	2000/07/21 19:50:41	1.9
  +++ xlate.c	2000/08/02 05:26:02	1.10
  @@ -75,8 +75,8 @@
   #define min(x,y) ((x) <= (y) ? (x) : (y))
   #endif
   
  -struct ap_xlate_t {
  -    ap_pool_t *pool;
  +struct apr_xlate_t {
  +    apr_pool_t *pool;
       char *frompage;
       char *topage;
       char *sbcs_table;
  @@ -156,10 +156,10 @@
       }
   }
   
  -static ap_status_t ap_xlate_cleanup(void *convset)
  +static apr_status_t ap_xlate_cleanup(void *convset)
   {
   #ifdef HAVE_ICONV
  -    ap_xlate_t *old = convset;
  +    apr_xlate_t *old = convset;
   
       if (old->ich != (iconv_t)-1) {
           if (iconv_close(old->ich)) {
  @@ -171,7 +171,7 @@
   }
   
   #ifdef HAVE_ICONV
  -static void check_sbcs(ap_xlate_t *convset)
  +static void check_sbcs(apr_xlate_t *convset)
   {
       char inbuf[256], outbuf[256];
       char *inbufptr = inbuf, *outbufptr = outbuf;
  @@ -193,7 +193,7 @@
            * close the iconv descriptor
            */
           
  -        convset->sbcs_table = ap_palloc(convset->pool, sizeof(outbuf));
  +        convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf));
           memcpy(convset->sbcs_table, outbuf, sizeof(outbuf));
           iconv_close(convset->ich);
           convset->ich = (iconv_t)-1;
  @@ -203,11 +203,11 @@
   }
   #endif /* HAVE_ICONV */
   
  -ap_status_t ap_xlate_open(ap_xlate_t **convset, const char *topage,
  -                          const char *frompage, ap_pool_t *pool)
  +apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage,
  +                          const char *frompage, apr_pool_t *pool)
   {
  -    ap_status_t status;
  -    ap_xlate_t *new;
  +    apr_status_t status;
  +    apr_xlate_t *new;
       int found = 0;
   
       *convset = NULL;
  @@ -215,14 +215,14 @@
       topage = handle_special_names(topage);
       frompage = handle_special_names(frompage);
       
  -    new = (ap_xlate_t *)ap_pcalloc(pool, sizeof(ap_xlate_t));
  +    new = (apr_xlate_t *)apr_pcalloc(pool, sizeof(apr_xlate_t));
       if (!new) {
           return APR_ENOMEM;
       }
   
       new->pool = pool;
  -    new->topage = ap_pstrdup(pool, topage);
  -    new->frompage = ap_pstrdup(pool, frompage);
  +    new->topage = apr_pstrdup(pool, topage);
  +    new->frompage = apr_pstrdup(pool, frompage);
       if (!new->topage || !new->frompage) {
           return APR_ENOMEM;
       }
  @@ -248,8 +248,8 @@
   
       if (found) {
           *convset = new;
  -        ap_register_cleanup(pool, (void *)new, ap_xlate_cleanup,
  -                            ap_null_cleanup);
  +        apr_register_cleanup(pool, (void *)new, ap_xlate_cleanup,
  +                            apr_null_cleanup);
           status = APR_SUCCESS;
       }
       else {
  @@ -260,17 +260,17 @@
       return status;
   }
   
  -ap_status_t ap_xlate_get_sb(ap_xlate_t *convset, int *onoff)
  +apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff)
   {
       *onoff = convset->sbcs_table != NULL;
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_xlate_conv_buffer(ap_xlate_t *convset, const char *inbuf,
  -                                 ap_size_t *inbytes_left, char *outbuf,
  -                                 ap_size_t *outbytes_left)
  +apr_status_t ap_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf,
  +                                 apr_size_t *inbytes_left, char *outbuf,
  +                                 apr_size_t *outbytes_left)
   {
  -    ap_status_t status = APR_SUCCESS;
  +    apr_status_t status = APR_SUCCESS;
   #ifdef HAVE_ICONV
       size_t translated;
   
  @@ -329,7 +329,7 @@
       return status;
   }
   
  -ap_int32_t ap_xlate_conv_byte(ap_xlate_t *convset, unsigned char inchar)
  +apr_int32_t ap_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar)
   {
       if (convset->sbcs_table) {
           return convset->sbcs_table[inchar];
  @@ -339,12 +339,12 @@
       }
   }
   
  -ap_status_t ap_xlate_close(ap_xlate_t *convset)
  +apr_status_t ap_xlate_close(apr_xlate_t *convset)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   
       if ((status = ap_xlate_cleanup(convset)) == APR_SUCCESS) {
  -        ap_kill_cleanup(convset->pool, convset, ap_xlate_cleanup);
  +        apr_kill_cleanup(convset->pool, convset, ap_xlate_cleanup);
       }
   
       return status;
  
  
  
  1.20      +7 -7      apache-2.0/src/lib/apr/include/apr_dso.h
  
  Index: apr_dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr_dso.h	2000/07/22 23:29:44	1.19
  +++ apr_dso.h	2000/08/02 05:26:03	1.20
  @@ -66,8 +66,8 @@
   extern "C" {
   #endif
   
  -typedef struct ap_dso_handle_t        ap_dso_handle_t;
  -typedef void *                        ap_dso_handle_sym_t;
  +typedef struct apr_dso_handle_t        apr_dso_handle_t;
  +typedef void *                        apr_dso_handle_sym_t;
   
   /**
    * Load a DSO library.
  @@ -75,14 +75,14 @@
    * @param path Path to the DSO library
    * @param ctx Pool to use. 
    */
  -ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
  -                        ap_pool_t *ctx);
  +apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, 
  +                        apr_pool_t *ctx);
   
   /**
    * Close a DSO library.
    * @param handle handle to close.
    */
  -ap_status_t ap_dso_unload(ap_dso_handle_t *handle);
  +apr_status_t apr_dso_unload(apr_dso_handle_t *handle);
   
   /**
    * Load a symbol from a DSO handle.
  @@ -90,7 +90,7 @@
    * @param handle handle to load from.
    * @param symname Name of the symbol to load.
    */
  -ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, ap_dso_handle_t *handle, 
  +apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t *handle, 
                          const char *symname);
   
   /**
  @@ -99,7 +99,7 @@
    * @param buf handle to load from.
    * @param bufsize Name of the symbol to load.
    */
  -const char *ap_dso_error(ap_dso_handle_t *dso, char *buf, ap_size_t bufsize);
  +const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize);
   
   #ifdef __cplusplus
   }
  
  
  
  1.38      +3 -3      apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apr_errno.h	2000/07/22 23:08:36	1.37
  +++ apr_errno.h	2000/08/02 05:26:03	1.38
  @@ -66,7 +66,7 @@
    * @package Error Codes
    */
   
  -typedef int ap_status_t;
  +typedef int apr_status_t;
   
   /**
    * Convert an APR error to a canonical error
  @@ -74,7 +74,7 @@
    * @return The canonical error value
    * @tip see apr/APRDesgin for an explanation of why this is necessary.
    */
  -int ap_canonical_error(ap_status_t err);
  +int apr_canonical_error(apr_status_t err);
   
   
   /*
  @@ -113,7 +113,7 @@
    * APR_ENOTHDKEY    APR was not given a thread key structure
    * APR_ENOSHMAVAIL  There is no more shared memory available
    * APR_EDSOOPEN     APR was unable to open the dso object.  For more 
  - *                  information call ap_dso_error().
  + *                  information call apr_dso_error().
    * </PRE>
    *
    * <PRE>
  
  
  
  1.63      +77 -77    apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- apr_file_io.h	2000/07/23 04:05:15	1.62
  +++ apr_file_io.h	2000/08/02 05:26:03	1.63
  @@ -73,7 +73,7 @@
   typedef enum {APR_NOFILE, APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE, APR_LNK, 
                 APR_SOCK} ap_filetype_e; 
   
  -/* Flags for ap_open */
  +/* Flags for apr_open */
   #define APR_READ       1           /* Open the file for reading */
   #define APR_WRITE      2           /* Open the file for writing */
   #define APR_CREATE     4           /* Create the file if not there */
  @@ -85,7 +85,7 @@
   #define APR_BUFFERED   128         /* Open the file for buffered I/O */
   #define APR_DELONCLOSE 256         /* Delete the file after close */
   
  -/* flags for ap_seek */
  +/* flags for apr_seek */
   #define APR_SET SEEK_SET
   #define APR_CUR SEEK_CUR
   #define APR_END SEEK_END
  @@ -106,28 +106,28 @@
   #define APR_OS_DEFAULT 0xFFF
   
   /* should be same as whence type in lseek, POSIX defines this as int */
  -typedef ap_int32_t       ap_seek_where_t;
  +typedef apr_int32_t       apr_seek_where_t;
   
  -typedef struct ap_file_t         ap_file_t;
  -typedef struct ap_finfo_t        ap_finfo_t;
  -typedef struct ap_dir_t          ap_dir_t;
  -typedef ap_int32_t               ap_fileperms_t;
  -typedef uid_t                    ap_uid_t;
  -typedef gid_t                    ap_gid_t;
  -typedef ino_t                    ap_ino_t;
  -typedef dev_t                    ap_dev_t;
  +typedef struct apr_file_t         apr_file_t;
  +typedef struct apr_finfo_t        apr_finfo_t;
  +typedef struct apr_dir_t          apr_dir_t;
  +typedef apr_int32_t               apr_fileperms_t;
  +typedef uid_t                    apr_uid_t;
  +typedef gid_t                    apr_gid_t;
  +typedef ino_t                    apr_ino_t;
  +typedef dev_t                    apr_dev_t;
   
  -struct ap_finfo_t {
  -    ap_fileperms_t protection;
  +struct apr_finfo_t {
  +    apr_fileperms_t protection;
       ap_filetype_e filetype;
  -    ap_uid_t user;
  -    ap_gid_t group;
  -    ap_ino_t inode;
  -    ap_dev_t device;
  -    ap_off_t size;
  -    ap_time_t atime;
  -    ap_time_t mtime;
  -    ap_time_t ctime;
  +    apr_uid_t user;
  +    apr_gid_t group;
  +    apr_ino_t inode;
  +    apr_dev_t device;
  +    apr_off_t size;
  +    apr_time_t atime;
  +    apr_time_t mtime;
  +    apr_time_t ctime;
   };
   
   /*   Function definitions */
  @@ -155,14 +155,14 @@
    *      default permissions will be used.  *arg1 must point to a valid file_t, 
    *      or NULL (in which case it will be allocated)
    */
  -ap_status_t ap_open(ap_file_t **new_file, const char *fname, ap_int32_t flag, 
  -                    ap_fileperms_t perm, ap_pool_t *cont);
  +apr_status_t apr_open(apr_file_t **new_file, const char *fname, apr_int32_t flag, 
  +                    apr_fileperms_t perm, apr_pool_t *cont);
   
   /**
    * Close the specified file.
    * @param file The file descriptor to close.
    */
  -ap_status_t ap_close(ap_file_t *file);
  +apr_status_t apr_close(apr_file_t *file);
   
   /**
    * delete the specified file.
  @@ -170,7 +170,7 @@
    * @param cont The pool to use.
    * @tip If the file is open, it won't be removed until all instances are closed.
    */
  -ap_status_t ap_remove_file(const char *path, ap_pool_t *cont);
  +apr_status_t apr_remove_file(const char *path, apr_pool_t *cont);
   
   /**
    * rename the specified file.
  @@ -180,36 +180,36 @@
    * @tip If a file exists at the new location, then it will be overwritten.  
    *      Moving files or directories across devices may not be possible.
    */
  -ap_status_t ap_rename_file(const char *from_path, const char *to_path,
  -                           ap_pool_t *pool);
  +apr_status_t apr_rename_file(const char *from_path, const char *to_path,
  +                           apr_pool_t *pool);
   
   /**
    * Are we at the end of the file
    * @param fptr The apr file we are testing.
    * @tip Returns APR_EOF if we are at the end of file, APR_SUCCESS otherwise.
    */
  -ap_status_t ap_eof(ap_file_t *fptr);
  +apr_status_t apr_eof(apr_file_t *fptr);
   
   /**
    * Is there an error on the stream?
    * @param fptr The apr file we are testing.
    * @tip Returns -1 if the error indicator is set, APR_SUCCESS otherwise.
    */
  -ap_status_t ap_ferror(ap_file_t *fptr);
  +apr_status_t apr_ferror(apr_file_t *fptr);
   
   /**
    * open standard error as an apr file pointer.
    * @param thefile The apr file to use as stderr.
    * @param cont The pool to allocate the file out of.
    */
  -ap_status_t ap_open_stderr(ap_file_t **thefile, ap_pool_t *cont);
  +apr_status_t apr_open_stderr(apr_file_t **thefile, apr_pool_t *cont);
   
   /**
    * Read data from the specified file.
    * @param thefile The file descriptor to read from.
    * @param buf The buffer to store the data to.
    * @param nbytes On entry, the number of bytes to read; on exit, the number of bytes read.
  - * @tip ap_read will read up to the specified number of bytes, but never 
  + * @tip apr_read will read up to the specified number of bytes, but never 
    *      more.  If there isn't enough data to fill that number of bytes, all 
    *      of the available data is read.  The third argument is modified to 
    *      reflect the number of bytes read.  If a char was put back into the 
  @@ -220,14 +220,14 @@
    *
    *      APR_EINTR is never returned.
    */
  -ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes);
  +apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes);
   
   /**
    * Write data to the specified file.
    * @param thefile The file descriptor to write to.
    * @param buf The buffer which contains the data.
    * @param nbytes On entry, the number of bytes to write; on exit, the number of bytes written.
  - * @tip ap_write will write up to the specified number of bytes, but never 
  + * @tip apr_write will write up to the specified number of bytes, but never 
    *      more.  If the OS cannot write that many bytes, it will write as many 
    *      as it can.  The third argument is modified to reflect the * number 
    *      of bytes written. 
  @@ -236,7 +236,7 @@
    *
    *      APR_EINTR is never returned.
    */
  -ap_status_t ap_write(ap_file_t *thefile, const void *buf, ap_ssize_t *nbytes);
  +apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes);
   
   /**
    * Write data from iovec array to the specified file.
  @@ -249,12 +249,12 @@
    * @tip It is possible for both bytes to be written and an error to be returned.
    *      APR_EINTR is never returned.
    *
  - *      ap_writev is available even if the underlying operating system 
  + *      apr_writev is available even if the underlying operating system 
    *
    *      doesn't provide writev().
    */
  -ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, 
  -                      ap_size_t nvec, ap_ssize_t *nbytes);
  +apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, 
  +                      apr_size_t nvec, apr_ssize_t *nbytes);
   
   /**
    * Read data from the specified file.
  @@ -262,7 +262,7 @@
    * @param buf The buffer to store the data to.
    * @param nbytes The number of bytes to read.
    * @param bytes_read If non-NULL, this will contain the number of bytes read.
  - * @tip ap_read will read up to the specified number of bytes, but never 
  + * @tip apr_read will read up to the specified number of bytes, but never 
    *      more.  If there isn't enough data to fill that number of bytes, 
    *      then the process/thread will block until it is available or EOF 
    *      is reached.  If a char was put back into the stream via ungetc, 
  @@ -273,8 +273,8 @@
    *
    *      APR_EINTR is never returned.
    */
  -ap_status_t ap_full_read(ap_file_t *thefile, void *buf, ap_size_t nbytes,
  -                         ap_size_t *bytes_read);
  +apr_status_t apr_full_read(apr_file_t *thefile, void *buf, apr_size_t nbytes,
  +                         apr_size_t *bytes_read);
   
   /**
    * Write data to the specified file.
  @@ -282,7 +282,7 @@
    * @param buf The buffer which contains the data.
    * @param nbytes The number of bytes to write.
    * @param bytes_written If non-NULL, this will contain the number of bytes written.
  - * @tip ap_write will write up to the specified number of bytes, but never 
  + * @tip apr_write will write up to the specified number of bytes, but never 
    *      more.  If the OS cannot write that many bytes, the process/thread 
    *      will block until they can be written. Exceptional error such as 
    *      "out of space" or "pipe closed" will terminate with an error.
  @@ -291,29 +291,29 @@
    *
    *      APR_EINTR is never returned.
    */
  -ap_status_t ap_full_write(ap_file_t *thefile, const void *buf,
  -                          ap_size_t nbytes, ap_size_t *bytes_written);
  +apr_status_t apr_full_write(apr_file_t *thefile, const void *buf,
  +                          apr_size_t nbytes, apr_size_t *bytes_written);
   
   /**
    * put a character into the specified file.
    * @param ch The character to write.
    * @param thefile The file descriptor to write to
    */
  -ap_status_t ap_putc(char ch, ap_file_t *thefile);
  +apr_status_t apr_putc(char ch, apr_file_t *thefile);
   
   /**
    * get a character from the specified file.
    * @param ch The character to write.
    * @param thefile The file descriptor to write to
    */
  -ap_status_t ap_getc(char *ch, ap_file_t *thefile);
  +apr_status_t apr_getc(char *ch, apr_file_t *thefile);
   
   /**
    * put a character back onto a specified stream.
    * @param ch The character to write.
    * @param thefile The file descriptor to write to
    */
  -ap_status_t ap_ungetc(char ch, ap_file_t *thefile);
  +apr_status_t apr_ungetc(char ch, apr_file_t *thefile);
   
   /**
    * Get a string from a specified file.
  @@ -321,36 +321,36 @@
    * @param len The length of the string
    * @param thefile The file descriptor to read from
    */
  -ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile);
  +apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile);
   
   /**
    * Put the string into a specified file.
    * @param str The string to write. 
    * @param thefile The file descriptor to write to
    */
  -ap_status_t ap_puts(const char *str, ap_file_t *thefile);
  +apr_status_t apr_puts(const char *str, apr_file_t *thefile);
   
   /**
    * Flush the file's buffer.
    * @param thefile The file descriptor to flush
    */
  -ap_status_t ap_flush(ap_file_t *thefile);
  +apr_status_t apr_flush(apr_file_t *thefile);
   
   /**
    * duplicate the specified file descriptor.
    * @param new_file The structure to duplicate into. 
    * @param old_file The file to duplicate.
    * @param p The pool to use for the new file.
  - * @tip *arg1 must point to a valid ap_file_t, or point to NULL
  + * @tip *arg1 must point to a valid apr_file_t, or point to NULL
    */         
  -ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p);
  +apr_status_t apr_dupfile(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p);
   
   /**
    * get the specified file's stats.
    * @param finfo Where to store the information about the file.
    * @param thefile The file to get information about.
    */ 
  -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile);
  +apr_status_t apr_getfileinfo(apr_finfo_t *finfo, apr_file_t *thefile);
   
   /**
    * set the specified file's permission bits.
  @@ -362,7 +362,7 @@
    *
    *      Platforms which do not implement this feature will return APR_ENOTIMPL.
    */
  -ap_status_t ap_setfileperms(const char *fname, ap_fileperms_t perms);
  +apr_status_t apr_setfileperms(const char *fname, apr_fileperms_t perms);
   
   /**
    * get the specified file's stats.  The file is specified by filename, 
  @@ -371,7 +371,7 @@
    * @param fname The name of the file to stat.
    * @param cont the pool to use to allocate the new file. 
    */ 
  -ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont);
  +apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont);
   
   /**
    * get the specified file's stats.  The file is specified by filename, 
  @@ -381,7 +381,7 @@
    * @param fname The name of the file to stat.
    * @param cont the pool to use to allocate the new file. 
    */ 
  -ap_status_t ap_lstat(ap_finfo_t *finfo, const char *fname, ap_pool_t *cont);
  +apr_status_t apr_lstat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont);
   
   /**
    * Move the read/write file offset to a specified byte within a file.
  @@ -395,7 +395,7 @@
    * @tip The third argument is modified to be the offset the pointer
             was actually moved to.
    */
  -ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where,ap_off_t *offset);
  +apr_status_t apr_seek(apr_file_t *thefile, apr_seek_where_t where,apr_off_t *offset);
   
   /**
    * Open the specified directory.
  @@ -403,26 +403,26 @@
    * @param dirname The full path to the directory (use / on all systems)
    * @param cont The pool to use.
    */                        
  -ap_status_t ap_opendir(ap_dir_t **new_dir, const char *dirname, ap_pool_t *cont);
  +apr_status_t apr_opendir(apr_dir_t **new_dir, const char *dirname, apr_pool_t *cont);
   
   /**
    * close the specified directory. 
    * @param thedir the directory descriptor to close.
    */                        
  -ap_status_t ap_closedir(ap_dir_t *thedir);
  +apr_status_t apr_closedir(apr_dir_t *thedir);
   
   /**
    * Read the next entry from the specified directory. 
    * @param thedir the directory descriptor to read from, and fill out.
    * @tip All systems return . and .. as the first two files.
    */                        
  -ap_status_t ap_readdir(ap_dir_t *thedir);
  +apr_status_t apr_readdir(apr_dir_t *thedir);
   
   /**
    * Rewind the directory to the first entry.
    * @param thedir the directory descriptor to rewind.
    */                        
  -ap_status_t ap_rewinddir(ap_dir_t *thedir);
  +apr_status_t apr_rewinddir(apr_dir_t *thedir);
   
   /**
    * Create a new directory on the file system.
  @@ -430,15 +430,15 @@
    * @param perm Permissions for the new direcoty.
    * @param cont the pool to use.
    */                        
  -ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, 
  -                        ap_pool_t *cont);
  +apr_status_t apr_make_dir(const char *path, apr_fileperms_t perm, 
  +                        apr_pool_t *cont);
   
   /**
    * Remove directory from the file system.
    * @param path the path for the directory to be removed.  (use / on all systems)
    * @param cont the pool to use.
    */                        
  -ap_status_t ap_remove_dir(const char *path, ap_pool_t *cont);
  +apr_status_t apr_remove_dir(const char *path, apr_pool_t *cont);
   
   /**
    * Create an anonymous pipe.
  @@ -446,7 +446,7 @@
    * @param out The file descriptor to use as output from the pipe.
    * @param cont The pool to operate on.
    */
  -ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_pool_t *cont);
  +apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *cont);
   
   /**
    * Create a named pipe.
  @@ -454,8 +454,8 @@
    * @param perm The permissions for the newly created pipe.
    * @param cont The pool to operate on.
    */
  -ap_status_t ap_create_namedpipe(const char *filename, ap_fileperms_t perm, 
  -                                ap_pool_t *cont);
  +apr_status_t apr_create_namedpipe(const char *filename, apr_fileperms_t perm, 
  +                                apr_pool_t *cont);
   
   /**
    * Set the timeout value for a pipe or manipulate the blocking state.
  @@ -463,7 +463,7 @@
    * @param timeoutThe timeout value in microseconds.  Values < 0 mean wait 
    *        forever, 0 means do not wait at all.
    */
  -ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_interval_time_t timeout);
  +apr_status_t apr_set_pipe_timeout(apr_file_t *thepipe, apr_interval_time_t timeout);
   
   /**accessor and general file_io functions. */
   
  @@ -472,14 +472,14 @@
    * @param new_path The path of the file.  
    * @param thefile The currently open file.
    */                     
  -ap_status_t ap_get_filename(char **new_path, ap_file_t *thefile);
  +apr_status_t apr_get_filename(char **new_path, apr_file_t *thefile);
   
   /**
    * Get the file name of the current directory entry.
    * @param new_path the file name of the directory entry. 
    * @param thedir the currently open directory.
    */                        
  -ap_status_t ap_get_dir_filename(char **new_path, ap_dir_t *thedir);
  +apr_status_t apr_get_dir_filename(char **new_path, apr_dir_t *thedir);
   
   /**
    * Return the data associated with the current file.
  @@ -487,7 +487,7 @@
    * @param key The key to use for retreiving data associated with this file.
    * @param file The currently open file.
    */                     
  -ap_status_t ap_get_filedata(void **data, const char *key, ap_file_t *file);
  +apr_status_t apr_get_filedata(void **data, const char *key, apr_file_t *file);
   
   /**
    * Set the data associated with the current file.
  @@ -496,29 +496,29 @@
    * @param key The key to use for assocaiteing data with the file.
    * @param cleanup The cleanup routine to use when the file is destroyed.
    */                     
  -ap_status_t ap_set_filedata(ap_file_t *file, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *));
  +apr_status_t apr_set_filedata(apr_file_t *file, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *));
   
   /**
    * Get the size of the current directory entry.
    * @param size the size of the directory entry. 
    * @param thedir the currently open directory.
    */                        
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir);
  +apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir);
   
   /**
    * Get the last modified time of the current directory entry.
    * @param mtime the last modified time of the directory entry. 
    * @param thedir the currently open directory.
    */ 
  -ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, ap_dir_t *thedir);
  +apr_status_t apr_dir_entry_mtime(apr_time_t *mtime, apr_dir_t *thedir);
   
   /**
    * Get the file type of the current directory entry.
    * @param type the file type of the directory entry. 
    * @param thedir the currently open directory.
    */
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir);
  +apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir);
   
   /**
    * Write a string to a file using a printf format.
  @@ -526,9 +526,9 @@
    * @param format The format string
    * @param ... The values to substitute in the format string
    * @return The number of bytes written
  - * @deffunc int ap_fprintf(ap_file_t *fptr, const char *format, ...)
  + * @deffunc int apr_fprintf(apr_file_t *fptr, const char *format, ...)
    */ 
  -APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
  +APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
           __attribute__((format(printf,2,3)));
   
   #ifdef __cplusplus
  
  
  
  1.11      +4 -4      apache-2.0/src/lib/apr/include/apr_fnmatch.h
  
  Index: apr_fnmatch.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_fnmatch.h	2000/07/23 04:15:05	1.10
  +++ apr_fnmatch.h	2000/08/02 05:26:03	1.11
  @@ -66,19 +66,19 @@
    *              FNM_PERIOD     --  Period must be matched by period
    *              FNM_CASE_BLIND --  Compare characters case-insensitively.
    * </PRE>
  - * @deffunc ap_status_t ap_fnmatch(const char *pattern, const char *strings, int flags)
  + * @deffunc apr_status_t apr_fnmatch(const char *pattern, const char *strings, int flags)
    */
   
  -APR_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *strings,
  +APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *strings,
   			    int flags);
   
   /**
    * Determine if the given pattern is a regular expression.
    * @param pattern The pattern to search for glob characters.
    * @return non-zero if pattern has any glob characters in it
  - * @deffunc int ap_is_fnmatch(const char *pattern)
  + * @deffunc int apr_is_fnmatch(const char *pattern)
    */
  -APR_EXPORT(int) ap_is_fnmatch(const char *pattern);
  +APR_EXPORT(int) apr_is_fnmatch(const char *pattern);
   
   #ifdef __cplusplus
   }
  
  
  
  1.41      +19 -19    apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr_general.h	2000/07/23 04:34:44	1.40
  +++ apr_general.h	2000/08/02 05:26:04	1.41
  @@ -81,7 +81,7 @@
   
   #define MAXIMUM_WAIT_OBJECTS 64
   
  -typedef int               ap_signum_t;
  +typedef int               apr_signum_t;
   
   #ifdef SIGHUP
   #define APR_SIGHUP SIGHUP
  @@ -253,7 +253,7 @@
    * @param length size of the buffer
    */
   /* TODO: I'm not sure this is the best place to put this prototype...*/
  -ap_status_t ap_generate_random_bytes(unsigned char * buf, int length);
  +apr_status_t apr_generate_random_bytes(unsigned char * buf, int length);
   #endif
   
   /* Memory allocation/Pool debugging options... 
  @@ -272,25 +272,25 @@
   #define ALLOC_STATS
   */
   
  -typedef struct ap_pool_t {
  +typedef struct apr_pool_t {
       union block_hdr *first;
       union block_hdr *last;
       struct cleanup *cleanups;
       struct process_chain *subprocesses;
  -    struct ap_pool_t *sub_pools;
  -    struct ap_pool_t *sub_next;
  -    struct ap_pool_t *sub_prev;
  -    struct ap_pool_t *parent;
  +    struct apr_pool_t *sub_pools;
  +    struct apr_pool_t *sub_next;
  +    struct apr_pool_t *sub_prev;
  +    struct apr_pool_t *parent;
       char *free_first_avail;
   #ifdef ALLOC_USE_MALLOC
       void *allocation_list;
   #endif
   #ifdef POOL_DEBUG
  -    struct ap_pool_t *joined;
  +    struct apr_pool_t *joined;
   #endif
       int (*apr_abort)(int retcode);
       struct datastruct *prog_data;
  -}ap_pool_t;
  +}apr_pool_t;
    
   /* pool functions */
   
  @@ -299,10 +299,10 @@
    * @param newcont The pool we have just created.
    * @param cont The parent pool.  If this is NULL, the new pool is a root
    *        pool.  If it is non-NULL, the new pool will inherit all
  - *        of it's parent pool's attributes, except the ap_pool_t will 
  + *        of it's parent pool's attributes, except the apr_pool_t will 
    *        be a sub-pool.
    */
  -ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont);
  +apr_status_t apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont);
   
   /**
    * Set the data associated with the current pool
  @@ -319,9 +319,9 @@
    *      It is advised that steps are taken to ensure that a unique
    *      key is used at all times.
    */
  -ap_status_t ap_set_userdata(const void *data, const char *key, 
  -                            ap_status_t (*cleanup) (void *), 
  -                            ap_pool_t *cont);
  +apr_status_t apr_set_userdata(const void *data, const char *key, 
  +                            apr_status_t (*cleanup) (void *), 
  +                            apr_pool_t *cont);
   
   /**
    * Return the data associated with the current pool.
  @@ -329,13 +329,13 @@
    * @param key The user data associated with the pool.
    * @param cont The current pool.
    */
  -ap_status_t ap_get_userdata(void **data, const char *key, ap_pool_t *cont);
  +apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont);
   
   /**
    * Setup any APR internal data structures.  This MUST be the first function 
    * called for any APR program.
    */
  -ap_status_t ap_initialize(void);
  +apr_status_t apr_initialize(void);
   
   /**
    * Tear down any APR internal data structures which aren't torn down 
  @@ -343,7 +343,7 @@
    * @tip An APR program must call this function at termination once it 
    *      has stopped using APR services.
    */
  -void ap_terminate(void);
  +void apr_terminate(void);
   
   /**
    * Set the APR_ABORT function.
  @@ -354,7 +354,7 @@
    *      then APR will return an error and expect the calling program to
    *      deal with the error accordingly.
    */
  -ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_pool_t *cont);
  +apr_status_t apr_set_abort(int (*apr_abort)(int retcode), apr_pool_t *cont);
   
   /**
    * Return a human readable string describing the specified error.
  @@ -362,7 +362,7 @@
    * @param buf A buffer to hold the error string.
    * @param bufsize Size of the buffer to hold the string.
    */
  -char *ap_strerror(ap_status_t statcode, char *buf, ap_size_t bufsize);
  +char *apr_strerror(apr_status_t statcode, char *buf, apr_size_t bufsize);
   
   #ifdef __cplusplus
   }
  
  
  
  1.13      +5 -5      apache-2.0/src/lib/apr/include/apr_getopt.h
  
  Index: apr_getopt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_getopt.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_getopt.h	2000/07/23 04:41:27	1.12
  +++ apr_getopt.h	2000/08/02 05:26:04	1.13
  @@ -65,7 +65,7 @@
   
   /**
    * Parse the command line options passed to the program.
  - * @param nargc The number of arguments passed to ap_getopt to parse
  + * @param nargc The number of arguments passed to apr_getopt to parse
    * @param nargv The array of command line options to parse
    * @param ostr A string of characters that are acceptable options to the 
    *             program.  Characters followed by ":" are required to have an 
  @@ -80,11 +80,11 @@
    * </PRE>
    * @param cont The pool to operate on.
    * @tip Arguments 2 and 3 are most commonly argc and argv from main(argc, argv)
  - * @deffunc ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_pool_t *cont)
  + * @deffunc apr_status_t apr_getopt(apr_int32_t nargc, char *const *nargv, const char *ostr, apr_int32_t *rv, apr_pool_t *cont)
    */
  -APR_EXPORT(ap_status_t) ap_getopt(ap_int32_t nargc, char *const *nargv, 
  -                                  const char *ostr, ap_int32_t *rv, 
  -                                  ap_pool_t *cont);
  +APR_EXPORT(apr_status_t) apr_getopt(apr_int32_t nargc, char *const *nargv, 
  +                                  const char *ostr, apr_int32_t *rv, 
  +                                  apr_pool_t *cont);
   
   #endif  /* ! APR_GETOPT_H */
   
  
  
  
  1.7       +12 -12    apache-2.0/src/lib/apr/include/apr_hash.h
  
  Index: apr_hash.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_hash.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_hash.h	2000/07/25 00:42:12	1.6
  +++ apr_hash.h	2000/08/02 05:26:04	1.7
  @@ -72,19 +72,19 @@
   /*
    * Abstract type for hash tables.
    */
  -typedef struct ap_hash_t ap_hash_t;
  +typedef struct apr_hash_t apr_hash_t;
   
   /*
    * Abstract type for scanning hash tables.
    */
  -typedef struct ap_hash_index_t ap_hash_index_t;
  +typedef struct apr_hash_index_t apr_hash_index_t;
   
   /**
    * Create a hash table within a pool.
    * @param pool The pool to allocate the hash table out of
    * @return The hash table just created
    */
  -APR_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool);
  +APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool);
   
   /**
    * Associate a value with a key in a hash table.
  @@ -95,7 +95,7 @@
    * @param val Value to associate with the key
    * @tip If the value is NULL the hash entry is deleted.
    */
  -APR_EXPORT(void) ap_hash_set(ap_hash_t *ht, const void *key, size_t klen, 
  +APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key, size_t klen, 
                                const void *val);
   
   /**
  @@ -106,7 +106,7 @@
    *         If the length is 0 it is assumed to be strlen(key)+1
    * @return Returns NULL if the key is not present.
    */
  -APR_EXPORT(void) *ap_hash_get(ap_hash_t *ht, const void *key, size_t klen);
  +APR_EXPORT(void) *apr_hash_get(apr_hash_t *ht, const void *key, size_t klen);
   
   /**
    * Start iterating over the entries in a hash table.
  @@ -115,13 +115,13 @@
    * @tip Example:
    * <PRE>
    * 
  - *     int sum_values(ap_hash_t *ht)
  + *     int sum_values(apr_hash_t *ht)
    *     {
  - *         ap_hash_index_t *hi;
  + *         apr_hash_index_t *hi;
    * 	   void *val;
    * 	   int sum = 0;
  - * 	   for (hi = ap_hash_first(ht); hi; hi = ap_hash_next(hi)) {
  - * 	       ap_hash_this(hi, NULL, NULL, &val);
  + * 	   for (hi = apr_hash_first(ht); hi; hi = apr_hash_next(hi)) {
  + * 	       apr_hash_this(hi, NULL, NULL, &val);
    * 	       sum += *(int *)val;
    * 	   }
    * 	   return sum;
  @@ -133,14 +133,14 @@
    * progress at the same time.
    * </PRE>
    */
  -APR_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht);
  +APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht);
   
   /**
    * Continue iterating over the entries in a hash table.
    * @param hi The iteration state
    * @return a pointer to the updated iteration state.  NULL if there are no more  *         entries.
    */
  -APR_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi);
  +APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi);
   
   /**
    * Get the current entry's details from the iteration state.
  @@ -151,7 +151,7 @@
    * @tip The return pointers should point to a variable that will be set to the
    *      corresponding data, or they may be NULL if the data isn't interesting.
    */
  -APR_EXPORT(void) ap_hash_this(ap_hash_index_t *hi, const void **key, 
  +APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, const void **key, 
                                 size_t *klen, void **val);
   
   #ifdef __cplusplus
  
  
  
  1.41      +36 -36    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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr_lib.h	2000/07/26 15:31:29	1.40
  +++ apr_lib.h	2000/08/02 05:26:04	1.41
  @@ -89,10 +89,10 @@
   /*
    * Structure used by the variable-formatter routines.
    */
  -typedef struct ap_vformatter_buff_t {
  +typedef struct apr_vformatter_buff_t {
       char *curpos;
       char *endpos;
  -} ap_vformatter_buff_t;
  +} apr_vformatter_buff_t;
   
   /**
    * return the final element of the pathname
  @@ -105,9 +105,9 @@
    *                 "gum"            -> "gum"
    *                 "wi\\n32\\stuff" -> "stuff"
    * </PRE>
  - * @deffunc const char * ap_filename_of_pathname(const char *pathname)
  + * @deffunc const char * apr_filename_of_pathname(const char *pathname)
    */
  -APR_EXPORT(const char *) ap_filename_of_pathname(const char *pathname);
  +APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname);
   
   /* These macros allow correct support of 8-bit characters on systems which
    * support 8-bit characters.  Pretty dumb how the cast is required, but
  @@ -145,7 +145,7 @@
   #endif /* WIN32 */
   
   /**
  - * ap_vformatter() is a generic printf-style formatting routine
  + * apr_vformatter() is a generic printf-style formatting routine
    * with some extensions.
    * @param flush_func The function to call when the buffer is full
    * @param c The buffer to write to
  @@ -165,96 +165,96 @@
    * work as expected at all, but that seems to be a fair trade-off
    * for the increased robustness of having printf-warnings work.
    *
  - * Additionally, ap_vformatter allows for arbitrary output methods
  + * Additionally, apr_vformatter allows for arbitrary output methods
    * using the ap_vformatter_buff and flush_func.
    *
    * The ap_vformatter_buff has two elements curpos and endpos.
  - * curpos is where ap_vformatter will write the next byte of output.
  + * curpos is where apr_vformatter will write the next byte of output.
    * It proceeds writing output to curpos, and updating curpos, until
    * either the end of output is reached, or curpos == endpos (i.e. the
    * buffer is full).
    *
  - * If the end of output is reached, ap_vformatter returns the
  + * If the end of output is reached, apr_vformatter returns the
    * number of bytes written.
    *
    * When the buffer is full, the flush_func is called.  The flush_func
    * can return -1 to indicate that no further output should be attempted,
  - * and ap_vformatter will return immediately with -1.  Otherwise
  + * and apr_vformatter will return immediately with -1.  Otherwise
    * the flush_func should flush the buffer in whatever manner is
  - * appropriate, re ap_pool_t nitialize curpos and endpos, and return 0.
  + * appropriate, re apr_pool_t nitialize curpos and endpos, and return 0.
    *
    * Note that flush_func is only invoked as a result of attempting to
    * write another byte at curpos when curpos >= endpos.  So for
    * example, it's possible when the output exactly matches the buffer
    * space available that curpos == endpos will be true when
  - * ap_vformatter returns.
  + * apr_vformatter returns.
    *
  - * ap_vformatter does not call out to any other code, it is entirely
  + * apr_vformatter does not call out to any other code, it is entirely
    * self-contained.  This allows the callers to do things which are
  - * otherwise "unsafe".  For example, ap_psprintf uses the "scratch"
  + * otherwise "unsafe".  For example, apr_psprintf uses the "scratch"
    * space at the unallocated end of a block, and doesn't actually
  - * complete the allocation until ap_vformatter returns.  ap_psprintf
  - * would be completely broken if ap_vformatter were to call anything
  - * that used a ap_pool_t.  Similarly http_bprintf() uses the "scratch"
  + * complete the allocation until apr_vformatter returns.  apr_psprintf
  + * would be completely broken if apr_vformatter were to call anything
  + * that used a apr_pool_t.  Similarly http_bprintf() uses the "scratch"
    * space at the end of its output buffer, and doesn't actually note
    * that the space is in use until it either has to flush the buffer
  - * or until ap_vformatter returns.
  + * or until apr_vformatter returns.
    * </PRE>
  - * @deffunc int ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *b), ap_vformatter_buff_t *c, const char *fmt, va_list ap)
  + * @deffunc int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), apr_vformatter_buff_t *c, const char *fmt, va_list ap)
    */
  -APR_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *b),
  -			       ap_vformatter_buff_t *c, const char *fmt,
  +APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b),
  +			       apr_vformatter_buff_t *c, const char *fmt,
   			       va_list ap);
   
   /**
    * Validate any password encypted with any algorithm that APR understands
    * @param passwd The password to validate
    * @param hash The password to validate against
  - * @deffunc ap_status_t ap_validate_password(const char *passwd, const char *hash)
  + * @deffunc apr_status_t apr_validate_password(const char *passwd, const char *hash)
    */
  -APR_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash);
  +APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, const char *hash);
   
   
   /*
  - * These are snprintf implementations based on ap_vformatter().
  + * These are snprintf implementations based on apr_vformatter().
    *
    * Note that various standards and implementations disagree on the return
    * value of snprintf, and side-effects due to %n in the formatting string.
  - * ap_snprintf behaves as follows:
  + * apr_snprintf behaves as follows:
    *
    * Process the format string until the entire string is exhausted, or
    * the buffer fills.  If the buffer fills then stop processing immediately
    * (so no further %n arguments are processed), and return the buffer
    * length.  In all cases the buffer is NUL terminated.
    *
  - * In no event does ap_snprintf return a negative number.  It's not possible
  + * In no event does apr_snprintf return a negative number.  It's not possible
    * to distinguish between an output which was truncated, and an output which
    * exactly filled the buffer.
    */
   
   /**
  - *snprintf routine based on ap_vformatter.  This means it understands the 
  + *snprintf routine based on apr_vformatter.  This means it understands the 
    *same extensions.>
    * @param buf The buffer to write to
    * @param len The size of the buffer
    * @param format The format string
    * @param ... The arguments to use to fill out the format string.
  - * @deffunc int ap_snprintf(char *buf, size_t len, const char *format, ...)
  + * @deffunc int apr_snprintf(char *buf, size_t len, const char *format, ...)
    */
  -APR_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, 
  +APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, 
                                      const char *format, ...)
   	__attribute__((format(printf,3,4)));
   
   /**
  - * vsnprintf routine based on ap_vformatter.  This means it understands the 
  + * vsnprintf routine based on apr_vformatter.  This means it understands the 
    * same extensions.
    * @param buf The buffer to write to
    * @param len The size of the buffer
    * @param format The format string
    * @param ap The arguments to use to fill out the format string.
  - * @deffunc int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
  + * @deffunc int apr_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
    */
  -APR_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  +APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format,
   			      va_list ap);
   
   /**
  @@ -262,9 +262,9 @@
    * @param prompt The prompt to display
    * @param pwbuf Where to store the password
    * @param bufsize The length of the password string.
  - * @deffunc ap_status_t ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize)
  + * @deffunc apr_status_t apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize)
    */
  -APR_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
  +APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
   
   /**
    * Register a process to be killed when a pool dies.
  @@ -273,14 +273,14 @@
    * @param how How to kill the process, one of:
    * <PRE>
    *         kill_never   	   -- process is never sent any signals
  - *         kill_always 	   -- process is sent SIGKILL on ap_pool_t cleanup	
  + *         kill_always 	   -- process is sent SIGKILL on apr_pool_t cleanup	
    *         kill_after_timeout -- SIGTERM, wait 3 seconds, SIGKILL
    *         just_wait          -- wait forever for the process to complete
    *         kill_only_once     -- send SIGTERM and then wait
    * </PRE>
  - * @deffunc void ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid, enum kill_conditions how)
  + * @deffunc void apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how)
    */
  -APR_EXPORT(void) ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid,
  +APR_EXPORT(void) apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid,
   				     enum kill_conditions how);
   
   #ifdef __cplusplus
  
  
  
  1.17      +15 -15    apache-2.0/src/lib/apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_lock.h	2000/07/23 15:51:59	1.16
  +++ apr_lock.h	2000/08/02 05:26:05	1.17
  @@ -66,11 +66,11 @@
    * @package APR lock library
    */
   
  -typedef enum {APR_CROSS_PROCESS, APR_INTRAPROCESS, APR_LOCKALL} ap_lockscope_e;
  +typedef enum {APR_CROSS_PROCESS, APR_INTRAPROCESS, APR_LOCKALL} apr_lockscope_e;
   
  -typedef enum {APR_MUTEX, APR_READWRITE} ap_locktype_e;
  +typedef enum {APR_MUTEX, APR_READWRITE} apr_locktype_e;
   
  -typedef struct ap_lock_t           ap_lock_t;
  +typedef struct apr_lock_t           apr_lock_t;
   
   /*   Function definitions */
   
  @@ -96,21 +96,21 @@
    * @tip APR_CROSS_PROCESS may lock both processes and threads, but it is
    *      only guaranteed to lock processes.
    */
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, const char *fname, 
  -                           ap_pool_t *cont);
  +apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
  +                           apr_lockscope_e scope, const char *fname, 
  +                           apr_pool_t *cont);
   
   /**
    * Lock a protected region.
    * @param lock The lock to set.
    */
  -ap_status_t ap_lock(ap_lock_t *lock);
  +apr_status_t apr_lock(apr_lock_t *lock);
   
   /**
    * Unlock a protected region.
    * @param lock The lock to reset.
    */
  -ap_status_t ap_unlock(ap_lock_t *lock);
  +apr_status_t apr_unlock(apr_lock_t *lock);
   
   /**
    * Free the memory associated with a lock.
  @@ -118,7 +118,7 @@
    * @tip  If the lock is currently active when it is destroyed, it 
    *       will be unlocked first.
    */
  -ap_status_t ap_destroy_lock(ap_lock_t *lock);
  +apr_status_t apr_destroy_lock(apr_lock_t *lock);
   
   /**
    * Re-open a lock in a child process.
  @@ -126,15 +126,15 @@
    * @param fname A file name to use if the lock mechanism requires one.  This
    *              argument should always be provided.  The lock code itself will
    *              determine if it should be used.  This filename should be the 
  - *              same one that was passed to ap_create_lock
  + *              same one that was passed to apr_create_lock
    * @param cont The pool to operate on.
    * @tip This function doesn't always do something, it depends on the
    *      locking mechanism chosen for the platform, but it is a good
    *      idea to call it regardless, because it makes the code more
    *      portable. 
    */
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
  -                               ap_pool_t *cont);
  +apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
  +                               apr_pool_t *cont);
   
   /**
    * Return the pool associated with the current lock.
  @@ -142,7 +142,7 @@
    * @param key The key to use when retreiving data associated with this lock
    * @param data The user data associated with the lock.
    */
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data);
  +apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data);
   
   /**
    * Return the pool associated with the current lock.
  @@ -151,8 +151,8 @@
    * @param key The key to use when associating data with this lock
    * @param cleanup The cleanup to use when the lock is destroyed.
    */
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *));
  +apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *));
   
   #ifdef __cplusplus
   }
  
  
  
  1.15      +11 -11    apache-2.0/src/lib/apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_md5.h	2000/07/23 15:58:52	1.14
  +++ apr_md5.h	2000/08/02 05:26:05	1.15
  @@ -107,26 +107,26 @@
       UINT4 count[2];		/* number of bits, modulo 2^64 (lsb first) */
       unsigned char buffer[64];	/* input buffer */
   #if APR_HAS_XLATE
  -    ap_xlate_t *xlate;          /* translation handle */
  +    apr_xlate_t *xlate;          /* translation handle */
   #endif
   } ap_md5_ctx_t;
   
   /**
    * MD5 Initialize.  Begins an MD5 operation, writing a new context.
    * @param context The MD5 context to initialize.
  - * @deffunc ap_status_t ap_MD5Init(ap_md5_ctx_t *context)
  + * @deffunc apr_status_t apr_MD5Init(ap_md5_ctx_t *context)
    */
  -APR_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context);
  +APR_EXPORT(apr_status_t) apr_MD5Init(ap_md5_ctx_t *context);
   
   /**
    * MD5 translation setup.  Provides the APR translation handle to be used 
    * for translating the content before calculating the digest.
    * @param context The MD5 content to set the translation for.
    * @param xlate The translation handle to use for this MD5 context 
  - * @deffunc ap_status_t ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate)
  + * @deffunc apr_status_t ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate)
    */
   #if APR_HAS_XLATE
  -APR_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate);
  +APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate);
   #else
   #define ap_MD5SetXlate(context, xlate) APR_ENOTIMPL
   #endif
  @@ -137,9 +137,9 @@
    * @param context The MD5 content to update.
    * @param input next message block to update
    * @param inputLen The length of the next message block
  - * @deffunc ap_status_t ap_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen)
  + * @deffunc apr_status_t apr_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen)
    */
  -APR_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context,
  +APR_EXPORT(apr_status_t) apr_MD5Update(ap_md5_ctx_t *context,
                                        const unsigned char *input,
                                        unsigned int inputLen);
   
  @@ -148,9 +148,9 @@
    * message digest and zeroing the context
    * @param digest The final MD5 digest
    * @param context The MD5 content we are finalizing.
  - * @deffunc ap_status_t ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context)
  + * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context)
    */
  -APR_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  +APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
                                       ap_md5_ctx_t *context);
   
   /**
  @@ -159,9 +159,9 @@
    * @param salt The salt to use for the encoding
    * @param result The string to store the encoded password in
    * @param nbytes The length of the string
  - * @deffunc ap_status_t ap_MD5Encode(const char *password, const char *salt, char *result, size_t nbytes)
  + * @deffunc apr_status_t apr_MD5Encode(const char *password, const char *salt, char *result, size_t nbytes)
    */
  -APR_EXPORT(ap_status_t) ap_MD5Encode(const char *password, const char *salt,
  +APR_EXPORT(apr_status_t) apr_MD5Encode(const char *password, const char *salt,
                                        char *result, size_t nbytes);
   
   #ifdef __cplusplus
  
  
  
  1.13      +7 -7      apache-2.0/src/lib/apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_mmap.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_mmap.h	2000/07/23 16:03:07	1.12
  +++ apr_mmap.h	2000/08/02 05:26:06	1.13
  @@ -68,15 +68,15 @@
    * @package APR MMAP library
    */
   
  -typedef struct ap_mmap_t            ap_mmap_t;
  +typedef struct apr_mmap_t            apr_mmap_t;
   /* As far as I can tell the only really sane way to store an MMAP is as a
    * void * and a length.  BeOS requires this area_id, but that's just a little
    * something extra.  I am exposing this type, because it doesn't make much
    * sense to keep it private, and opening it up makes some stuff easier in
    * Apache.
    */
  -struct ap_mmap_t {
  -    ap_pool_t *cntxt;
  +struct apr_mmap_t {
  +    apr_pool_t *cntxt;
   #ifdef BEOS
       area_id area;
   #endif
  @@ -94,14 +94,14 @@
    * @param size The size of the file
    * @param cntxt The pool to use when creating the mmap.
    */
  -ap_status_t ap_mmap_create(ap_mmap_t ** newmmap, ap_file_t *file, ap_off_t offset,
  -                 ap_size_t size, ap_pool_t *cntxt);
  +apr_status_t apr_mmap_create(apr_mmap_t ** newmmap, apr_file_t *file, apr_off_t offset,
  +                 apr_size_t size, apr_pool_t *cntxt);
   
   /**
    * Remove a mmap'ed.
    * @param mmap The mmap'ed file.
    */
  -ap_status_t ap_mmap_delete(ap_mmap_t *mmap);
  +apr_status_t apr_mmap_delete(apr_mmap_t *mmap);
   
   /** 
    * Move the pointer into the mmap'ed file to the specified offset.
  @@ -109,7 +109,7 @@
    * @param mmap The mmap'ed file.
    * @param offset The offset to move to.
    */
  -ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_off_t offset);
  +apr_status_t apr_mmap_offset(void **addr, apr_mmap_t *mmap, apr_off_t offset);
   
   #ifdef __cplusplus
   }
  
  
  
  1.49      +58 -58    apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- apr_network_io.h	2000/07/23 16:28:12	1.48
  +++ apr_network_io.h	2000/08/02 05:26:06	1.49
  @@ -108,7 +108,7 @@
    */
   #if (!APR_HAVE_IN_ADDR)
   struct in_addr {
  -    ap_uint32_t  s_addr;
  +    apr_uint32_t  s_addr;
   }
   #endif
   
  @@ -122,17 +122,17 @@
   #define ap_inet_addr    inet_network
   #endif
   
  -typedef struct ap_socket_t     ap_socket_t;
  -typedef struct ap_pollfd_t     ap_pollfd_t;
  -typedef struct ap_hdtr_t       ap_hdtr_t;
  -typedef struct in_addr      ap_in_addr;
  +typedef struct apr_socket_t     apr_socket_t;
  +typedef struct apr_pollfd_t     apr_pollfd_t;
  +typedef struct apr_hdtr_t       apr_hdtr_t;
  +typedef struct in_addr      apr_in_addr;
   
   #if APR_HAS_SENDFILE
   /* Define flags passed in on ap_sendfile() */
   #define APR_SENDFILE_DISCONNECT_SOCKET      1
   
   /* A structure to encapsulate headers and trailers for ap_sendfile */
  -struct ap_hdtr_t {
  +struct apr_hdtr_t {
       struct iovec* headers;
       int numheaders;
       struct iovec* trailers;
  @@ -147,7 +147,7 @@
    * @param new_sock The new socket that has been setup. 
    * @param cont The pool to use
    */
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new_sock, ap_pool_t *cont);
  +apr_status_t apr_create_tcp_socket(apr_socket_t **new_sock, apr_pool_t *cont);
   
   /**
    * Shutdown either reading, writing, or both sides of a tcp socket.
  @@ -161,13 +161,13 @@
    * @tip This does not actually close the socket descriptor, it just
    *      controls which calls are still valid on the socket.
    */
  -ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how);
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how);
   
   /**
    * Close a tcp socket.
    * @param thesocket The socket to close 
    */
  -ap_status_t ap_close_socket(ap_socket_t *thesocket);
  +apr_status_t apr_close_socket(apr_socket_t *thesocket);
   
   /**
    * Bind the socket to it's assocaited port
  @@ -175,7 +175,7 @@
    * @tip This is where we will find out if there is any other process
    *      using the selected port.
    */
  -ap_status_t ap_bind(ap_socket_t *sock);
  +apr_status_t apr_bind(apr_socket_t *sock);
   
   /**
    * Listen to a bound socketi for connections.
  @@ -184,7 +184,7 @@
    *                listen queue.  If this value is less than zero, the listen
    *                queue size is set to zero.  
    */
  -ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog);
  +apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog);
   
   /**
    * Accept a new connection request
  @@ -194,8 +194,8 @@
    * @param sock The socket we are listening on.
    * @param connection_pool The pool for the new socket.
    */
  -ap_status_t ap_accept(ap_socket_t **new_sock, ap_socket_t *sock, 
  -                      ap_pool_t *connection_pool);
  +apr_status_t apr_accept(apr_socket_t **new_sock, apr_socket_t *sock, 
  +                      apr_pool_t *connection_pool);
   
   /**
    * Issue a connection request to a socket either on the same machine 
  @@ -205,14 +205,14 @@
    *                 APR assumes that the sockaddr_in in the apr_socket is 
    *                 completely filled out.
    */
  -ap_status_t ap_connect(ap_socket_t *sock, char *hostname);
  +apr_status_t apr_connect(apr_socket_t *sock, char *hostname);
   
   /**
    * Get name of the machine we are currently connected to.
    * @param name A buffer to store the hostname in.
    * @param sock The socket to examine.
    */
  -ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock);
  +apr_status_t apr_get_remote_hostname(char **name, apr_socket_t *sock);
   
   /**
    * Get name of the current machine
  @@ -221,7 +221,7 @@
    *            buffer provided. 
    * @param cont The pool to use.
    */
  -ap_status_t ap_gethostname(char *buf, int len, ap_pool_t *cont);
  +apr_status_t apr_gethostname(char *buf, int len, apr_pool_t *cont);
   
   /**
    * Return the pool associated with the current socket>
  @@ -229,7 +229,7 @@
    * @param key The key to associate with the user data.
    * @param sock The currently open socket.
    */
  -ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock);
  +apr_status_t apr_get_socketdata(void **data, const char *key, apr_socket_t *sock);
   
   /**
    * Set the pool associated with the current socket.
  @@ -238,8 +238,8 @@
    * @param key The key to associate with the data.
    * @param cleanup The cleanup to call when the socket is destroyed.
    */
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
  -                              ap_status_t (*cleanup) (void*));
  +apr_status_t apr_set_socketdata(apr_socket_t *sock, void *data, const char *key,
  +                              apr_status_t (*cleanup) (void*));
   
   /**
    * Send data over a network.
  @@ -250,14 +250,14 @@
    * @tip
    * <PRE>
    * This functions acts like a blocking write by default.  To change 
  - * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
  + * this behavior, use apr_setsocketopt with the APR_SO_TIMEOUT option.
    *
    * It is possible for both bytes to be sent and an error to be returned.
    *
    * APR_EINTR is never returned.
    * </PRE>
    */
  -ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len);
  +apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len);
   
   /**
    * Send multiple packets of data over a network.
  @@ -268,7 +268,7 @@
    * @tip
    * <PRE>
    * This functions acts like a blocking write by default.  To change 
  - * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
  + * this behavior, use apr_setsocketopt with the APR_SO_TIMEOUT option.
    * The number of bytes actually sent is stored in argument 3.
    *
    * It is possible for both bytes to be sent and an error to be returned.
  @@ -276,8 +276,8 @@
    * APR_EINTR is never returned.
    * </PRE>
    */
  -ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec, 
  -                     ap_int32_t nvec, ap_ssize_t *len);
  +apr_status_t apr_sendv(apr_socket_t *sock, const struct iovec *vec, 
  +                     apr_int32_t nvec, apr_ssize_t *len);
   
   #if APR_HAS_SENDFILE
   /**
  @@ -290,11 +290,11 @@
    * @param len Number of bytes to send 
    * @param flags APR flags that are mapped to OS specific flags
    * @tip This functions acts like a blocking write by default.  To change 
  - *      this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
  + *      this behavior, use apr_setsocketopt with the APR_SO_TIMEOUT option.
    *      The number of bytes actually sent is stored in argument 5.
    */
  -ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file, ap_hdtr_t *hdtr, 
  -                        ap_off_t *offset, ap_size_t *len, ap_int32_t flags);
  +apr_status_t ap_sendfile(apr_socket_t *sock, apr_file_t *file, apr_hdtr_t *hdtr, 
  +                        apr_off_t *offset, apr_size_t *len, apr_int32_t flags);
   #endif
   
   /**
  @@ -306,7 +306,7 @@
    * @tip
    * <PRE>
    * This functions acts like a blocking read by default.  To change 
  - * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
  + * this behavior, use apr_setsocketopt with the APR_SO_TIMEOUT option.
    * The number of bytes actually sent is stored in argument 3.
    *
    * It is possible for both bytes to be received and an APR_EOF or
  @@ -315,7 +315,7 @@
    * APR_EINTR is never returned.
    * </PRE>
    */
  -ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len);
  +apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len);
   
   /**
    * Setup socket options for the specified socket
  @@ -337,7 +337,7 @@
    * </PRE>
    * @param on Are we turning the option on or off.
    */
  -ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on);
  +apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on);
   
   /**
    * Query socket options for the specified socket
  @@ -361,7 +361,7 @@
    * </PRE>
    * @param on Socket option returned on the call.
    */
  -ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t* on);
  +apr_status_t apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t* on);
   
   /**
    * Associate a local port with a socket.
  @@ -371,30 +371,30 @@
    *      that this socket is going to use this port if possible.  If
    *      the port is already used, we won't find out about it here.
    */
  -ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port);
  +apr_status_t apr_set_local_port(apr_socket_t *sock, apr_uint32_t port);
   
   /**
    * Assocaite a remote port with a socket.
    * @param sock The socket to enquire about.
    * @param port The local port this socket will be dealing with.
    * @tip This does not make a connection to the remote port, it is just 
  - *      telling apr which port ap_connect() should attempt to connect to.
  + *      telling apr which port apr_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port);
  +apr_status_t apr_set_remote_port(apr_socket_t *sock, apr_uint32_t port);
   
   /**
    * Return the local port with a socket.
    * @param port The local port this socket is associated with.
    * @param sock The socket to enquire about.
    */
  -ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock);
  +apr_status_t apr_get_local_port(apr_uint32_t *port, apr_socket_t *sock);
   
   /**
    * Return the remote port associated with a socket.
    * @param port The remote port this socket is associated with.
    * @param sock The socket to enquire about.
    */
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock);
  +apr_status_t apr_get_remote_port(apr_uint32_t *port, apr_socket_t *sock);
   
   /**
    * Assocaite a local socket addr with an apr socket.
  @@ -404,44 +404,44 @@
    * @tip This does not bind the two together, it is just telling apr 
    *      that this socket is going to use this address if possible. 
    */
  -ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr);
  +apr_status_t apr_set_local_ipaddr(apr_socket_t *sock, const char *addr);
   
   /**
    * Assocaite a remote socket addr with an apr socket.
    * @param sock The socket to use 
    * @param addr The IP address to attach to the socket.
    * @tip This does not make a connection to the remote address, it is just
  - *      telling apr which address ap_connect() should attempt to connect to.
  + *      telling apr which address apr_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr);
  +apr_status_t apr_set_remote_ipaddr(apr_socket_t *sock, const char *addr);
   
   /**
    * Return the local IP address associated with an apr socket.
    * @param addr The local IP address associated with the socket.
    * @param sock The socket to use 
    */
  -ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock);
  +apr_status_t apr_get_local_ipaddr(char **addr, apr_socket_t *sock);
   
   /**
    * Return the remote IP address associated with an apr socket.
    * @param addr The remote IP address associated with the socket.
    * @param sock The socket to use 
    */
  -ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock);
  +apr_status_t apr_get_remote_ipaddr(char **addr, apr_socket_t *sock);
   
   /**
    * Return the local socket name as a BSD style struct sockaddr_in.
    * @param name The local name associated with the socket.
    * @param sock The socket to use 
    */
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock);
  +apr_status_t apr_get_local_name(struct sockaddr_in **name, apr_socket_t *sock);
   
   /**
    * Return the remote socket name as a BSD style struct sockaddr_in.
    * @param name The remote name associated with the socket.
    * @param sock The socket to use 
    */
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock);
  +apr_status_t apr_get_remote_name(struct sockaddr_in **name, apr_socket_t *sock);
   
   /**
    * Setup the memory required for poll to operate properly>
  @@ -449,8 +449,8 @@
    * @param num The number of socket descriptors to be polled.
    * @param cont The pool to operate on.
    */
  -ap_status_t ap_setup_poll(ap_pollfd_t **new_poll, ap_int32_t num, 
  -                          ap_pool_t *cont);
  +apr_status_t apr_setup_poll(apr_pollfd_t **new_poll, apr_int32_t num, 
  +                          apr_pool_t *cont);
   
   /**
    * Poll the sockets in the poll structure
  @@ -468,7 +468,7 @@
    *        socket has been signalled, or the timeout has expired. 
    * </PRE>
    */
  -ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_interval_time_t timeout);
  +apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds, apr_interval_time_t timeout);
   
   /**
    * Add a socket to the poll structure.
  @@ -481,8 +481,8 @@
    *            APR_POLLOUT   -- signal if write will not block
    * </PRE>
    */
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, ap_socket_t *socket, 
  -                               ap_int16_t event);
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset, apr_socket_t *socket, 
  +                               apr_int16_t event);
   
   /**
    * Modify a socket in the poll structure with mask.
  @@ -495,14 +495,14 @@
    *            APR_POLLOUT   -- signal if write will not block
    * </PRE>
    */
  -ap_status_t ap_mask_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock,
  -                                  ap_int16_t events);
  +apr_status_t apr_mask_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock,
  +                                  apr_int16_t events);
   /**
    * Remove a socket from the poll structure.
    * @param aprset The poll structure we will be using. 
    * @param sock The socket to remove from the current poll structure. 
    */
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock);
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock);
   
   /**
    * Remove all sockets from the poll structure.
  @@ -514,7 +514,7 @@
    *            APR_POLLOUT   -- signal if write will not block
    * </PRE>
    */
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events);
  +apr_status_t apr_clear_poll_sockets(apr_pollfd_t *aprset, apr_int16_t events);
   
   /**
    * Get the return events for the specified socket.
  @@ -531,8 +531,8 @@
    * @param sock The socket we wish to get information about. 
    * @param aprset The poll structure we will be using. 
    */
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, 
  -                           ap_pollfd_t *aprset);
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, 
  +                           apr_pollfd_t *aprset);
   
   /**
    * Return the data associated with the current poll.
  @@ -540,7 +540,7 @@
    * @param key The key to use for retreiving data associated with a poll struct.
    * @param data The user data associated with the pollfd.
    */
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data);
  +apr_status_t apr_get_polldata(apr_pollfd_t *pollfd, const char *key, void *data);
   
   /**
    * Set the data associated with the current poll.
  @@ -549,8 +549,8 @@
    * @param key The user data to associate with the pollfd.
    * @param cleanup The cleanup function
    */
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *));
  +apr_status_t apr_set_polldata(apr_pollfd_t *pollfd, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *));
   
   /**
    * Convert a File type to a socket so that it can be used in a poll operation.
  @@ -560,7 +560,7 @@
    *      ability to poll files for data to be read/written/exceptions will
    *      have the APR_FILES_AS_SOCKETS macro defined as true.
    */
  -ap_status_t ap_socket_from_file(ap_socket_t **newsock, ap_file_t *file);
  +apr_status_t apr_socket_from_file(apr_socket_t **newsock, apr_file_t *file);
   
   #ifdef __cplusplus
   }
  
  
  
  1.28      +42 -42    apache-2.0/src/lib/apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- apr_pools.h	2000/07/26 01:56:00	1.27
  +++ apr_pools.h	2000/08/02 05:26:06	1.28
  @@ -73,14 +73,14 @@
    * Instead, we maintain pools, and allocate items (both memory and I/O
    * handlers) from the pools --- currently there are two, one for per
    * transaction info, and one for config info.  When a transaction is over,
  - * we can delete everything in the per-transaction ap_pool_t without fear, and
  + * we can delete everything in the per-transaction apr_pool_t without fear, and
    * without thinking too hard about it either.
    *
    * rst
    */
   
   /* Arenas for configuration info and transaction info
  - * --- actual layout of the ap_pool_t structure is private to 
  + * --- actual layout of the apr_pool_t structure is private to 
    * alloc.c.  
    */
   
  @@ -96,14 +96,14 @@
   
   enum kill_conditions {
       kill_never,                 /* process is never sent any signals */
  -    kill_always,                /* process is sent SIGKILL on ap_pool_t cleanup */
  +    kill_always,                /* process is sent SIGKILL on apr_pool_t cleanup */
       kill_after_timeout,         /* SIGTERM, wait 3 seconds, SIGKILL */
       just_wait,                  /* wait forever for the process to complete */
       kill_only_once              /* send SIGTERM and then wait */
   };
   
   struct process_chain {
  -    ap_proc_t *pid;
  +    apr_proc_t *pid;
       enum kill_conditions kill_how;
       struct process_chain *next;
   };
  @@ -151,9 +151,9 @@
   #endif
   #define ap_pool_join(a,b)
   #else
  -APR_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub);
  -APR_EXPORT(ap_pool_t *) ap_find_pool(const void *ts);
  -APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b);
  +APR_EXPORT(void) ap_pool_join(apr_pool_t *p, apr_pool_t *sub);
  +APR_EXPORT(apr_pool_t *) ap_find_pool(const void *ts);
  +APR_EXPORT(int) ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   #endif
   
   #ifdef ULTRIX_BRAIN_DEATH
  @@ -169,16 +169,16 @@
   /**
    * Setup all of the internal structures required to use pools
    * @tip Programs do NOT need to call this directly.  APR will call this
  - *      automatically from ap_initialize. 
  + *      automatically from apr_initialize. 
    */
  -ap_status_t ap_init_alloc(void);	/* Set up everything */
  +apr_status_t apr_init_alloc(void);	/* Set up everything */
   
   /**
    * Tear down all of the internal structures required to use pools
    * @tip Programs do NOT need to call this directly.  APR will call this
  - *      automatically from ap_terminate. 
  + *      automatically from apr_terminate. 
    */
  -void ap_term_alloc(void);        /* Tear down everything */
  +void apr_term_alloc(void);        /* Tear down everything */
   
   /**
    * make a sub pool from the current pool
  @@ -188,41 +188,41 @@
    * @tip The apr_abort function provides a way to quit the program if the
    *      machine is out of memory.  By default, APR will return with an
    *      error.
  - * @deffunc ap_pool_t *ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode))
  + * @deffunc apr_pool_t *apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode))
    */
  -APR_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode));
  +APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode));
   
   /**
    * clear all memory in the pool
    * @param p The pool to clear
    * @tip  This does not actually free the memory, it just allows the pool
    *       to re-use this memory for the next allocation.
  - * @deffunc void ap_clear_pool(ap_pool_t *p)
  + * @deffunc void apr_clear_pool(apr_pool_t *p)
    */
  -APR_EXPORT(void) ap_clear_pool(ap_pool_t *p);
  +APR_EXPORT(void) apr_clear_pool(apr_pool_t *p);
   
   /**
    * destroy the pool
    * @param p The pool to destroy
    * @tip This will actually free the memory
  - * @deffunc void ap_destroy_pool(ap_pool_t *p)
  + * @deffunc void apr_destroy_pool(apr_pool_t *p)
    */
  -APR_EXPORT(void) ap_destroy_pool(ap_pool_t *p);
  +APR_EXPORT(void) apr_destroy_pool(apr_pool_t *p);
   
   /**
    * report the number of bytes currently in the pool
    * @param p The pool to inspect
    * @return The number of bytes
  - * @deffunc ap_size_t ap_bytes_in_pool(ap_pool_t *p)
  + * @deffunc apr_size_t apr_bytes_in_pool(apr_pool_t *p)
    */
  -APR_EXPORT(ap_size_t) ap_bytes_in_pool(ap_pool_t *p);
  +APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p);
   
   /**
    * report the number of bytes currently in the list of free blocks
    * @return The number of bytes
  - * @deffunc ap_size_t ap_bytes_in_free_blocks(void)
  + * @deffunc apr_size_t apr_bytes_in_free_blocks(void)
    */
  -APR_EXPORT(ap_size_t) ap_bytes_in_free_blocks(void);
  +APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void);
   
   /**
    * Determine if pool a is an ancestor of pool b
  @@ -230,27 +230,27 @@
    * @param b The pool to search for
    * @return True if a is an ancestor of b, NULL is considered an ancestor
    *         of all pools.
  - * @deffunc int ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b)
  + * @deffunc int ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
    */
  -APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b);
  +APR_EXPORT(int) ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   
   /**
    * Allocate a block of memory from a pool
    * @param c The pool to allocate out of 
    * @param reqsize The amount of memory to allocate 
    * @return The allocated memory
  - * @deffunc void *ap_palloc(ap_pool_t *c, ap_size_t reqsize)
  + * @deffunc void *apr_palloc(apr_pool_t *c, apr_size_t reqsize)
    */
  -APR_EXPORT(void *) ap_palloc(ap_pool_t *c, ap_size_t reqsize);
  +APR_EXPORT(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize);
   
   /**
    * Allocate a block of memory from a pool and set all of the memory to 0
    * @param p The pool to allocate out of 
    * @param size The amount of memory to allocate 
    * @return The allocated memory
  - * @deffunc void *ap_pcalloc(ap_pool_t *p, ap_size_t size)
  + * @deffunc void *apr_pcalloc(apr_pool_t *p, apr_size_t size)
    */
  -APR_EXPORT(void *) ap_pcalloc(ap_pool_t *p, ap_size_t size);
  +APR_EXPORT(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size);
   
   /**
    * Register a function to be called when a pool is cleared or destroyed
  @@ -259,31 +259,31 @@
    * @param plain_cleanup The function to call when the pool is cleared 
    *                      or destroyed
    * @param child_cleanup The function to call when a child process is created 
  - * @deffunc void ap_register_cleanup(ap_pool_t *p, const void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *))
  + * @deffunc void apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *))
    */
  -APR_EXPORT(void) ap_register_cleanup(ap_pool_t *p, const void *data,
  -                                     ap_status_t (*plain_cleanup) (void *),
  -                                     ap_status_t (*child_cleanup) (void *));
  +APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data,
  +                                     apr_status_t (*plain_cleanup) (void *),
  +                                     apr_status_t (*child_cleanup) (void *));
   
   /**
    * remove a previously registered cleanup function
    * @param p The pool remove the cleanup from 
    * @param data The data to remove from cleanup
    * @param cleanup The function to remove from cleanup
  - * @deffunc void ap_kill_cleanup(ap_pool_t *p, const void *data, ap_status_t (*cleanup) (void *))
  + * @deffunc void apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *))
    */
  -APR_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, const void *data,
  -                                 ap_status_t (*cleanup) (void *));
  +APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
  +                                 apr_status_t (*cleanup) (void *));
   
   /**
    * Run the specified cleanup function immediately and unregister it
    * @param p The pool remove the cleanup from 
    * @param data The data to remove from cleanup
    * @param cleanup The function to remove from cleanup
  - * @deffunc ap_status_t ap_run_cleanup(ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *))
  + * @deffunc apr_status_t apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *))
    */
  -APR_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data,
  -                                       ap_status_t (*cleanup) (void *));
  +APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
  +                                       apr_status_t (*cleanup) (void *));
   
   /* Preparing for exec() --- close files, etc., but *don't* flush I/O
    * buffers, *don't* wait for subprocesses, and *don't* free any memory.
  @@ -291,19 +291,19 @@
   /**
    * Run all of the child_cleanups, so that any unnecessary files are 
    * closed because we are about to exec a new program
  - * @deffunc void ap_cleanup_for_exec(void)
  + * @deffunc void apr_cleanup_for_exec(void)
    */
  -APR_EXPORT(void) ap_cleanup_for_exec(void);
  +APR_EXPORT(void) apr_cleanup_for_exec(void);
   
   /**
    * An empty cleanup function 
    * @param data The data to cleanup
  - * @deffunc ap_status_t ap_null_cleanup(void *data)
  + * @deffunc apr_status_t apr_null_cleanup(void *data)
    */
  -APR_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data);
  +APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data);
   
   
  -/* used to guarantee to the ap_pool_t debugging code that the sub ap_pool_t will not be
  +/* used to guarantee to the apr_pool_t debugging code that the sub apr_pool_t will not be
    * destroyed before the parent pool
    */
   #ifndef POOL_DEBUG
  
  
  
  1.38      +60 -60    apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apr_portable.h	2000/07/23 17:00:44	1.37
  +++ apr_portable.h	2000/08/02 05:26:07	1.38
  @@ -91,33 +91,33 @@
   
   #ifdef WIN32
   /* The primitives for Windows types */
  -typedef HANDLE                ap_os_file_t;
  -typedef HANDLE                ap_os_dir_t;
  -typedef SOCKET                ap_os_sock_t;
  -typedef HANDLE                ap_os_lock_t;
  -typedef HANDLE                ap_os_thread_t;
  -typedef PROCESS_INFORMATION   ap_os_proc_t;
  -typedef DWORD                 ap_os_threadkey_t; 
  -typedef FILETIME              ap_os_imp_time_t;
  -typedef SYSTEMTIME            ap_os_exp_time_t;
  +typedef HANDLE                apr_os_file_t;
  +typedef HANDLE                apr_os_dir_t;
  +typedef SOCKET                apr_os_sock_t;
  +typedef HANDLE                apr_os_lock_t;
  +typedef HANDLE                apr_os_thread_t;
  +typedef PROCESS_INFORMATION   apr_os_proc_t;
  +typedef DWORD                 apr_os_threadkey_t; 
  +typedef FILETIME              apr_os_imp_time_t;
  +typedef SYSTEMTIME            apr_os_exp_time_t;
   
   #elif defined(OS2)
   #define INCL_DOS
   #include <os2.h>
  -typedef HFILE                 ap_os_file_t;
  -typedef HDIR                  ap_os_dir_t;
  -typedef int                   ap_os_sock_t;
  -typedef HMTX                  ap_os_lock_t;
  -typedef TID                   ap_os_thread_t;
  -typedef PID                   ap_os_proc_t;
  -typedef PULONG                ap_os_threadkey_t; 
  -typedef struct timeval        ap_os_imp_time_t;
  -typedef struct tm             ap_os_exp_time_t;
  +typedef HFILE                 apr_os_file_t;
  +typedef HDIR                  apr_os_dir_t;
  +typedef int                   apr_os_sock_t;
  +typedef HMTX                  apr_os_lock_t;
  +typedef TID                   apr_os_thread_t;
  +typedef PID                   apr_os_proc_t;
  +typedef PULONG                apr_os_threadkey_t; 
  +typedef struct timeval        apr_os_imp_time_t;
  +typedef struct tm             apr_os_exp_time_t;
   
   #elif defined(BEOS)
   #include <kernel/OS.h>
   
  -struct ap_os_lock_t {
  +struct apr_os_lock_t {
   	/* Inter proc */
   	sem_id sem_interproc;
   	int32  ben_interproc;
  @@ -126,15 +126,15 @@
   	int32  ben_intraproc;
   };
   
  -typedef int                   ap_os_file_t;
  -typedef DIR                   ap_os_dir_t;
  -typedef int                   ap_os_sock_t;
  -typedef struct ap_os_lock_t      ap_os_lock_t;
  -typedef thread_id             ap_os_thread_t;
  -typedef thread_id             ap_os_proc_t;
  -typedef int                   ap_os_threadkey_t;
  -typedef struct timeval        ap_os_imp_time_t;
  -typedef struct tm             ap_os_exp_time_t;
  +typedef int                   apr_os_file_t;
  +typedef DIR                   apr_os_dir_t;
  +typedef int                   apr_os_sock_t;
  +typedef struct apr_os_lock_t      apr_os_lock_t;
  +typedef thread_id             apr_os_thread_t;
  +typedef thread_id             apr_os_proc_t;
  +typedef int                   apr_os_threadkey_t;
  +typedef struct timeval        apr_os_imp_time_t;
  +typedef struct tm             apr_os_exp_time_t;
   
   #else
   /* Any other OS should go above this one.  This is the lowest common
  @@ -150,7 +150,7 @@
   };
   #endif
   
  -struct ap_os_lock_t {
  +struct apr_os_lock_t {
   #if APR_USE_SYSVSEM_SERIALIZE
       int crossproc;
   #elif APR_USE_FCNTL_SERIALIZE
  @@ -170,17 +170,17 @@
   #endif
   };
   
  -typedef int                   ap_os_file_t;
  -typedef DIR                   ap_os_dir_t;
  -typedef int                   ap_os_sock_t;
  -typedef struct ap_os_lock_t      ap_os_lock_t;
  +typedef int                   apr_os_file_t;
  +typedef DIR                   apr_os_dir_t;
  +typedef int                   apr_os_sock_t;
  +typedef struct apr_os_lock_t      apr_os_lock_t;
   #if APR_HAS_THREADS && APR_HAVE_PTHREAD_H 
  -typedef pthread_t             ap_os_thread_t;
  -typedef pthread_key_t         ap_os_threadkey_t;
  +typedef pthread_t             apr_os_thread_t;
  +typedef pthread_key_t         apr_os_threadkey_t;
   #endif
  -typedef pid_t                 ap_os_proc_t;
  -typedef struct timeval        ap_os_imp_time_t;
  -typedef struct tm             ap_os_exp_time_t;
  +typedef pid_t                 apr_os_proc_t;
  +typedef struct timeval        apr_os_imp_time_t;
  +typedef struct tm             apr_os_exp_time_t;
   #endif
   
   /**
  @@ -190,42 +190,42 @@
    * @tip On Unix, it is only possible to get a file descriptor from 
    *      an apr file type.
    */
  -ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file);     
  +apr_status_t apr_get_os_file(apr_os_file_t *thefile, apr_file_t *file);     
   
   /**
    * convert the dir from apr type to os specific type.
    * @param thedir The os specific dir we are converting to
    * @param dir The apr dir to convert.
    */   
  -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir);      
  +apr_status_t apr_get_os_dir(apr_os_dir_t **thedir, apr_dir_t *dir);      
   
   /**
    * Convert the socket from an apr type to an OS specific socket
    * @param thesock The socket to convert.
    * @param sock The os specifc equivelant of the apr socket..
    */
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock);
  +apr_status_t apr_get_os_sock(apr_os_sock_t *thesock, apr_socket_t *sock);
   
   /**
    * Convert the lock from os specific type to apr type
    * @param oslock The os specific lock we are converting to.
    * @param lock The apr lock to convert.
    */
  -ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock);     
  +apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock);     
   
   /**
    * Get the exploded time in the platforms native format.
    * @param ostime the native time format
    * @param aprtime the time to convert
    */
  -ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **ostime, ap_exploded_time_t *aprtime);
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprtime);
   
   /**
    * Get the imploded time in the platforms native format.
    * @param ostime the native time format
    * @param aprtimethe time to convert
    */
  -ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **ostime, ap_time_t *aprtime);
  +apr_status_t apr_get_os_imp_time(apr_os_imp_time_t **ostime, apr_time_t *aprtime);
   
   #if APR_HAS_THREADS
   /**
  @@ -233,14 +233,14 @@
    * @param thethd The apr thread to convert
    * @param thd The os specific thread we are converting to
    */
  -ap_status_t ap_get_os_thread(ap_os_thread_t **thethd, ap_thread_t *thd);
  +apr_status_t apr_get_os_thread(apr_os_thread_t **thethd, apr_thread_t *thd);
   
   /**
    * convert the thread private memory key to os specific type from an apr type.
    * @param thekey The apr handle we are converting from.
    * @param key The os specific handle we are converting to.
    */
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key);
  +apr_status_t apr_get_os_threadkey(apr_os_threadkey_t *thekey, apr_threadkey_t *key);
   #endif
   
   /**
  @@ -251,8 +251,8 @@
    * @tip On Unix, it is only possible to put a file descriptor into
    *      an apr file type.
    */
  -ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, 
  -                           ap_pool_t *cont); 
  +apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, 
  +                           apr_pool_t *cont); 
   
   /**
    * convert the dir from os specific type to apr type.
  @@ -260,8 +260,8 @@
    * @param thedir The os specific dir to convert
    * @param cont The pool to use when creating to apr directory.
    */
  -ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, 
  -                          ap_pool_t *cont); 
  +apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, 
  +                          apr_pool_t *cont); 
   
   /**
    * Convert a socket from the os specific type to the apr type
  @@ -269,8 +269,8 @@
    * @param thesock The socket to convert to.
    * @param cont The socket we are converting to an apr type.
    */
  -ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, 
  -                           ap_pool_t *cont);
  +apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, 
  +                           apr_pool_t *cont);
   
   /**
    * Convert the lock from os specific type to apr type
  @@ -278,8 +278,8 @@
    * @param thelock The os specific lock to convert.
    * @param cont The pool to use if it is needed.
    */
  -ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
  -                           ap_pool_t *cont); 
  +apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
  +                           apr_pool_t *cont); 
   
   /**
    * Put the imploded time in the APR format.
  @@ -287,7 +287,7 @@
    * @param ostime the time to convert
    * @param cont the pool to use if necessary
    */
  -ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime, ap_pool_t *cont); 
  +apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime, apr_pool_t *cont); 
   
   /**
    * Put the exploded time in the APR format.
  @@ -295,7 +295,7 @@
    * @param ostime the time to convert
    * @param cont the pool to use if necessary
    */
  -ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime, ap_os_exp_time_t **ostime, ap_pool_t *cont); 
  +apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime, apr_os_exp_time_t **ostime, apr_pool_t *cont); 
   
   #if APR_HAS_THREADS
   /**
  @@ -304,8 +304,8 @@
    * @param thethd The os specific thread to convert
    * @param cont The pool to use if it is needed.
    */
  -ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, 
  -                             ap_pool_t *cont);
  +apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, 
  +                             apr_pool_t *cont);
   
   /**
    * convert the thread private memory key from os specific type to apr type.
  @@ -313,8 +313,8 @@
    * @param thekey The os specific handle to convert
    * @param cont The pool to use if it is needed.
    */
  -ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey, 
  -                                ap_pool_t *cont);
  +apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, apr_os_threadkey_t *thekey, 
  +                                apr_pool_t *cont);
   #endif
   
   #ifdef __cplusplus
  
  
  
  1.11      +13 -13    apache-2.0/src/lib/apr/include/apr_shmem.h
  
  Index: apr_shmem.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_shmem.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_shmem.h	2000/07/23 17:08:52	1.10
  +++ apr_shmem.h	2000/08/02 05:26:07	1.11
  @@ -68,14 +68,14 @@
   #endif /* __cplusplus */
   
   #if APR_USES_ANONYMOUS_SHM
  -typedef   void           ap_shm_name_t;
  +typedef   void           apr_shm_name_t;
   #elif APR_USES_FILEBASED_SHM
  -typedef   char *         ap_shm_name_t;
  +typedef   char *         apr_shm_name_t;
   #elif APR_USES_KEYBASED_SHM
  -typedef   key_t          ap_shm_name_t;
  +typedef   key_t          apr_shm_name_t;
   #endif
   
  -typedef   struct shmem_t ap_shmem_t;
  +typedef   struct shmem_t apr_shmem_t;
   
   /**
    * Create a pool of shared memory for use later.
  @@ -85,34 +85,34 @@
    *        that require it.
    * @param cont The pool to use
    */
  -ap_status_t ap_shm_init(ap_shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont);
  +apr_status_t apr_shm_init(apr_shmem_t **m, apr_size_t reqsize, const char *file, apr_pool_t *cont);
   
   /**
    * Destroy the shared memory block.
    * @param m The shared memory block to destroy. 
    */
  -ap_status_t ap_shm_destroy(ap_shmem_t *m);
  +apr_status_t apr_shm_destroy(apr_shmem_t *m);
   
   /**
    * allocate memory from the block of shared memory.
    * @param c The shared memory block to destroy. 
    * @param reqsize How much memory to allocate
    */
  -void *ap_shm_malloc(ap_shmem_t *c, ap_size_t reqsize);
  +void *apr_shm_malloc(apr_shmem_t *c, apr_size_t reqsize);
   
   /**
    * allocate memory from the block of shared memory and initialize it to zero.
    * @param shared The shared memory block to destroy. 
    * @param size How much memory to allocate
    */
  -void *ap_shm_calloc(ap_shmem_t *shared, ap_size_t size);
  +void *apr_shm_calloc(apr_shmem_t *shared, apr_size_t size);
   
   /**
    * free shared memory previously allocated.
    * @param shared The shared memory block to destroy. 
    * @param entity The actual data to free. 
    */
  -ap_status_t ap_shm_free(ap_shmem_t *shared, void *entity);
  +apr_status_t apr_shm_free(apr_shmem_t *shared, void *entity);
   
   /**
    * Get the name of the shared memory segment if not using anonymous 
  @@ -126,7 +126,7 @@
    *         memory is based on a key value such as shmctl.  If the
    *         shared memory is anonymous, the name is NULL.
    */
  -ap_status_t ap_get_shm_name(ap_shmem_t *c, ap_shm_name_t **name);
  +apr_status_t apr_get_shm_name(apr_shmem_t *c, apr_shm_name_t **name);
   
   /**
    * Set the name of the shared memory segment if not using anonymous 
  @@ -139,20 +139,20 @@
    *         memory.  APR_SUCCESS if we are using named shared memory
    *         and we were able to assign the name correctly. 
    */
  -ap_status_t ap_set_shm_name(ap_shmem_t *c, ap_shm_name_t *name);
  +apr_status_t apr_set_shm_name(apr_shmem_t *c, apr_shm_name_t *name);
   
   /**
    * Open the shared memory block in a child process.
    * @param  The shared memory block to open in the child. 
    */
  -ap_status_t ap_open_shmem(ap_shmem_t *c);
  +apr_status_t apr_open_shmem(apr_shmem_t *c);
   
   /**
    * Determine how much memory is available in the specified shared memory block
    * @param c The shared memory block to open in the child. 
    * @param avail The amount of space available in the shared memory block.
    */
  -ap_status_t ap_shm_avail(ap_shmem_t *c, ap_size_t *avail);
  +apr_status_t apr_shm_avail(apr_shmem_t *c, apr_size_t *avail);
   
   #ifdef __cplusplus
   }
  
  
  
  1.4       +19 -19    apache-2.0/src/lib/apr/include/apr_strings.h
  
  Index: apr_strings.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_strings.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_strings.h	2000/07/23 17:19:34	1.3
  +++ apr_strings.h	2000/08/02 05:26:07	1.4
  @@ -98,7 +98,7 @@
    *          this returns <0, if they are equivalent it returns 0, and if the
    *          first string is greater than second string it retuns >0.
    */
  -int ap_strnatcmp(char const *a, char const *b);
  +int apr_strnatcmp(char const *a, char const *b);
   
   /**
    * Do a natural order comparison of two strings ignoring the case of the 
  @@ -109,16 +109,16 @@
    *         this returns <0, if they are equivalent it returns 0, and if the
    *         first string is greater than second string it retuns >0.
    */
  -int ap_strnatcasecmp(char const *a, char const *b);
  +int apr_strnatcasecmp(char const *a, char const *b);
   
   /**
    * duplicate a string into memory allocated out of a pool
    * @param p The pool to allocate out of
    * @param s The string to allocate
    * @return The new string
  - * @deffunc char *ap_pstrdup(ap_pool_t *p, const char *s)
  + * @deffunc char *apr_pstrdup(apr_pool_t *p, const char *s)
    */
  -APR_EXPORT(char *) ap_pstrdup(ap_pool_t *p, const char *s);
  +APR_EXPORT(char *) apr_pstrdup(apr_pool_t *p, const char *s);
   
   /**
    * duplicate the first n characters ofa string into memory allocated 
  @@ -127,18 +127,18 @@
    * @param s The string to allocate
    * @param n The number of characters to duplicate
    * @return The new string
  - * @deffunc char *ap_pstrndup(ap_pool_t *p, const char *s, ap_size_t n)
  + * @deffunc char *apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n)
    */
  -APR_EXPORT(char *) ap_pstrndup(ap_pool_t *p, const char *s, ap_size_t n);
  +APR_EXPORT(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n);
   
   /**
    * Concatenate multiple strings, allocating memory out a pool
    * @param p The pool to allocate out of
    * @param ... The strings to concatenate.  The final string must be NULL
    * @return The new string
  - * @deffunc char *ap_pstrcat(ap_pool_t *p, ...)
  + * @deffunc char *apr_pstrcat(apr_pool_t *p, ...)
    */
  -APR_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *p, ...);
  +APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...);
   
   /**
    * printf-style style printing routine.  The data is output to a string 
  @@ -147,9 +147,9 @@
    * @param fmt The format of the string
    * @param ap The arguments to use while printing the data
    * @return The new string
  - * @deffunc char *ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap)
  + * @deffunc char *apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap)
    */
  -APR_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap);
  +APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap);
   
   /**
    * printf-style style printing routine.  The data is output to a string 
  @@ -158,9 +158,9 @@
    * @param fmt The format of the string
    * @param ... The arguments to use while printing the data
    * @return The new string
  - * @deffunc char *ap_psprintf(ap_pool_t *p, const char *fmt, ...)
  + * @deffunc char *apr_psprintf(apr_pool_t *p, const char *fmt, ...)
    */
  -APR_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...);
  +APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...);
   
   /**
    * copy n characters from src to des>
  @@ -177,18 +177,18 @@
    *          destination string, we return a pointer to the terminating '\0'
    *          to allow us to check for truncation.
    * </PRE>
  - * @deffunc char *ap_cpystrn(char *dst, const char *src, size_t dst_size)
  + * @deffunc char *apr_cpystrn(char *dst, const char *src, size_t dst_size)
    */
  -APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size);
  +APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size);
   
   /**
    * Strip spaces from a string
    * @param dest The destination string.  It is okay to modify the string
    *             in place.  Namely dest == src
    * @param src The string to rid the spaces from.
  - * @deffunc char *ap_collapse_spaces(char *dest, const char *src)
  + * @deffunc char *apr_collapse_spaces(char *dest, const char *src)
    */
  -APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src);
  +APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src);
   
   /**
    * Convert the arguments to a program from one string to an array of 
  @@ -196,11 +196,11 @@
    * @param str The arguments to convert
    * @param argv_out Output location.  This is a pointer to an array of strings.
    * @param token_context Pool to use.
  - * @deffunc ap_status_t ap_tokenize_to_argv(const char *arg_str, char ***argv_out, ap_pool_t *token_context);
  + * @deffunc apr_status_t apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context);
    */
  -APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str,
  +APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
                                               char ***argv_out,
  -                                            ap_pool_t *token_context);
  +                                            apr_pool_t *token_context);
   
   #ifdef __cplusplus
   }
  
  
  
  1.4       +53 -53    apache-2.0/src/lib/apr/include/apr_tables.h
  
  Index: apr_tables.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_tables.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_tables.h	2000/07/05 20:22:25	1.3
  +++ apr_tables.h	2000/08/02 05:26:07	1.4
  @@ -79,110 +79,110 @@
    * and tables are opaque structures to applications, but arrays are
    * published.
    */
  -typedef struct ap_table_t ap_table_t;
  -typedef struct ap_array_header_t {
  -    ap_pool_t *cont;
  +typedef struct apr_table_t apr_table_t;
  +typedef struct apr_array_header_t {
  +    apr_pool_t *cont;
       int elt_size;
       int nelts;
       int nalloc;
       char *elts;
  -} ap_array_header_t;
  +} apr_array_header_t;
   
  -struct ap_table_t {
  +struct apr_table_t {
       /* This has to be first to promote backwards compatibility with
  -     * older modules which cast a ap_table_t * to an ap_array_header_t *...
  +     * older modules which cast a apr_table_t * to an apr_array_header_t *...
        * they should use the table_elts() function for most of the
        * cases they do this for.
        */
  -    ap_array_header_t a;
  +    apr_array_header_t a;
   #ifdef MAKE_TABLE_PROFILE
       void *creator;
   #endif
   };
   
  -typedef struct ap_table_entry_t {
  +typedef struct apr_table_entry_t {
       char *key;          /* maybe NULL in future;
                            * check when iterating thru table_elts
                            */
       char *val;
  -} ap_table_entry_t;
  +} apr_table_entry_t;
   
  -/* XXX: these know about the definition of struct ap_table_t in alloc.c.  That
  +/* XXX: these know about the definition of struct apr_table_t in alloc.c.  That
    * definition is not here because it is supposed to be private, and by not
    * placing it here we are able to get compile-time diagnostics from modules
  - * written which assume that a ap_table_t is the same as an ap_array_header_t. -djg
  + * written which assume that a apr_table_t is the same as an apr_array_header_t. -djg
    */
  -#define ap_table_elts(t) ((ap_array_header_t *)(t))
  -#define ap_is_empty_table(t) (((t) == NULL)||(((ap_array_header_t *)(t))->nelts == 0))
  +#define ap_table_elts(t) ((apr_array_header_t *)(t))
  +#define ap_is_empty_table(t) (((t) == NULL)||(((apr_array_header_t *)(t))->nelts == 0))
   
  -APR_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts,
  +APR_EXPORT(apr_array_header_t *) apr_make_array(struct apr_pool_t *p, int nelts,
   						int elt_size);
  -APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr);
  -APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
  -			       const ap_array_header_t *src);
  +APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr);
  +APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst,
  +			       const apr_array_header_t *src);
   
   /* copy_array copies the *entire* array.  copy_array_hdr just copies
    * the header, and arranges for the elements to be copied if (and only
    * if) the code subsequently does a push or arraycat.
    */
  -APR_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p,
  -						const ap_array_header_t *arr);
  -APR_EXPORT(ap_array_header_t *)
  -	ap_copy_array_hdr(struct ap_pool_t *p,
  -			   const ap_array_header_t *arr);
  -APR_EXPORT(ap_array_header_t *)
  -	ap_append_arrays(struct ap_pool_t *p,
  -			  const ap_array_header_t *first,
  -			  const ap_array_header_t *second);
  +APR_EXPORT(apr_array_header_t *) apr_copy_array(struct apr_pool_t *p,
  +						const apr_array_header_t *arr);
  +APR_EXPORT(apr_array_header_t *)
  +	apr_copy_array_hdr(struct apr_pool_t *p,
  +			   const apr_array_header_t *arr);
  +APR_EXPORT(apr_array_header_t *)
  +	apr_append_arrays(struct apr_pool_t *p,
  +			  const apr_array_header_t *first,
  +			  const apr_array_header_t *second);
   
  -/* ap_array_pstrcat generates a new string from the ap_pool_t containing
  +/* apr_array_pstrcat generates a new string from the apr_pool_t containing
    * the concatenated sequence of substrings referenced as elements within
    * the array.  The string will be empty if all substrings are empty or null,
    * or if there are no elements in the array.
    * If sep is non-NUL, it will be inserted between elements as a separator.
    */
  -APR_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p,
  -				     const ap_array_header_t *arr,
  +APR_EXPORT(char *) apr_array_pstrcat(struct apr_pool_t *p,
  +				     const apr_array_header_t *arr,
   				     const char sep);
  -APR_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts);
  -APR_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t);
  -APR_EXPORT(void) ap_clear_table(ap_table_t *t);
  -APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key);
  -APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
  +APR_EXPORT(apr_table_t *) apr_make_table(struct apr_pool_t *p, int nelts);
  +APR_EXPORT(apr_table_t *) apr_copy_table(struct apr_pool_t *p, const apr_table_t *t);
  +APR_EXPORT(void) apr_clear_table(apr_table_t *t);
  +APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key);
  +APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key,
   			       const char *val);
  -APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key,
   				const char *val);
  -APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key);
  -APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key);
  +APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key,
   				 const char *val);
  -APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key,
   				  const char *val);
  -APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key,
   			       const char *val);
  -APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key,
   				const char *val);
  -APR_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p,
  -					     const ap_table_t *overlay,
  -					     const ap_table_t *base);
  +APR_EXPORT(apr_table_t *) apr_overlay_tables(struct apr_pool_t *p,
  +					     const apr_table_t *overlay,
  +					     const apr_table_t *base);
   APR_EXPORT(void)
  -	ap_table_do(int (*comp) (void *, const char *, const char *),
  -		     void *rec, const ap_table_t *t, ...);
  +	apr_table_do(int (*comp) (void *, const char *, const char *),
  +		     void *rec, const apr_table_t *t, ...);
   APR_EXPORT(void)
  -        ap_table_vdo(int (*comp) (void *, const char *, const char *),
  -                     void *rec, const ap_table_t *t, va_list);                  
  +        apr_table_vdo(int (*comp) (void *, const char *, const char *),
  +                     void *rec, const apr_table_t *t, va_list);                  
   
  -/* Conceptually, ap_overlap_tables does this:
  +/* Conceptually, apr_overlap_tables does this:
   
  -    ap_array_header_t *barr = ap_table_elts(b);
  -    ap_table_entry_t *belt = (ap_table_entry_t *)barr->elts;
  +    apr_array_header_t *barr = ap_table_elts(b);
  +    apr_table_entry_t *belt = (apr_table_entry_t *)barr->elts;
       int i;
   
       for (i = 0; i < barr->nelts; ++i) {
           if (flags & ap_OVERLAP_TABLES_MERGE) {
  -            ap_table_mergen(a, belt[i].key, belt[i].val);
  +            apr_table_mergen(a, belt[i].key, belt[i].val);
           }
           else {
  -            ap_table_setn(a, belt[i].key, belt[i].val);
  +            apr_table_setn(a, belt[i].key, belt[i].val);
           }
       }
   
  @@ -195,7 +195,7 @@
   */
   #define AP_OVERLAP_TABLES_SET   (0)
   #define AP_OVERLAP_TABLES_MERGE (1)
  -APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
  +APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
   				    unsigned flags);
   
   #ifdef __cplusplus
  
  
  
  1.41      +75 -75    apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr_thread_proc.h	2000/07/23 17:51:11	1.40
  +++ apr_thread_proc.h	2000/08/02 05:26:08	1.41
  @@ -71,8 +71,8 @@
    * @package APR Thread library
    */
   
  -typedef enum {APR_SHELLCMD, APR_PROGRAM} ap_cmdtype_e;
  -typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e;
  +typedef enum {APR_SHELLCMD, APR_PROGRAM} apr_cmdtype_e;
  +typedef enum {APR_WAIT, APR_NOWAIT} apr_wait_how_e;
   
   #define APR_NO_PIPE          0
   #define APR_FULL_BLOCK       1
  @@ -99,23 +99,23 @@
                                              * us knowing ... buggy os? */
   #endif /* APR_HAS_OTHER_CHILD */
   
  -typedef struct ap_proc_t {
  +typedef struct apr_proc_t {
       pid_t pid;
  -    ap_file_t *in;          /* Parent's side of pipe to child's stdin */
  -    ap_file_t *out;         /* Parent's side of pipe to child's stdout */
  -    ap_file_t *err;         /* Parent's side of pipe to child's stdouterr */
  -} ap_proc_t;
  -
  -typedef struct ap_thread_t           ap_thread_t;
  -typedef struct ap_threadattr_t       ap_threadattr_t;
  -typedef struct ap_procattr_t         ap_procattr_t;
  +    apr_file_t *in;          /* Parent's side of pipe to child's stdin */
  +    apr_file_t *out;         /* Parent's side of pipe to child's stdout */
  +    apr_file_t *err;         /* Parent's side of pipe to child's stdouterr */
  +} apr_proc_t;
  +
  +typedef struct apr_thread_t           apr_thread_t;
  +typedef struct apr_threadattr_t       apr_threadattr_t;
  +typedef struct apr_procattr_t         apr_procattr_t;
   
  -typedef struct ap_threadkey_t        ap_threadkey_t;
  +typedef struct apr_threadkey_t        apr_threadkey_t;
   #if APR_HAS_OTHER_CHILD
  -typedef struct ap_other_child_rec_t  ap_other_child_rec_t;
  +typedef struct apr_other_child_rec_t  apr_other_child_rec_t;
   #endif /* APR_HAS_OTHER_CHILD */
   
  -typedef void *(APR_THREAD_FUNC *ap_thread_start_t)(void *);
  +typedef void *(APR_THREAD_FUNC *apr_thread_start_t)(void *);
   
   /* Thread Function definitions */
   
  @@ -124,20 +124,20 @@
    * @param new_attr The newly created threadattr.
    * @param cont The pool to use
    */
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new_attr, ap_pool_t *cont);
  +apr_status_t apr_create_threadattr(apr_threadattr_t **new_attr, apr_pool_t *cont);
   
   /**
    * Set if newly created threads should be created in detach mode.
    * @param attr The threadattr to affect 
    * @param on Thread detach state on or off
    */
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on);
  +apr_status_t apr_setthreadattr_detach(apr_threadattr_t *attr, apr_int32_t on);
   
   /**
    * Get the detach mode for this threadattr.
    * @param attr The threadattr to reference 
    */
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr);
  +apr_status_t apr_getthreadattr_detach(apr_threadattr_t *attr);
   
   /**
    * Create a new thread of execution
  @@ -147,29 +147,29 @@
    * @param data Any data to be passed to the starting function
    * @param cont The pool to use
    */
  -ap_status_t ap_create_thread(ap_thread_t **new_thread, ap_threadattr_t *attr, 
  -                             ap_thread_start_t func, void *data, 
  -                             ap_pool_t *cont);
  +apr_status_t apr_create_thread(apr_thread_t **new_thread, apr_threadattr_t *attr, 
  +                             apr_thread_start_t func, void *data, 
  +                             apr_pool_t *cont);
   
   /**
    * stop the current thread
    * @param thd The thread to stop
    * @param retval The return value to pass back to any thread that cares
    */
  -ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval);
  +apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval);
   
   /**
    * block until the desired thread stops executing.
    * @param retval The return value from the dead thread.
    * @param thd The thread to join
    */
  -ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd); 
  +apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd); 
   
   /**
    * detach a thread
    * @param thd The thread to detach 
    */
  -ap_status_t ap_thread_detach(ap_thread_t *thd);
  +apr_status_t apr_thread_detach(apr_thread_t *thd);
   
   /**
    * Return the pool associated with the current thread.
  @@ -177,7 +177,7 @@
    * @param key The key to associate with the data
    * @param thread The currently open thread.
    */
  -ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread);
  +apr_status_t apr_get_threaddata(void **data, const char *key, apr_thread_t *thread);
   
   /**
    * Return the pool associated with the current thread.
  @@ -186,9 +186,9 @@
    * @param cleanup The cleanup routine to use when the thread is destroyed.
    * @param thread The currently open thread.
    */
  -ap_status_t ap_set_threaddata(void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *), 
  -                              ap_thread_t *thread);
  +apr_status_t apr_set_threaddata(void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *), 
  +                              apr_thread_t *thread);
   
   /**
    * Create and initialize a new thread private address space
  @@ -196,28 +196,28 @@
    * @param dest The destructor to use when freeing the private memory.
    * @param cont The pool to use
    */
  -ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *),
  -                                     ap_pool_t *cont);
  +apr_status_t apr_create_thread_private(apr_threadkey_t **key, void (*dest)(void *),
  +                                     apr_pool_t *cont);
   
   /**
    * Get a pointer to the thread private memory
    * @param new_mem The data stored in private memory 
    * @param key The handle for the desired thread private memory 
    */
  -ap_status_t ap_get_thread_private(void **new_mem, ap_threadkey_t *key);
  +apr_status_t apr_get_thread_private(void **new_mem, apr_threadkey_t *key);
   
   /**
    * Set the data to be stored in thread private memory
    * @param priv The data to be stored in private memory 
    * @param key The handle for the desired thread private memory 
    */
  -ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key);
  +apr_status_t apr_set_thread_private(void *priv, apr_threadkey_t *key);
   
   /**
    * Free the thread private memory
    * @param key The handle for the desired thread private memory 
    */
  -ap_status_t ap_delete_thread_private(ap_threadkey_t *key);
  +apr_status_t apr_delete_thread_private(apr_threadkey_t *key);
   
   /**
    * Return the pool associated with the current threadkey.
  @@ -225,7 +225,7 @@
    * @param key The key associated with the data
    * @param threadkey The currently open threadkey.
    */
  -ap_status_t ap_get_threadkeydata(void **data, const char *key, ap_threadkey_t *threadkey);
  +apr_status_t apr_get_threadkeydata(void **data, const char *key, apr_threadkey_t *threadkey);
   
   /**
    * Return the pool associated with the current threadkey.
  @@ -234,9 +234,9 @@
    * @param cleanup The cleanup routine to use when the file is destroyed.
    * @param threadkey The currently open threadkey.
    */
  -ap_status_t ap_set_threadkeydata(void *data, const char *key,
  -                                 ap_status_t (*cleanup) (void *), 
  -                                 ap_threadkey_t *threadkey);
  +apr_status_t apr_set_threadkeydata(void *data, const char *key,
  +                                 apr_status_t (*cleanup) (void *), 
  +                                 apr_threadkey_t *threadkey);
   
   /* Process Function definitions */
   
  @@ -249,7 +249,7 @@
    * @param new_attr The newly created procattr. 
    * @param cont The pool to use
    */
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new_attr, ap_pool_t *cont);
  +apr_status_t apr_createprocattr_init(apr_procattr_t **new_attr, apr_pool_t *cont);
   
   /**
    * Determine if any of stdin, stdout, or stderr should be linked to pipes 
  @@ -259,14 +259,14 @@
    * @param out Should stdout be a pipe back to the parent?
    * @param err Should stderr be a pipe back to the parent?
    */
  -ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  -                              ap_int32_t out, ap_int32_t err);
  +apr_status_t apr_setprocattr_io(apr_procattr_t *attr, apr_int32_t in, 
  +                              apr_int32_t out, apr_int32_t err);
   
   /**
  - * Set the child_in and/or parent_in values to existing ap_file_t values.
  + * Set the child_in and/or parent_in values to existing apr_file_t values.
    * @param attr The procattr we care about. 
  - * @param child_in ap_file_t value to use as child_in. Must be a valid file.
  - * @param parent_in ap_file_t value to use as parent_in. Must be a valid file.
  + * @param child_in apr_file_t value to use as child_in. Must be a valid file.
  + * @param parent_in apr_file_t value to use as parent_in. Must be a valid file.
    * @tip  This is NOT a required initializer function. This is
    *       useful if you have already opened a pipe (or multiple files)
    *       that you wish to use, perhaps persistently across mutiple
  @@ -274,36 +274,36 @@
    *       extra function calls by not creating your own pipe since this
    *       creates one in the process space for you.
    */
  -ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in,
  -                                   ap_file_t *parent_in);
  +apr_status_t apr_setprocattr_childin(struct apr_procattr_t *attr, apr_file_t *child_in,
  +                                   apr_file_t *parent_in);
   
   /**
  - * Set the child_out and parent_out values to existing ap_file_t values.
  + * Set the child_out and parent_out values to existing apr_file_t values.
    * @param attr The procattr we care about. 
  - * @param child_out ap_file_t value to use as child_out. Must be a valid file.
  - * @param parent_out ap_file_t value to use as parent_out. Must be a valid file.
  + * @param child_out apr_file_t value to use as child_out. Must be a valid file.
  + * @param parent_out apr_file_t value to use as parent_out. Must be a valid file.
    * @tip This is NOT a required initializer function. This is
    *      useful if you have already opened a pipe (or multiple files)
    *      that you wish to use, perhaps persistently across mutiple
    *      process invocations - such as a log file. 
    */
  -ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, 
  -                                    ap_file_t *child_out, 
  -                                    ap_file_t *parent_out);
  +apr_status_t apr_setprocattr_childout(struct apr_procattr_t *attr, 
  +                                    apr_file_t *child_out, 
  +                                    apr_file_t *parent_out);
   
   /**
  - * Set the child_err and parent_err values to existing ap_file_t values.
  + * Set the child_err and parent_err values to existing apr_file_t values.
    * @param attr The procattr we care about. 
  - * @param child_err ap_file_t value to use as child_err. Must be a valid file.
  - * @param parent_err ap_file_t value to use as parent_err. Must be a valid file.
  + * @param child_err apr_file_t value to use as child_err. Must be a valid file.
  + * @param parent_err apr_file_t value to use as parent_err. Must be a valid file.
    * @tip This is NOT a required initializer function. This is
    *      useful if you have already opened a pipe (or multiple files)
    *      that you wish to use, perhaps persistently across mutiple
    *      process invocations - such as a log file. 
    */
  -ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, 
  -                                    ap_file_t *child_err,
  -                                    ap_file_t *parent_err);
  +apr_status_t apr_setprocattr_childerr(struct apr_procattr_t *attr, 
  +                                    apr_file_t *child_err,
  +                                    apr_file_t *parent_err);
   
   /**
    * Set which directory the child process should start executing in.
  @@ -312,7 +312,7 @@
    *            the parent currently resides in, when the createprocess call
    *            is made. 
    */
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir);
  +apr_status_t apr_setprocattr_dir(apr_procattr_t *attr, const char *dir);
   
   /**
    * Set what type of command the child process will call.
  @@ -323,14 +323,14 @@
    *            APR_PROGRAM  --  Executable program   (default) 
    * </PRE>
    */
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd);
  +apr_status_t apr_setprocattr_cmdtype(apr_procattr_t *attr, apr_cmdtype_e cmd);
   
   /**
    * Determine if the chlid should start in detached state.
    * @param attr The procattr we care about. 
    * @param detach Should the child start in detached state?  Default is no. 
    */
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach);
  +apr_status_t apr_setprocattr_detach(apr_procattr_t *attr, apr_int32_t detach);
   
   #if APR_HAVE_STRUCT_RLIMIT
   /**
  @@ -344,7 +344,7 @@
    * </PRE>
    * @param limit Value to set the limit to.
    */
  -ap_status_t ap_setprocattr_limit(ap_procattr_t *attr, ap_int32_t what, 
  +apr_status_t apr_setprocattr_limit(apr_procattr_t *attr, apr_int32_t what, 
                                 struct rlimit *limit);
   #endif
   
  @@ -355,7 +355,7 @@
    * @param proc The resulting process handle. 
    * @param cont The pool to use. 
    */
  -ap_status_t ap_fork(ap_proc_t *proc, ap_pool_t *cont);
  +apr_status_t apr_fork(apr_proc_t *proc, apr_pool_t *cont);
   #endif
   
   /**
  @@ -364,15 +364,15 @@
    * @param progname The program to run 
    * @param const_args the arguments to pass to the new program.  The first 
    *                   one should be the program name.
  - * @param env The new environment ap_table_t for the new process.  This 
  + * @param env The new environment apr_table_t for the new process.  This 
    *            should be a list of NULL-terminated strings.
    * @param attr the procattr we should use to determine how to create the new
    *         process
    * @param cont The pool to use. 
    */
  -ap_status_t ap_create_process(ap_proc_t *new_proc, const char *progname, 
  +apr_status_t apr_create_process(apr_proc_t *new_proc, const char *progname, 
                                 char *const args[], char **env, 
  -                              ap_procattr_t *attr, ap_pool_t *cont);
  +                              apr_procattr_t *attr, apr_pool_t *cont);
   
   /**
    * Wait for a child process to die
  @@ -389,7 +389,7 @@
    *            APR_CHILD_NOTDONE  -- child is still running.
    * </PRE>
    */
  -ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e waithow);
  +apr_status_t apr_wait_proc(apr_proc_t *proc, apr_wait_how_e waithow);
   
   
   /**
  @@ -409,13 +409,13 @@
    * @param p Pool to allocate child information out of.
    */
   
  -ap_status_t ap_wait_all_procs(ap_proc_t *proc, ap_wait_t *status, 
  -                              ap_wait_how_e waithow, ap_pool_t *p);
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status, 
  +                              apr_wait_how_e waithow, apr_pool_t *p);
   
   /**
    * Detach the process from the controlling terminal.
    */
  -ap_status_t ap_detach(void);
  +apr_status_t apr_detach(void);
   
   #if APR_HAS_OTHER_CHILD
   /**
  @@ -430,9 +430,9 @@
    *                 OC_REASON_UNWRITABLE.
    * @param p The pool to use for allocating memory.
    */
  -void ap_register_other_child(ap_proc_t *pid, 
  +void apr_register_other_child(apr_proc_t *pid, 
                                void (*maintenance) (int reason, void *, int status),
  -                             void *data, ap_file_t *write_fd, ap_pool_t *p);
  +                             void *data, apr_file_t *write_fd, apr_pool_t *p);
   
   /**
    * Stop watching the specified process.
  @@ -443,7 +443,7 @@
    *      themself by loading ocr->next before calling any maintenance 
    *      function.
    */
  -void ap_unregister_other_child(void *data);
  +void apr_unregister_other_child(void *data);
   
   /**
    * Check on the specified process.  If it is gone, call the maintenance 
  @@ -451,19 +451,19 @@
    * @param pid The process to check.
    * @param status The status to pass to the maintenance function.
    */
  -ap_status_t ap_reap_other_child(ap_proc_t *pid, int status); 
  +apr_status_t apr_reap_other_child(apr_proc_t *pid, int status); 
   
   /**
    * Loop through all registered other_children and call the appropriate 
    * maintenance function when necessary.
    */
  -void ap_check_other_child(void); 
  +void apr_check_other_child(void); 
   
   /**
    * Ensure all the registered write_fds are still writable, otherwise 
    * invoke the maintenance functions as appropriate.
    */
  -void ap_probe_writable_fds(void);
  +void apr_probe_writable_fds(void);
   #endif /* APR_HAS_OTHER_CHILD */
   
   /** 
  @@ -471,7 +471,7 @@
    * @param proc The process to terminate.
    * @param sig How to kill the process.
    */
  -ap_status_t ap_kill(ap_proc_t *proc, int sig);
  +apr_status_t apr_kill(apr_proc_t *proc, int sig);
   #ifdef __cplusplus
   }
   #endif
  
  
  
  1.24      +26 -26    apache-2.0/src/lib/apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_time.h	2000/07/23 18:00:19	1.23
  +++ apr_time.h	2000/08/02 05:26:08	1.24
  @@ -70,10 +70,10 @@
   APR_VAR_IMPORT const char ap_day_snames[7][4];
   
   /* number of microseconds since 00:00:00 january 1, 1970 UTC */
  -typedef ap_int64_t ap_time_t;
  +typedef apr_int64_t apr_time_t;
   
   /* intervals for I/O timeouts, in microseconds */
  -typedef ap_int32_t ap_interval_time_t;
  +typedef apr_int32_t apr_interval_time_t;
   
   #ifdef WIN32
   #define AP_USEC_PER_SEC ((LONGLONG) 1000000)
  @@ -90,46 +90,46 @@
   /**
    * return the current time
    */
  -ap_time_t ap_now(void);
  +apr_time_t apr_now(void);
   
   /* a structure similar to ANSI struct tm with the following differences:
      - tm_usec isn't an ANSI field
      - tm_gmtoff isn't an ANSI field (it's a bsdism)
   */
   typedef struct {
  -    ap_int32_t tm_usec;	/* microseconds past tm_sec */
  -    ap_int32_t tm_sec;	/* (0-61) seconds past tm_min */
  -    ap_int32_t tm_min;  /* (0-59) minutes past tm_hour */
  -    ap_int32_t tm_hour; /* (0-23) hours past midnight */
  -    ap_int32_t tm_mday; /* (1-31) day of the month */
  -    ap_int32_t tm_mon;  /* (0-11) month of the year */
  -    ap_int32_t tm_year; /* year since 1900 */
  -    ap_int32_t tm_wday; /* (0-6) days since sunday */
  -    ap_int32_t tm_yday; /* (0-365) days since jan 1 */
  -    ap_int32_t tm_isdst; /* daylight saving time */
  -    ap_int32_t tm_gmtoff; /* seconds east of UTC */
  +    apr_int32_t tm_usec;	/* microseconds past tm_sec */
  +    apr_int32_t tm_sec;	/* (0-61) seconds past tm_min */
  +    apr_int32_t tm_min;  /* (0-59) minutes past tm_hour */
  +    apr_int32_t tm_hour; /* (0-23) hours past midnight */
  +    apr_int32_t tm_mday; /* (1-31) day of the month */
  +    apr_int32_t tm_mon;  /* (0-11) month of the year */
  +    apr_int32_t tm_year; /* year since 1900 */
  +    apr_int32_t tm_wday; /* (0-6) days since sunday */
  +    apr_int32_t tm_yday; /* (0-365) days since jan 1 */
  +    apr_int32_t tm_isdst; /* daylight saving time */
  +    apr_int32_t tm_gmtoff; /* seconds east of UTC */
   } ap_exploded_time_t;
   
   /**
  - * convert an ansi time_t to an ap_time_t
  - * @param result the resulting ap_time_t
  + * convert an ansi time_t to an apr_time_t
  + * @param result the resulting apr_time_t
    * @param input the time_t to convert
    */
  -ap_status_t ap_ansi_time_to_ap_time(ap_time_t *result, time_t input);
  +apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input);
   
   /**
    * convert a time to its human readable components in GMT timezone
    * @param result the exploded time
    * @param input the time to explode
    */
  -ap_status_t ap_explode_gmt(ap_exploded_time_t *result, ap_time_t input);
  +apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input);
   
   /**
    * convert a time to its human readable components in local timezone
    * @param result the exploded time
    * @param input the time to explode
    */
  -ap_status_t ap_explode_localtime(ap_exploded_time_t *result, ap_time_t input);
  +apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input);
   
   /**
    * Convert time value from human readable format to number of seconds 
  @@ -137,36 +137,36 @@
    * @param result the resulting imploded time
    * @param input the input exploded time
    */
  -ap_status_t ap_implode_time(ap_time_t *result, ap_exploded_time_t *input);
  +apr_status_t apr_implode_time(apr_time_t *result, ap_exploded_time_t *input);
   
   /**
    * Sleep for the specified number of micro-seconds.
    * @param t desired amount of time to sleep.
    * @tip May sleep for longer than the specified time. 
    */
  -void ap_sleep(ap_interval_time_t t);
  +void apr_sleep(apr_interval_time_t t);
   
   #define AP_RFC822_DATE_LEN (30)
   /**
  - * ap_rfc822_date formats dates in the RFC822
  + * apr_rfc822_date formats dates in the RFC822
    * format in an efficient manner.  it is a fixed length
    * format and requires the indicated amount of storage
    * including trailing \0
    * @param date_str String to write to.
    * @param t the time to convert 
    */
  -ap_status_t ap_rfc822_date(char *date_str, ap_time_t t);
  +apr_status_t apr_rfc822_date(char *date_str, apr_time_t t);
   
   #define AP_CTIME_LEN (25)
   /**
  - * ap_ctime formats dates in the ctime() format
  + * apr_ctime formats dates in the ctime() format
    * in an efficient manner.  it is a fixed length format
    * and requires the indicated amount of storage
    * including trailing \0 
    * @param date_str String to write to.
    * @param t the time to convert 
    */
  -ap_status_t ap_ctime(char *date_str, ap_time_t t);
  +apr_status_t apr_ctime(char *date_str, apr_time_t t);
   
   /**
    * formats the exploded time according to the format specified
  @@ -176,7 +176,7 @@
    * @param format The format for the time string
    * @param tm The time to convert
    */
  -ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max, const char *format, ap_exploded_time_t *tm);
  +apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, const char *format, ap_exploded_time_t *tm);
   
   #ifdef __cplusplus
   }
  
  
  
  1.6       +11 -11    apache-2.0/src/lib/apr/include/apr_xlate.h
  
  Index: apr_xlate.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_xlate.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_xlate.h	2000/07/23 18:07:18	1.5
  +++ apr_xlate.h	2000/08/02 05:26:08	1.6
  @@ -77,7 +77,7 @@
   
   #if ! APR_HAS_XLATE
   
  -typedef void                         ap_xlate_t;
  +typedef void                         apr_xlate_t;
   
   /* For platforms where we don't bother with translating between charsets,
    * these are macros which always return failure.
  @@ -102,7 +102,7 @@
   
   #else  /* ! APR_HAS_XLATE */
   
  -typedef struct ap_xlate_t            ap_xlate_t;
  +typedef struct apr_xlate_t            apr_xlate_t;
   
   /**
    * Set up for converting text from one charset to another.
  @@ -125,8 +125,8 @@
    *  names to indicate the charset of the current locale.
    * </PRE>
    */
  -ap_status_t ap_xlate_open(ap_xlate_t **convset, const char *topage, 
  -                          const char *frompage, ap_pool_t *pool);
  +apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage, 
  +                          const char *frompage, apr_pool_t *pool);
   
   #define APR_DEFAULT_CHARSET (const char *)0
   #define APR_LOCALE_CHARSET (const char *)1
  @@ -138,7 +138,7 @@
    * @param onoff Output: whether or not the conversion is single-byte-only
    */
   
  -ap_status_t ap_xlate_get_sb(ap_xlate_t *convset, int *onoff);
  +apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff);
   
   /**
    * Convert a buffer of text from one codepage to another.
  @@ -151,9 +151,9 @@
    * @param outbytes_left Input: the size of the output buffer
    *                      Output: the amount of the output buffer not yet used
    */
  -ap_status_t ap_xlate_conv_buffer(ap_xlate_t *convset, const char *inbuf, 
  -                              ap_size_t *inbytes_left, char *outbuf,
  -                              ap_size_t *outbytes_left);
  +apr_status_t ap_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, 
  +                              apr_size_t *inbytes_left, char *outbuf,
  +                              apr_size_t *outbytes_left);
   
   /**
    * The purpose of ap_xlate_conv_char is to translate one character
  @@ -164,7 +164,7 @@
    * @param inchar The character to convert
    * @param outchar The converted character
    */
  -ap_status_t ap_xlate_conv_char(ap_xlate_t *convset, char inchar, char outchar);
  +apr_status_t ap_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar);
   
   /**
    * Convert a single-byte character from one charset to another.
  @@ -174,13 +174,13 @@
    * @tip This only works when converting between single-byte character sets.
           -1 will be returned if the conversion can't be performed.
   */
  -ap_int32_t ap_xlate_conv_byte(ap_xlate_t *convset, unsigned char inchar);
  +apr_int32_t ap_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar);
   
   /**
    * Close a codepage translation handle.
    * @param convset The codepage translation handle to close
    */
  -ap_status_t ap_xlate_close(ap_xlate_t *convset);
  +apr_status_t ap_xlate_close(apr_xlate_t *convset);
   
   #endif  /* ! APR_HAS_XLATE */
   
  
  
  
  1.66      +86 -86    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.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- apr_pools.c	2000/07/26 01:56:00	1.65
  +++ apr_pools.c	2000/08/02 05:26:18	1.66
  @@ -102,7 +102,7 @@
   /* Details of the debugging options can now be found in the developer
    * section of the documentaion. */
   
  -/* magic numbers --- min free bytes to consider a free ap_pool_t block useable,
  +/* magic numbers --- min free bytes to consider a free apr_pool_t block useable,
    * and the min amount to allocate if we have to go to malloc() */
   
   #ifndef BLOCK_MINFREE
  @@ -166,7 +166,7 @@
   	char *first_avail;
   #ifdef POOL_DEBUG
   	union block_hdr *global_next;
  -	ap_pool_t *owning_pool;
  +	apr_pool_t *owning_pool;
   #endif /* POOL_DEBUG */
       } h;
   };
  @@ -188,15 +188,15 @@
   static union block_hdr *block_freelist = NULL;
   
   #if APR_HAS_THREADS
  -static ap_lock_t *alloc_mutex;
  -static ap_lock_t *spawn_mutex;
  +static apr_lock_t *alloc_mutex;
  +static apr_lock_t *spawn_mutex;
   #endif
   
   #ifdef POOL_DEBUG
   static char *known_stack_point;
   static int stack_direction;
   static union block_hdr *global_block_list;
  -#define FREE_POOL	((ap_pool_t *)(-1))
  +#define FREE_POOL	((apr_pool_t *)(-1))
   #endif /* POOL_DEBUG */
   
   #ifdef ALLOC_STATS
  @@ -322,7 +322,7 @@
       }
   
   #if APR_HAS_THREADS
  -    ap_lock(alloc_mutex);
  +    apr_lock(alloc_mutex);
   #endif
       old_free_list = block_freelist;
       block_freelist = blok;
  @@ -372,7 +372,7 @@
   #endif /* ALLOC_STATS */
   
   #if APR_HAS_THREADS
  -    ap_unlock(alloc_mutex);
  +    apr_unlock(alloc_mutex);
   #endif /* APR_HAS_THREADS */
   #endif /* ALLOC_USE_MALLOC */
   }
  @@ -417,9 +417,9 @@
   
   /* Accounting */
   
  -static ap_size_t bytes_in_block_list(union block_hdr *blok)
  +static apr_size_t bytes_in_block_list(union block_hdr *blok)
   {
  -    ap_size_t size = 0;
  +    apr_size_t size = 0;
   
       while (blok) {
   	size += blok->h.endp - (char *) (blok + 1);
  @@ -444,7 +444,7 @@
   static void run_cleanups(struct cleanup *c);
   static void free_proc_chain(struct process_chain *p);
   
  -static ap_pool_t *permanent_pool;
  +static apr_pool_t *permanent_pool;
   
   /* Each pool structure is allocated in the start of its own first block,
    * so we need to know how many bytes that is (once properly aligned...).
  @@ -453,27 +453,27 @@
    * gets taken off the parent's sub-pool list...
    */
   
  -#define POOL_HDR_CLICKS (1 + ((sizeof(struct ap_pool_t) - 1) / CLICK_SZ))
  +#define POOL_HDR_CLICKS (1 + ((sizeof(struct apr_pool_t) - 1) / CLICK_SZ))
   #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
   
  -APR_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode))
  +APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode))
   {
       union block_hdr *blok;
  -    ap_pool_t *new_pool;
  +    apr_pool_t *new_pool;
   
   
   #if APR_HAS_THREADS
  -    ap_lock(alloc_mutex);
  +    apr_lock(alloc_mutex);
   #endif
   
       blok = new_block(POOL_HDR_BYTES, apr_abort);
  -    new_pool = (ap_pool_t *) blok->h.first_avail;
  +    new_pool = (apr_pool_t *) blok->h.first_avail;
       blok->h.first_avail += POOL_HDR_BYTES;
   #ifdef POOL_DEBUG
       blok->h.owning_pool = new_pool;
   #endif
   
  -    memset((char *) new_pool, '\0', sizeof(struct ap_pool_t));
  +    memset((char *) new_pool, '\0', sizeof(struct apr_pool_t));
       new_pool->free_first_avail = blok->h.first_avail;
       new_pool->first = new_pool->last = blok;
   
  @@ -490,7 +490,7 @@
       }
   
   #if APR_HAS_THREADS
  -    ap_unlock(alloc_mutex);
  +    apr_unlock(alloc_mutex);
   #endif
   
       return new_pool;
  @@ -532,19 +532,19 @@
   
   struct cleanup {
       const void *data;
  -    ap_status_t (*plain_cleanup) (void *);
  -    ap_status_t (*child_cleanup) (void *);
  +    apr_status_t (*plain_cleanup) (void *);
  +    apr_status_t (*child_cleanup) (void *);
       struct cleanup *next;
   };
   
  -APR_EXPORT(void) ap_register_cleanup(ap_pool_t *p, const void *data,
  -				      ap_status_t (*plain_cleanup) (void *),
  -				      ap_status_t (*child_cleanup) (void *))
  +APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data,
  +				      apr_status_t (*plain_cleanup) (void *),
  +				      apr_status_t (*child_cleanup) (void *))
   {
       struct cleanup *c;
   
       if (p != NULL) {
  -        c = (struct cleanup *) ap_palloc(p, sizeof(struct cleanup));
  +        c = (struct cleanup *) apr_palloc(p, sizeof(struct cleanup));
           c->data = data;
           c->plain_cleanup = plain_cleanup;
           c->child_cleanup = child_cleanup;
  @@ -553,8 +553,8 @@
       }
   }
   
  -APR_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, const void *data,
  -                                 ap_status_t (*cleanup) (void *))
  +APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data,
  +                                 apr_status_t (*cleanup) (void *))
   {
       struct cleanup *c;
       struct cleanup **lastp;
  @@ -574,10 +574,10 @@
       }
   }
   
  -APR_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data,
  -                                       ap_status_t (*cleanup) (void *))
  +APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data,
  +                                       apr_status_t (*cleanup) (void *))
   {
  -    ap_kill_cleanup(p, data, cleanup);
  +    apr_kill_cleanup(p, data, cleanup);
       return (*cleanup) (data);
   }
   
  @@ -597,7 +597,7 @@
       }
   }
   
  -static void cleanup_pool_for_exec(ap_pool_t *p)
  +static void cleanup_pool_for_exec(apr_pool_t *p)
   {
       run_child_cleanups(p->cleanups);
       p->cleanups = NULL;
  @@ -607,7 +607,7 @@
       }
   }
   
  -APR_EXPORT(void) ap_cleanup_for_exec(void)
  +APR_EXPORT(void) apr_cleanup_for_exec(void)
   {
   #if !defined(WIN32) && !defined(OS2)
       /*
  @@ -623,16 +623,16 @@
   #endif /* ndef WIN32 */
   }
   
  -APR_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data)
  +APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data)
   {
       /* do nothing cleanup routine */
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_init_alloc(void)
  +apr_status_t apr_init_alloc(void)
   {
   #if APR_HAS_THREADS
  -    ap_status_t status;
  +    apr_status_t status;
   #endif
   #ifdef POOL_DEBUG
       char s;
  @@ -641,16 +641,16 @@
       stack_var_init(&s);
   #endif
   #if APR_HAS_THREADS
  -    status = ap_create_lock(&alloc_mutex, APR_MUTEX, APR_INTRAPROCESS,
  +    status = apr_create_lock(&alloc_mutex, APR_MUTEX, APR_INTRAPROCESS,
                      NULL, NULL);
       if (status != APR_SUCCESS) {
  -        ap_destroy_lock(alloc_mutex); 
  +        apr_destroy_lock(alloc_mutex); 
           return status;
       }
  -    status = ap_create_lock(&spawn_mutex, APR_MUTEX, APR_INTRAPROCESS,
  +    status = apr_create_lock(&spawn_mutex, APR_MUTEX, APR_INTRAPROCESS,
                      NULL, NULL);
       if (status != APR_SUCCESS) {
  -        ap_destroy_lock(spawn_mutex); 
  +        apr_destroy_lock(spawn_mutex); 
           return status;
       }
   #endif
  @@ -662,24 +662,24 @@
       return APR_SUCCESS;
   }
   
  -void ap_term_alloc(void)
  +void apr_term_alloc(void)
   {
   #if APR_HAS_THREADS
  -    ap_destroy_lock(alloc_mutex);
  -    ap_destroy_lock(spawn_mutex);
  +    apr_destroy_lock(alloc_mutex);
  +    apr_destroy_lock(spawn_mutex);
   #endif
   }
   
  -/* We only want to lock the mutex if we are being called from ap_clear_pool.
  +/* We only want to lock the mutex if we are being called from apr_clear_pool.
    * This is because if we also call this function from ap_destroy_real_pool,
    * which also locks the same mutex, and recursive locks aren't portable.  
    * This way, we are garaunteed that we only lock this mutex once when calling
    * either one of these functions.
    */
  -APR_EXPORT(void) ap_clear_pool(ap_pool_t *a)
  +APR_EXPORT(void) apr_clear_pool(apr_pool_t *a)
   {
       while (a->sub_pools) {
  -	ap_destroy_pool(a->sub_pools);
  +	apr_destroy_pool(a->sub_pools);
       }
       /*
        * Don't hold the mutex during cleanups.
  @@ -711,11 +711,11 @@
   #endif
   }
   
  -APR_EXPORT(void) ap_destroy_pool(ap_pool_t *a)
  +APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a)
   {
  -    ap_clear_pool(a);
  +    apr_clear_pool(a);
   #if APR_HAS_THREADS
  -    ap_lock(alloc_mutex);
  +    apr_lock(alloc_mutex);
   #endif
   
       if (a->parent) {
  @@ -730,16 +730,16 @@
   	}
       }
   #if APR_HAS_THREADS
  -    ap_unlock(alloc_mutex);
  +    apr_unlock(alloc_mutex);
   #endif
       free_blocks(a->first);
   }
   
  -APR_EXPORT(ap_size_t) ap_bytes_in_pool(ap_pool_t *p)
  +APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p)
   {
       return bytes_in_block_list(p->first);
   }
  -APR_EXPORT(ap_size_t) ap_bytes_in_free_blocks(void)
  +APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void)
   {
       return bytes_in_block_list(block_freelist);
   }
  @@ -762,7 +762,7 @@
   /* Find the pool that ts belongs to, return NULL if it doesn't
    * belong to any pool.
    */
  -APR_EXPORT(ap_pool_t *) ap_find_pool(const void *ts)
  +APR_EXPORT(apr_pool_t *) ap_find_pool(const void *ts)
   {
       const char *s = ts;
       union block_hdr **pb;
  @@ -808,7 +808,7 @@
   /* return TRUE iff a is an ancestor of b
    * NULL is considered an ancestor of all pools
    */
  -APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b)
  +APR_EXPORT(int) ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
   {
       if (a == NULL) {
   	return 1;
  @@ -830,7 +830,7 @@
    * instead.  This is a guarantee by the caller that sub will not
    * be destroyed before p is.
    */
  -APR_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub)
  +APR_EXPORT(void) ap_pool_join(apr_pool_t *p, apr_pool_t *sub)
   {
       union block_hdr *b;
   
  @@ -857,10 +857,10 @@
    * Allocating stuff...
    */
   
  -void * ap_palloc(ap_pool_t *a, ap_size_t reqsize)
  +void * apr_palloc(apr_pool_t *a, apr_size_t reqsize)
   {
   #ifdef ALLOC_USE_MALLOC
  -    ap_size_t size = reqsize + CLICK_SZ;
  +    apr_size_t size = reqsize + CLICK_SZ;
       void *ptr;
   
       if (a == NULL) {
  @@ -884,8 +884,8 @@
        * Round up requested size to an even number of alignment units
        * (core clicks)
        */
  -    ap_size_t nclicks;
  -    ap_size_t size;
  +    apr_size_t nclicks;
  +    apr_size_t size;
   
       /* First, see if we have space in the block most recently
        * allocated to this pool
  @@ -919,7 +919,7 @@
   
       if (new_first_avail <= blok->h.endp) {
   	debug_verify_filled(first_avail, blok->h.endp,
  -			    "[ap_palloc] Ouch!  Someone trounced past the end "
  +			    "[apr_palloc] Ouch!  Someone trounced past the end "
   			    "of their allocation!\n");
   	blok->h.first_avail = new_first_avail;
   	return (void *) first_avail;
  @@ -928,7 +928,7 @@
       /* Nope --- get a new one that's guaranteed to be big enough */
   
   #if APR_HAS_THREADS
  -    ap_lock(alloc_mutex);
  +    apr_lock(alloc_mutex);
   #endif
   
       blok = new_block(size, a->apr_abort);
  @@ -939,7 +939,7 @@
   #endif
   
   #if APR_HAS_THREADS
  -    ap_unlock(alloc_mutex);
  +    apr_unlock(alloc_mutex);
   #endif
   
       first_avail = blok->h.first_avail;
  @@ -949,29 +949,29 @@
   #endif
   }
   
  -APR_EXPORT(void *) ap_pcalloc(ap_pool_t *a, ap_size_t size)
  +APR_EXPORT(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size)
   {
  -    void *res = ap_palloc(a, size);
  +    void *res = apr_palloc(a, size);
       memset(res, '\0', size);
       return res;
   }
   
   /*
  - * ap_psprintf is implemented by writing directly into the current
  + * apr_psprintf is implemented by writing directly into the current
    * block of the pool, starting right at first_avail.  If there's
    * insufficient room, then a new block is allocated and the earlier
    * output is copied over.  The new block isn't linked into the pool
    * until all the output is done.
    *
    * Note that this is completely safe because nothing else can
  - * allocate in this ap_pool_t while ap_psprintf is running.  alarms are
  + * allocate in this apr_pool_t while apr_psprintf is running.  alarms are
    * blocked, and the only thing outside of alloc.c that's invoked
  - * is ap_vformatter -- which was purposefully written to be
  + * is apr_vformatter -- which was purposefully written to be
    * self-contained with no callouts.
    */
   
   struct psprintf_data {
  -    ap_vformatter_buff_t vbuff;
  +    apr_vformatter_buff_t vbuff;
   #ifdef ALLOC_USE_MALLOC
       char *base;
   #else
  @@ -980,11 +980,11 @@
   #endif
   };
   
  -static int psprintf_flush(ap_vformatter_buff_t *vbuff)
  +static int psprintf_flush(apr_vformatter_buff_t *vbuff)
   {
       struct psprintf_data *ps = (struct psprintf_data *)vbuff;
   #ifdef ALLOC_USE_MALLOC
  -    ap_size_t size;
  +    apr_size_t size;
       char *ptr;
   
       size = (char *)ps->vbuff.curpos - ps->base;
  @@ -1000,7 +1000,7 @@
   #else
       union block_hdr *blok;
       union block_hdr *nblok;
  -    ap_size_t cur_len;
  +    apr_size_t cur_len;
       char *strp;
   
       blok = ps->blok;
  @@ -1009,11 +1009,11 @@
   
       /* must try another blok */
   #if APR_HAS_THREADS
  -    ap_lock(alloc_mutex);
  +    apr_lock(alloc_mutex);
   #endif
       nblok = new_block(2 * cur_len, NULL);
   #if APR_HAS_THREADS
  -    ap_unlock(alloc_mutex);
  +    apr_unlock(alloc_mutex);
   #endif
       memcpy(nblok->h.first_avail, blok->h.first_avail, cur_len);
       ps->vbuff.curpos = nblok->h.first_avail + cur_len;
  @@ -1024,12 +1024,12 @@
       if (ps->got_a_new_block) {
   	debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
   #if APR_HAS_THREADS
  -        ap_lock(alloc_mutex);
  +        apr_lock(alloc_mutex);
   #endif
   	blok->h.next = block_freelist;
   	block_freelist = blok;
   #if APR_HAS_THREADS
  -        ap_unlock(alloc_mutex);
  +        apr_unlock(alloc_mutex);
   #endif
       }
       ps->blok = nblok;
  @@ -1042,7 +1042,7 @@
   #endif
   }
   
  -APR_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap)
  +APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap)
   {
   #ifdef ALLOC_USE_MALLOC
       struct psprintf_data ps;
  @@ -1056,7 +1056,7 @@
       /* need room at beginning for allocation_list */
       ps.vbuff.curpos = ps.base + CLICK_SZ;
       ps.vbuff.endpos = ps.base + 511;
  -    ap_vformatter(psprintf_flush, &ps.vbuff, fmt, ap);
  +    apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap);
       *ps.vbuff.curpos++ = '\0';
       ptr = ps.base;
       /* shrink */
  @@ -1071,14 +1071,14 @@
   #else
       struct psprintf_data ps;
       char *strp;
  -    ap_size_t size;
  +    apr_size_t size;
   
       ps.blok = p->last;
       ps.vbuff.curpos = ps.blok->h.first_avail;
       ps.vbuff.endpos = ps.blok->h.endp - 1;	/* save one for NUL */
       ps.got_a_new_block = 0;
   
  -    ap_vformatter(psprintf_flush, &ps.vbuff, fmt, ap);
  +    apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap);
   
       strp = ps.vbuff.curpos;
       *strp++ = '\0';
  @@ -1101,13 +1101,13 @@
   #endif
   }
   
  -APR_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...)
  +APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
   {
       va_list ap;
       char *res;
   
       va_start(ap, fmt);
  -    res = ap_pvsprintf(p, fmt, ap);
  +    res = apr_pvsprintf(p, fmt, ap);
       va_end(ap);
       return res;
   }
  @@ -1124,11 +1124,11 @@
    * generic interface, but for now, it's a special case
    */
   
  -APR_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid,
  +APR_EXPORT(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid,
                                       enum kill_conditions how)
   {
       struct process_chain *new =
  -    (struct process_chain *) ap_palloc(a, sizeof(struct process_chain));
  +    (struct process_chain *) apr_palloc(a, sizeof(struct process_chain));
   
       new->pid = pid;
       new->kill_how = how;
  @@ -1159,7 +1159,7 @@
   #ifndef NEED_WAITPID
       /* Pick up all defunct processes */
       for (p = procs; p; p = p->next) {
  -        if (ap_wait_proc(p->pid, APR_NOWAIT) == APR_CHILD_DONE) {
  +        if (apr_wait_proc(p->pid, APR_NOWAIT) == APR_CHILD_DONE) {
               p->kill_how = kill_never;
           }
       }
  @@ -1170,20 +1170,20 @@
               || (p->kill_how == kill_only_once)) {
               /*
                * Subprocess may be dead already.  Only need the timeout if not.
  -             * Note: ap_kill on Windows is TerminateProcess(), which is 
  +             * Note: apr_kill on Windows is TerminateProcess(), which is 
                * similar to a SIGKILL, so always give the process a timeout
                * under Windows before killing it.
                */
   #ifdef WIN32
               need_timeout = 1;
   #else
  -	    if (ap_kill(p->pid, APR_SIGTERM) == APR_SUCCESS) {
  +	    if (apr_kill(p->pid, APR_SIGTERM) == APR_SUCCESS) {
   		need_timeout = 1;
   	    }
   #endif
   	}
   	else if (p->kill_how == kill_always) {
  -	    ap_kill(p->pid, APR_SIGKILL);
  +	    apr_kill(p->pid, APR_SIGKILL);
   	}
       }
   
  @@ -1198,7 +1198,7 @@
        */
       for (p = procs; p; p = p->next) {
   	if (p->kill_how == kill_after_timeout) {
  -	    ap_kill(p->pid, APR_SIGKILL);
  +	    apr_kill(p->pid, APR_SIGKILL);
   	}
       }
   #ifdef WIN32
  @@ -1215,7 +1215,7 @@
       /* Now wait for all the signaled processes to die */
       for (p = procs; p; p = p->next) {
   	if (p->kill_how != kill_never) {
  -	    (void) ap_wait_proc(p->pid, APR_WAIT);
  +	    (void) apr_wait_proc(p->pid, APR_WAIT);
   	}
       }
   }
  
  
  
  1.11      +1 -1      apache-2.0/src/lib/apr/lib/apr_signal.c
  
  Index: apr_signal.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_signal.c	2000/06/22 16:05:32	1.10
  +++ apr_signal.c	2000/08/02 05:26:18	1.11
  @@ -64,7 +64,7 @@
    * from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
    * (the version that does not automatically restart system calls).
    */
  -Sigfunc *ap_signal(int signo, Sigfunc * func)
  +Sigfunc *apr_signal(int signo, Sigfunc * func)
   {
       struct sigaction act, oact;
   
  
  
  
  1.15      +13 -13    apache-2.0/src/lib/apr/locks/beos/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- crossproc.c	2000/06/17 11:32:37	1.14
  +++ crossproc.c	2000/08/02 05:26:19	1.15
  @@ -54,9 +54,9 @@
   
   #include "locks.h"
   
  -ap_status_t lock_inter_cleanup(void * data)
  +apr_status_t lock_inter_cleanup(void * data)
   {
  -    ap_lock_t *lock = (ap_lock_t*)data;
  +    apr_lock_t *lock = (apr_lock_t*)data;
       if (lock->curr_locked == 1) {
       	if (atomic_add(&lock->ben_interproc , -1) > 1){
               release_sem (lock->sem_interproc);
  @@ -66,12 +66,12 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(ap_lock_t *new)
  +apr_status_t create_inter_lock(apr_lock_t *new)
   {
       int32 stat;
       
  -    new->sem_interproc = (sem_id)ap_palloc(new->cntxt, sizeof(sem_id));
  -    new->ben_interproc = (int32)ap_palloc(new->cntxt, sizeof(int32));
  +    new->sem_interproc = (sem_id)apr_palloc(new->cntxt, sizeof(sem_id));
  +    new->ben_interproc = (int32)apr_palloc(new->cntxt, sizeof(int32));
   
       if ((stat = create_sem(0, "ap_interproc")) < B_NO_ERROR) {
           lock_inter_cleanup(new);
  @@ -80,12 +80,12 @@
       new->ben_interproc = 0;
       new->curr_locked = 0;
       new->sem_interproc = stat;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_inter_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_inter_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(ap_lock_t *lock)
  +apr_status_t lock_inter(apr_lock_t *lock)
   {
       int32 stat;
       
  @@ -99,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(ap_lock_t *lock)
  +apr_status_t unlock_inter(apr_lock_t *lock)
   {
       int32 stat;
       
  @@ -113,17 +113,17 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(ap_lock_t *lock)
  +apr_status_t destroy_inter_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_inter_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_inter_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_inter_cleanup);
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t child_init_lock(ap_lock_t **lock, ap_pool_t *cont, const char *fname)
  +apr_status_t child_init_lock(apr_lock_t **lock, apr_pool_t *cont, const char *fname)
   {
       return APR_SUCCESS;
   }
  
  
  
  1.11      +12 -12    apache-2.0/src/lib/apr/locks/beos/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/intraproc.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- intraproc.c	2000/04/03 19:44:46	1.10
  +++ intraproc.c	2000/08/02 05:26:19	1.11
  @@ -54,9 +54,9 @@
   
   #include "locks.h"
   
  -ap_status_t lock_intra_cleanup(void *data)
  +apr_status_t lock_intra_cleanup(void *data)
   {
  -    ap_lock_t *lock = (ap_lock_t *)data;
  +    apr_lock_t *lock = (apr_lock_t *)data;
       if (lock->curr_locked == 1) {
       	if (atomic_add(&lock->ben_intraproc , -1) > 1){
               release_sem (lock->sem_intraproc);
  @@ -68,11 +68,11 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_intra_lock(ap_lock_t *new)
  +apr_status_t create_intra_lock(apr_lock_t *new)
   {
       int32 stat;
  -    new->sem_intraproc = (sem_id)ap_palloc(new->cntxt, sizeof(sem_id));
  -    new->ben_intraproc = (int32)ap_palloc(new->cntxt, sizeof(int32));
  +    new->sem_intraproc = (sem_id)apr_palloc(new->cntxt, sizeof(sem_id));
  +    new->ben_intraproc = (int32)apr_palloc(new->cntxt, sizeof(int32));
       
       
       if ((stat = create_sem(0, "ap_intraproc")) < B_NO_ERROR){
  @@ -82,12 +82,12 @@
       new->ben_intraproc = 0;
       new->sem_intraproc = stat;
       new->curr_locked = 0;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_intra(ap_lock_t *lock)
  +apr_status_t lock_intra(apr_lock_t *lock)
   {
       int32 stat;
       
  @@ -101,7 +101,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_intra(ap_lock_t *lock)
  +apr_status_t unlock_intra(apr_lock_t *lock)
   {
       int32 stat;
       
  @@ -115,11 +115,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_intra_lock(ap_lock_t *lock)
  +apr_status_t destroy_intra_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
           return APR_SUCCESS;
       }
       return stat;
  
  
  
  1.19      +21 -21    apache-2.0/src/lib/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- locks.c	2000/07/08 11:31:46	1.18
  +++ locks.c	2000/08/02 05:26:19	1.19
  @@ -54,14 +54,14 @@
   
   #include "locks.h"
   
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, const char *fname, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
  +                           apr_lockscope_e scope, const char *fname, 
  +                           apr_pool_t *cont)
   {
  -    ap_lock_t *new;
  -    ap_status_t stat;
  +    apr_lock_t *new;
  +    apr_status_t stat;
       
  -    new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    new = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
       if (new == NULL){
           return APR_ENOMEM;
       }
  @@ -69,7 +69,7 @@
       new->cntxt = cont;
       new->type  = type;
       new->scope = scope;
  -    new->fname = ap_pstrdup(cont, fname);
  +    new->fname = apr_pstrdup(cont, fname);
   
       if (scope != APR_CROSS_PROCESS) {
           if ((stat = create_intra_lock(new)) != APR_SUCCESS) {
  @@ -85,9 +85,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_lock(ap_lock_t *lock)
  +apr_status_t apr_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       
       if (lock->scope != APR_CROSS_PROCESS) {
           if ((stat = lock_intra(lock)) != APR_SUCCESS) {
  @@ -102,9 +102,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unlock(ap_lock_t *lock)
  +apr_status_t apr_unlock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if (lock->scope != APR_CROSS_PROCESS) {
           if ((stat = unlock_intra(lock)) != APR_SUCCESS) {
               return stat;
  @@ -118,9 +118,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_destroy_lock(ap_lock_t *lock)
  +apr_status_t apr_destroy_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat; 
  +    apr_status_t stat; 
       if (lock->scope != APR_CROSS_PROCESS) {
           if ((stat = destroy_intra_lock(lock)) != APR_SUCCESS) {
               return stat;
  @@ -134,10 +134,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
  -			       ap_pool_t *cont)
  +apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
  +			       apr_pool_t *cont)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((*lock)->scope != APR_CROSS_PROCESS) {
           if ((stat = child_init_lock(lock, cont, fname)) != APR_SUCCESS) {
               return stat;
  @@ -146,14 +146,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
  +apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, lock->cntxt);
  +    return apr_get_userdata(data, key, lock->cntxt);
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, lock->cntxt);
  +    return apr_set_userdata(data, key, cleanup, lock->cntxt);
   }
   
  
  
  
  1.9       +13 -13    apache-2.0/src/lib/apr/locks/beos/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- locks.h	2000/06/17 11:32:37	1.8
  +++ locks.h	2000/08/02 05:26:19	1.9
  @@ -61,10 +61,10 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -struct ap_lock_t {
  -    ap_pool_t *cntxt;
  -    ap_locktype_e type;
  -    ap_lockscope_e scope;
  +struct apr_lock_t {
  +    apr_pool_t *cntxt;
  +    apr_locktype_e type;
  +    apr_lockscope_e scope;
       int curr_locked;
       char *fname;
   	/* Inter proc */
  @@ -75,17 +75,17 @@
       int32  ben_intraproc;
   };
   
  -ap_status_t create_intra_lock(struct ap_lock_t *new);
  -ap_status_t lock_intra(struct ap_lock_t *lock);
  -ap_status_t unlock_intra(struct ap_lock_t *lock);
  -ap_status_t destroy_intra_lock(struct ap_lock_t *lock);
  +apr_status_t create_intra_lock(struct apr_lock_t *new);
  +apr_status_t lock_intra(struct apr_lock_t *lock);
  +apr_status_t unlock_intra(struct apr_lock_t *lock);
  +apr_status_t destroy_intra_lock(struct apr_lock_t *lock);
   
  -ap_status_t create_inter_lock(struct ap_lock_t *new);
  -ap_status_t lock_inter(struct ap_lock_t *lock);
  -ap_status_t unlock_inter(struct ap_lock_t *lock);
  -ap_status_t destroy_inter_lock(struct ap_lock_t *lock);
  +apr_status_t create_inter_lock(struct apr_lock_t *new);
  +apr_status_t lock_inter(struct apr_lock_t *lock);
  +apr_status_t unlock_inter(struct apr_lock_t *lock);
  +apr_status_t destroy_inter_lock(struct apr_lock_t *lock);
   
  -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_pool_t *cont, 
  +apr_status_t child_init_lock(struct apr_lock_t **lock, apr_pool_t *cont, 
                               const char *fname);
   
   
  
  
  
  1.18      +19 -19    apache-2.0/src/lib/apr/locks/os2/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- locks.c	2000/04/28 18:27:41	1.17
  +++ locks.c	2000/08/02 05:26:20	1.18
  @@ -69,54 +69,54 @@
   
   
   
  -static ap_status_t lock_cleanup(void *thelock)
  +static apr_status_t lock_cleanup(void *thelock)
   {
  -    ap_lock_t *lock = thelock;
  -    return ap_destroy_lock(lock);
  +    apr_lock_t *lock = thelock;
  +    return apr_destroy_lock(lock);
   }
   
   
   
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, 
  -			   const char *fname, ap_pool_t *cont)
  +apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, 
  +			   const char *fname, apr_pool_t *cont)
   {
  -    ap_lock_t *new;
  +    apr_lock_t *new;
       ULONG rc;
       char *semname;
       PIB *ppib;
   
  -    new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    new = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
       new->cntxt = cont;
       new->type  = type;
       new->scope = scope;
       new->owner = 0;
       new->lock_count = 0;
  -    new->fname = ap_pstrdup(cont, fname);
  +    new->fname = apr_pstrdup(cont, fname);
       DosGetInfoBlocks(&(new->tib), &ppib);
   
       if (fname == NULL)
           semname = NULL;
       else
  -        semname = ap_pstrcat(cont, "/SEM32/", fname, NULL);
  +        semname = apr_pstrcat(cont, "/SEM32/", fname, NULL);
   
       rc = DosCreateMutexSem(semname, &(new->hMutex), scope == APR_CROSS_PROCESS ? DC_SEM_SHARED : 0, FALSE);
       *lock = new;
   
       if (!rc)
  -        ap_register_cleanup(cont, new, lock_cleanup, ap_null_cleanup);
  +        apr_register_cleanup(cont, new, lock_cleanup, apr_null_cleanup);
   
       return APR_OS2_STATUS(rc);
   }
   
   
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
  -			       ap_pool_t *cont)
  +apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname,
  +			       apr_pool_t *cont)
   {
       int rc;
       PIB *ppib;
   
  -    *lock = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    *lock = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
   
       if (lock == NULL)
           return APR_ENOMEM;
  @@ -127,14 +127,14 @@
       rc = DosOpenMutexSem( (char *)fname, &(*lock)->hMutex );
   
       if (!rc)
  -        ap_register_cleanup(cont, *lock, lock_cleanup, ap_null_cleanup);
  +        apr_register_cleanup(cont, *lock, lock_cleanup, apr_null_cleanup);
   
       return APR_OS2_STATUS(rc);
   }
   
   
   
  -ap_status_t ap_lock(ap_lock_t *lock)
  +apr_status_t apr_lock(apr_lock_t *lock)
   {
       ULONG rc;
       
  @@ -150,7 +150,7 @@
   
   
   
  -ap_status_t ap_unlock(ap_lock_t *lock)
  +apr_status_t apr_unlock(apr_lock_t *lock)
   {
       ULONG rc;
       
  @@ -165,14 +165,14 @@
   
   
   
  -ap_status_t ap_destroy_lock(ap_lock_t *lock)
  +apr_status_t apr_destroy_lock(apr_lock_t *lock)
   {
       ULONG rc;
  -    ap_status_t stat = APR_SUCCESS;
  +    apr_status_t stat = APR_SUCCESS;
   
       if (lock->owner == CurrentTid) {
           while (lock->lock_count > 0 && stat == APR_SUCCESS)
  -            stat = ap_unlock(lock);
  +            stat = apr_unlock(lock);
       }
   
       if (stat != APR_SUCCESS)
  
  
  
  1.8       +4 -4      apache-2.0/src/lib/apr/locks/os2/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- locks.h	2000/04/14 15:58:30	1.7
  +++ locks.h	2000/08/02 05:26:20	1.8
  @@ -60,10 +60,10 @@
   #define INCL_DOS
   #include <os2.h>
   
  -struct ap_lock_t {
  -    ap_pool_t *cntxt;
  -    ap_locktype_e type;
  -    ap_lockscope_e scope;
  +struct apr_lock_t {
  +    apr_pool_t *cntxt;
  +    apr_locktype_e type;
  +    apr_lockscope_e scope;
       char *fname;
       HMTX hMutex;
       TID owner;
  
  
  
  1.37      +56 -56    apache-2.0/src/lib/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- crossproc.c	2000/07/21 20:24:27	1.36
  +++ crossproc.c	2000/08/02 05:26:20	1.37
  @@ -61,7 +61,7 @@
   static struct sembuf op_on;
   static struct sembuf op_off;
   
  -void ap_unix_setup_lock(void)
  +void apr_unix_setup_lock(void)
   {
       op_on.sem_num = 0;
       op_on.sem_op = -1;
  @@ -71,9 +71,9 @@
       op_off.sem_flg = SEM_UNDO;
   }
   
  -static ap_status_t lock_cleanup(void *lock_)
  +static apr_status_t lock_cleanup(void *lock_)
   {
  -    ap_lock_t *lock=lock_;
  +    apr_lock_t *lock=lock_;
       union semun ick;
       
       if (lock->interproc != -1) {
  @@ -83,7 +83,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_unix_create_inter_lock(ap_lock_t *new)
  +apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
   {
       union semun ick;
       
  @@ -99,11 +99,11 @@
           return errno;
       }
       new->curr_locked = 0;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_lock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_lock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -117,7 +117,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_unlock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_unlock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -131,32 +131,32 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
  +apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, const char *fname)
  +apr_status_t apr_unix_child_init_lock(apr_lock_t **lock, apr_pool_t *cont, const char *fname)
   {
       return APR_SUCCESS;
   }
   
   #elif (APR_USE_PROC_PTHREAD_SERIALIZE)  
   
  -void ap_unix_setup_lock(void)
  +void apr_unix_setup_lock(void)
   {
   }
   
  -static ap_status_t lock_cleanup(void *lock_)
  +static apr_status_t lock_cleanup(void *lock_)
   {
  -    ap_lock_t *lock=lock_;
  -    ap_status_t stat;
  +    apr_lock_t *lock=lock_;
  +    apr_status_t stat;
   
       if (lock->curr_locked == 1) {
           if ((stat = pthread_mutex_unlock(lock->interproc))) {
  @@ -172,9 +172,9 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_unix_create_inter_lock(ap_lock_t *new)
  +apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       int fd;
       pthread_mutexattr_t mattr;
   
  @@ -222,13 +222,13 @@
       }
   
       new->curr_locked = 0;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_lock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_lock_inter(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if ((stat = pthread_mutex_lock(lock->interproc))) {
   #ifdef PTHREAD_SETS_ERRNO
  @@ -240,9 +240,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_unlock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_unlock_inter(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if ((stat = pthread_mutex_unlock(lock->interproc))) {
   #ifdef PTHREAD_SETS_ERRNO
  @@ -254,17 +254,17 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
  +apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, const char *fname)
  +apr_status_t apr_unix_child_init_lock(apr_lock_t **lock, apr_pool_t *cont, const char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -274,7 +274,7 @@
   static struct flock lock_it;
   static struct flock unlock_it;
   
  -void ap_unix_setup_lock(void)
  +void apr_unix_setup_lock(void)
   {
       lock_it.l_whence = SEEK_SET;        /* from current point */
       lock_it.l_start = 0;                /* -"- */
  @@ -288,23 +288,23 @@
       unlock_it.l_pid = 0;                /* pid not actually interesting */
   }
   
  -static ap_status_t lock_cleanup(void *lock_)
  +static apr_status_t lock_cleanup(void *lock_)
   {
  -    ap_lock_t *lock=lock_;
  +    apr_lock_t *lock=lock_;
   
       if (lock->curr_locked == 1) {
  -        return ap_unix_unlock_inter(lock);
  +        return apr_unix_unlock_inter(lock);
       }
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_unix_create_inter_lock(ap_lock_t *new)
  +apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
   {
       if (new->fname) {
           new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0644);
       }
       else {
  -        new->fname = ap_pstrdup(new->cntxt, "/tmp/aprXXXXXX"); 
  +        new->fname = apr_pstrdup(new->cntxt, "/tmp/aprXXXXXX"); 
           new->interproc = mkstemp(new->fname);
       }
   
  @@ -315,11 +315,11 @@
   
       new->curr_locked=0;
       unlink(new->fname);
  -    ap_register_cleanup(new->cntxt, new, lock_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, new, lock_cleanup, apr_null_cleanup);
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_unix_lock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_lock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -333,7 +333,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_unlock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_unlock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -347,17 +347,17 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
  +apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, 
  +apr_status_t apr_unix_child_init_lock(apr_lock_t **lock, apr_pool_t *cont, 
                                       const char *fname)
   {
       return APR_SUCCESS;
  @@ -365,28 +365,28 @@
   
   #elif (APR_USE_FLOCK_SERIALIZE)
   
  -void ap_unix_setup_lock(void)
  +void apr_unix_setup_lock(void)
   {
   }
   
  -static ap_status_t lock_cleanup(void *lock_)
  +static apr_status_t lock_cleanup(void *lock_)
   {
  -    ap_lock_t *lock=lock_;
  +    apr_lock_t *lock=lock_;
   
       if (lock->curr_locked == 1) {
  -        return ap_unix_unlock_inter(lock);
  +        return apr_unix_unlock_inter(lock);
       }
       unlink(lock->fname);
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_unix_create_inter_lock(ap_lock_t *new)
  +apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
   {
       if (new->fname) {
           new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
       }
       else {
  -        new->fname = ap_pstrdup(new->cntxt, "/tmp/aprXXXXXX"); 
  +        new->fname = apr_pstrdup(new->cntxt, "/tmp/aprXXXXXX"); 
           new->interproc = mkstemp(new->fname);
       }
   
  @@ -395,11 +395,11 @@
           return errno;
       }
       new->curr_locked = 0;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_cleanup, ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_lock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_lock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -413,7 +413,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_unlock_inter(ap_lock_t *lock)
  +apr_status_t apr_unix_unlock_inter(apr_lock_t *lock)
   {
       int rc;
   
  @@ -427,27 +427,27 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
  +apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
           return APR_SUCCESS;
       }
       return stat;
   }
   
  -ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, 
  +apr_status_t apr_unix_child_init_lock(apr_lock_t **lock, apr_pool_t *cont, 
                               const char *fname)
   {
  -    ap_lock_t *new;
  +    apr_lock_t *new;
   
  -    new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    new = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
   
  -    new->fname = ap_pstrdup(cont, fname);
  +    new->fname = apr_pstrdup(cont, fname);
       new->interproc = open(new->fname, O_WRONLY, 0600);
       if (new->interproc == -1) {
  -        ap_unix_destroy_inter_lock(new);
  +        apr_unix_destroy_inter_lock(new);
           return errno;
       }
       *lock = new;
  
  
  
  1.17      +15 -15    apache-2.0/src/lib/apr/locks/unix/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/intraproc.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- intraproc.c	2000/07/31 15:38:55	1.16
  +++ intraproc.c	2000/08/02 05:26:20	1.17
  @@ -58,10 +58,10 @@
   
   #if (APR_USE_PTHREAD_SERIALIZE)  
   
  -static ap_status_t lock_intra_cleanup(void *data)
  +static apr_status_t lock_intra_cleanup(void *data)
   {
  -    ap_lock_t *lock = (ap_lock_t *) data;
  -    ap_status_t stat;
  +    apr_lock_t *lock = (apr_lock_t *) data;
  +    apr_status_t stat;
   
       stat = pthread_mutex_unlock(lock->intraproc);
   #ifdef PTHREAD_SETS_ERRNO
  @@ -72,12 +72,12 @@
       return stat;
   }    
   
  -ap_status_t ap_unix_create_intra_lock(ap_lock_t *new)
  +apr_status_t apr_unix_create_intra_lock(apr_lock_t *new)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       pthread_mutexattr_t mattr;
   
  -    new->intraproc = (pthread_mutex_t *)ap_palloc(new->cntxt, 
  +    new->intraproc = (pthread_mutex_t *)apr_palloc(new->cntxt, 
                                 sizeof(pthread_mutex_t));
       if (new->intraproc == NULL ) {
           return errno;
  @@ -107,14 +107,14 @@
       }
   
       new->curr_locked = 0;
  -    ap_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
  -                        ap_null_cleanup);
  +    apr_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
  +                        apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unix_lock_intra(ap_lock_t *lock)
  +apr_status_t apr_unix_lock_intra(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       stat = pthread_mutex_lock(lock->intraproc);
   #ifdef PTHREAD_SETS_ERRNO
  @@ -125,9 +125,9 @@
       return stat;
   }
   
  -ap_status_t ap_unix_unlock_intra(ap_lock_t *lock)
  +apr_status_t apr_unix_unlock_intra(apr_lock_t *lock)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   
       status = pthread_mutex_unlock(lock->intraproc);
   #ifdef PTHREAD_SETS_ERRNO
  @@ -138,11 +138,11 @@
       return status;
   }
   
  -ap_status_t ap_unix_destroy_intra_lock(ap_lock_t *lock)
  +apr_status_t apr_unix_destroy_intra_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
  -        ap_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
  +        apr_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
           return APR_SUCCESS;
       }
       return stat;
  
  
  
  1.39      +34 -34    apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- locks.c	2000/07/21 19:50:43	1.38
  +++ locks.c	2000/08/02 05:26:21	1.39
  @@ -56,14 +56,14 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, const char *fname, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
  +                           apr_lockscope_e scope, const char *fname, 
  +                           apr_pool_t *cont)
   {
  -    ap_lock_t *new;
  -    ap_status_t stat;
  +    apr_lock_t *new;
  +    apr_status_t stat;
   
  -    new = (ap_lock_t *)ap_pcalloc(cont, sizeof(ap_lock_t));
  +    new = (apr_lock_t *)apr_pcalloc(cont, sizeof(apr_lock_t));
   
       new->cntxt = cont;
       new->type  = type;
  @@ -72,14 +72,14 @@
       /* file-based serialization primitives */
       if (scope != APR_INTRAPROCESS) {
           if (fname != NULL) {
  -            new->fname = ap_pstrdup(cont, fname);
  +            new->fname = apr_pstrdup(cont, fname);
           }
       }
   #endif
   
       if (scope != APR_CROSS_PROCESS) {
   #if APR_HAS_THREADS
  -        if ((stat = ap_unix_create_intra_lock(new)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_create_intra_lock(new)) != APR_SUCCESS) {
               return stat;
           }
   #else
  @@ -87,7 +87,7 @@
   #endif
       }
       if (scope != APR_INTRAPROCESS) {
  -        if ((stat = ap_unix_create_inter_lock(new)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_create_inter_lock(new)) != APR_SUCCESS) {
               return stat;
           }
       }
  @@ -95,12 +95,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_lock(ap_lock_t *lock)
  +apr_status_t apr_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if (lock->scope != APR_CROSS_PROCESS) {
   #if APR_HAS_THREADS
  -        if ((stat = ap_unix_lock_intra(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_lock_intra(lock)) != APR_SUCCESS) {
               return stat;
           }
   #else
  @@ -108,20 +108,20 @@
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  -        if ((stat = ap_unix_lock_inter(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_lock_inter(lock)) != APR_SUCCESS) {
               return stat;
           }
       }
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_unlock(ap_lock_t *lock)
  +apr_status_t apr_unlock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if (lock->scope != APR_CROSS_PROCESS) {
   #if APR_HAS_THREADS
  -        if ((stat = ap_unix_unlock_intra(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_unlock_intra(lock)) != APR_SUCCESS) {
               return stat;
           }
   #else
  @@ -129,19 +129,19 @@
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  -        if ((stat = ap_unix_unlock_inter(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_unlock_inter(lock)) != APR_SUCCESS) {
               return stat;
           }
       }
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_destroy_lock(ap_lock_t *lock)
  +apr_status_t apr_destroy_lock(apr_lock_t *lock)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if (lock->scope != APR_CROSS_PROCESS) {
   #if APR_HAS_THREADS
  -        if ((stat = ap_unix_destroy_intra_lock(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_destroy_intra_lock(lock)) != APR_SUCCESS) {
               return stat;
           }
   #else
  @@ -149,37 +149,37 @@
   #endif
       }
       if (lock->scope != APR_INTRAPROCESS) {
  -        if ((stat = ap_unix_destroy_inter_lock(lock)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_destroy_inter_lock(lock)) != APR_SUCCESS) {
               return stat;
           }
       }
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
  -                               ap_pool_t *cont)
  +apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
  +                               apr_pool_t *cont)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((*lock)->scope != APR_INTRAPROCESS) {
  -        if ((stat = ap_unix_child_init_lock(lock, cont, fname)) != APR_SUCCESS) {
  +        if ((stat = apr_unix_child_init_lock(lock, cont, fname)) != APR_SUCCESS) {
               return stat;
           }
       }
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
  +apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, lock->cntxt);
  +    return apr_get_userdata(data, key, lock->cntxt);
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, lock->cntxt);
  +    return apr_set_userdata(data, key, cleanup, lock->cntxt);
   }
   
  -ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock)
  +apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
   {
       oslock->crossproc = lock->interproc;
   #if APR_HAS_THREADS
  @@ -191,14 +191,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
  +                           apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*lock) == NULL) {
  -        (*lock) = (ap_lock_t *)ap_pcalloc(cont, sizeof(ap_lock_t));
  +        (*lock) = (apr_lock_t *)apr_pcalloc(cont, sizeof(apr_lock_t));
           (*lock)->cntxt = cont;
       }
       (*lock)->interproc = thelock->crossproc;
  
  
  
  1.23      +14 -14    apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- locks.h	2000/06/22 00:36:00	1.22
  +++ locks.h	2000/08/02 05:26:21	1.23
  @@ -112,10 +112,10 @@
   };
   #endif
   
  -struct ap_lock_t {
  -    ap_pool_t *cntxt;
  -    ap_locktype_e type;
  -    ap_lockscope_e scope;
  +struct apr_lock_t {
  +    apr_pool_t *cntxt;
  +    apr_locktype_e type;
  +    apr_lockscope_e scope;
       int curr_locked;
       char *fname;
   #if APR_USE_SYSVSEM_SERIALIZE
  @@ -142,19 +142,19 @@
   };
   
   #if APR_HAS_THREADS
  -ap_status_t ap_unix_create_intra_lock(struct ap_lock_t *new);
  -ap_status_t ap_unix_lock_intra(struct ap_lock_t *lock);
  -ap_status_t ap_unix_unlock_intra(struct ap_lock_t *lock);
  -ap_status_t ap_unix_destroy_intra_lock(struct ap_lock_t *lock);
  +apr_status_t apr_unix_create_intra_lock(struct apr_lock_t *new);
  +apr_status_t apr_unix_lock_intra(struct apr_lock_t *lock);
  +apr_status_t apr_unix_unlock_intra(struct apr_lock_t *lock);
  +apr_status_t apr_unix_destroy_intra_lock(struct apr_lock_t *lock);
   #endif
   
  -void ap_unix_setup_lock(void);
  -ap_status_t ap_unix_create_inter_lock(struct ap_lock_t *new);
  -ap_status_t ap_unix_lock_inter(struct ap_lock_t *lock);
  -ap_status_t ap_unix_unlock_inter(struct ap_lock_t *lock);
  -ap_status_t ap_unix_destroy_inter_lock(struct ap_lock_t *lock);
  +void apr_unix_setup_lock(void);
  +apr_status_t apr_unix_create_inter_lock(struct apr_lock_t *new);
  +apr_status_t apr_unix_lock_inter(struct apr_lock_t *lock);
  +apr_status_t apr_unix_unlock_inter(struct apr_lock_t *lock);
  +apr_status_t apr_unix_destroy_inter_lock(struct apr_lock_t *lock);
   
  -ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_pool_t *cont, 
  +apr_status_t apr_unix_child_init_lock(struct apr_lock_t **lock, apr_pool_t *cont, 
                               const char *fname);
   
   #endif  /* LOCKS_H */
  
  
  
  1.30      +22 -22    apache-2.0/src/lib/apr/locks/win32/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- locks.c	2000/07/25 00:42:13	1.29
  +++ locks.c	2000/08/02 05:26:22	1.30
  @@ -57,20 +57,20 @@
   #include "locks.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  -                           ap_lockscope_e scope, const char *fname, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
  +                           apr_lockscope_e scope, const char *fname, 
  +                           apr_pool_t *cont)
   {
  -    ap_lock_t *newlock;
  +    apr_lock_t *newlock;
       SECURITY_ATTRIBUTES sec;
   
  -    newlock = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    newlock = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
   
       newlock->cntxt = cont;
       /* ToDo:  How to handle the case when no context is available? 
       *         How to cleanup the storage properly?
       */
  -    newlock->fname = ap_pstrdup(cont, fname);
  +    newlock->fname = apr_pstrdup(cont, fname);
       newlock->type = type;
       newlock->scope = scope;
       sec.nLength = sizeof(SECURITY_ATTRIBUTES);
  @@ -92,18 +92,18 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
  -                               ap_pool_t *cont)
  +apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
  +                               apr_pool_t *cont)
   {
       /* This routine should not be called (and OpenMutex will fail if called) 
        * on a INTRAPROCESS lock
        */
  -    (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +    (*lock) = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
   
       if ((*lock) == NULL) {
           return APR_ENOMEM;
       }
  -    (*lock)->fname = ap_pstrdup(cont, fname);
  +    (*lock)->fname = apr_pstrdup(cont, fname);
       (*lock)->mutex = OpenMutex(MUTEX_ALL_ACCESS, TRUE, fname);
       
       if ((*lock)->mutex == NULL) {
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_lock(ap_lock_t *lock)
  +apr_status_t apr_lock(apr_lock_t *lock)
   {
       DWORD rv;
       if (lock->scope == APR_INTRAPROCESS) {
  @@ -128,7 +128,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_unlock(ap_lock_t *lock)
  +apr_status_t apr_unlock(apr_lock_t *lock)
   {
       if (lock->scope == APR_INTRAPROCESS) {
           LeaveCriticalSection(&lock->section);
  @@ -141,7 +141,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_destroy_lock(ap_lock_t *lock)
  +apr_status_t apr_destroy_lock(apr_lock_t *lock)
   {
       if (lock->scope == APR_INTRAPROCESS) {
           DeleteCriticalSection(&lock->section);
  @@ -154,31 +154,31 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(ap_lock_t *lock, const char *key, void *data)
  +apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, lock->cntxt);
  +    return apr_get_userdata(data, key, lock->cntxt);
   }
   
  -ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, lock->cntxt);
  +    return apr_set_userdata(data, key, cleanup, lock->cntxt);
   }
   
  -ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, ap_lock_t *lock)
  +apr_status_t apr_get_os_lock(apr_os_lock_t *thelock, apr_lock_t *lock)
   {
       *thelock = lock->mutex;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
  +                           apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*lock) == NULL) {
  -        (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t));
  +        (*lock) = (apr_lock_t *)apr_palloc(cont, sizeof(apr_lock_t));
           (*lock)->cntxt = cont;
       }
       (*lock)->mutex = *thelock;
  
  
  
  1.7       +4 -4      apache-2.0/src/lib/apr/locks/win32/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- locks.h	2000/04/14 15:58:31	1.6
  +++ locks.h	2000/08/02 05:26:22	1.7
  @@ -57,10 +57,10 @@
   
   #include "apr_lock.h"
   
  -struct ap_lock_t {
  -    ap_pool_t *cntxt;
  -    ap_locktype_e type;
  -    ap_lockscope_e scope;
  +struct apr_lock_t {
  +    apr_pool_t *cntxt;
  +    apr_locktype_e type;
  +    apr_lockscope_e scope;
       HANDLE mutex;
       CRITICAL_SECTION section;
       char *fname;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/misc/unix/canonerr.c
  
  Index: canonerr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/canonerr.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- canonerr.c	2000/05/17 22:30:49	1.4
  +++ canonerr.c	2000/08/02 05:26:22	1.5
  @@ -56,7 +56,7 @@
   
   #ifndef OS2
   
  -int ap_canonical_error(ap_status_t errcode)
  +int apr_canonical_error(apr_status_t errcode)
   {
   #if defined(EAGAIN) && defined(EWOULDBLOCK) && (EAGAIN != EWOULDBLOCK) && !defined(WIN32)
       if (errcode == EWOULDBLOCK) {
  
  
  
  1.24      +10 -10    apache-2.0/src/lib/apr/misc/unix/errorcodes.c
  
  Index: errorcodes.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/errorcodes.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- errorcodes.c	2000/07/21 19:50:44	1.23
  +++ errorcodes.c	2000/08/02 05:26:22	1.24
  @@ -65,16 +65,16 @@
   #endif
   
   /*
  - * stuffbuffer - like ap_cpystrn() but returns the address of the
  + * stuffbuffer - like apr_cpystrn() but returns the address of the
    * dest buffer instead of the address of the terminating '\0'
    */
  -static char *stuffbuffer(char *buf, ap_size_t bufsize, const char *s)
  +static char *stuffbuffer(char *buf, apr_size_t bufsize, const char *s)
   {
  -    ap_cpystrn(buf,s,bufsize);
  +    apr_cpystrn(buf,s,bufsize);
       return buf;
   }
   
  -static char *apr_error_string(ap_status_t statcode)
  +static char *apr_error_string(apr_status_t statcode)
   {
       switch (statcode) {
       case APR_ENOPOOL:
  @@ -164,7 +164,7 @@
   #include <os2.h>
   #include <ctype.h>
   
  -static char *apr_os_strerror(char* buf, ap_size_t bufsize, int err)
  +static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err)
   {
     char result[200];
     unsigned char message[HUGE_STRING_LEN];
  @@ -174,7 +174,7 @@
     
     if (err >= 10000 && err < 12000) {  /* socket error codes */
         return stuffbuffer(buf, bufsize,
  -                         strerror(ap_canonical_error(err+APR_OS_START_SYSERR)));
  +                         strerror(apr_canonical_error(err+APR_OS_START_SYSERR)));
     } 
     else if (DosGetMessage(NULL, 0, message, HUGE_STRING_LEN, err,
   			 "OSO001.MSG", &len) == 0) {
  @@ -206,7 +206,7 @@
   
   #elif defined(WIN32)
   
  -static char *apr_os_strerror(char *buf, ap_size_t bufsize, ap_status_t errcode)
  +static char *apr_os_strerror(char *buf, apr_size_t bufsize, apr_status_t errcode)
   {
       DWORD len;
       DWORD i;
  @@ -236,7 +236,7 @@
       else {
           /* Windows didn't provide us with a message.  Even stuff like                    * WSAECONNREFUSED won't get a message.
            */
  -        ap_cpystrn(buf, "Unrecognized error code", bufsize);
  +        apr_cpystrn(buf, "Unrecognized error code", bufsize);
       }
   
       return buf;
  @@ -246,7 +246,7 @@
   /* On Unix, apr_os_strerror() handles error codes from the resolver 
    * (h_errno). 
    e*/
  -static char *apr_os_strerror(char* buf, ap_size_t bufsize, int err) 
  +static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err) 
   {
   #ifdef HAVE_HSTRERROR
       return stuffbuffer(buf, bufsize, hstrerror(err));
  @@ -277,7 +277,7 @@
   }
   #endif
   
  -char *ap_strerror(ap_status_t statcode, char *buf, ap_size_t bufsize)
  +char *apr_strerror(apr_status_t statcode, char *buf, apr_size_t bufsize)
   {
       if (statcode < APR_OS_START_ERROR) {
   #ifdef WIN32
  
  
  
  1.17      +3 -3      apache-2.0/src/lib/apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- getopt.c	2000/05/28 02:47:08	1.16
  +++ getopt.c	2000/08/02 05:26:22	1.17
  @@ -42,9 +42,9 @@
   
   #define EMSG    ""
   
  -APR_EXPORT(ap_status_t) ap_getopt(ap_int32_t nargc, char *const *nargv, 
  -                                  const char *ostr, ap_int32_t *rv, 
  -                                  ap_pool_t *cont)
  +APR_EXPORT(apr_status_t) apr_getopt(apr_int32_t nargc, char *const *nargv, 
  +                                  const char *ostr, apr_int32_t *rv, 
  +                                  apr_pool_t *cont)
   {
       char *p;
       static char *place = EMSG;   /* option letter processing */
  
  
  
  1.21      +3 -3      apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- misc.h	2000/07/08 11:59:48	1.20
  +++ misc.h	2000/08/02 05:26:22	1.21
  @@ -90,8 +90,8 @@
       struct datastruct *prev;
   } datastruct;
   
  -struct ap_other_child_rec_t {
  -    struct ap_other_child_rec_t *next;
  +struct apr_other_child_rec_t {
  +    struct apr_other_child_rec_t *next;
       int id;  /* This is either a pid or tid depending on the platform */
       void (*maintenance) (int, void *, int);
       void *data;
  @@ -170,7 +170,7 @@
       (hFile));
   #define CancelIo ap_winapi_CancelIo
   
  -ap_status_t ap_get_oslevel(struct ap_pool_t *, ap_oslevel_e *);
  +apr_status_t ap_get_oslevel(struct apr_pool_t *, ap_oslevel_e *);
   #endif /* WIN32 */
   
   #endif  /* ! MISC_H */
  
  
  
  1.15      +13 -13    apache-2.0/src/lib/apr/misc/unix/otherchild.c
  
  Index: otherchild.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/otherchild.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- otherchild.c	2000/06/22 00:36:03	1.14
  +++ otherchild.c	2000/08/02 05:26:22	1.15
  @@ -69,15 +69,15 @@
   #include <sys/socket.h> /* for fd_set definition! */
   #endif
   
  -static ap_other_child_rec_t *other_children = NULL;
  +static apr_other_child_rec_t *other_children = NULL;
   
  -APR_EXPORT(void) ap_register_other_child(ap_proc_t *pid,
  +APR_EXPORT(void) apr_register_other_child(apr_proc_t *pid,
                        void (*maintenance) (int reason, void *, int status),
  -                     void *data, ap_file_t *write_fd, ap_pool_t *p)
  +                     void *data, apr_file_t *write_fd, apr_pool_t *p)
   {
  -    ap_other_child_rec_t *ocr;
  +    apr_other_child_rec_t *ocr;
   
  -    ocr = ap_palloc(p, sizeof(*ocr));
  +    ocr = apr_palloc(p, sizeof(*ocr));
       ocr->id = pid->pid;
       ocr->maintenance = maintenance;
       ocr->data = data;
  @@ -91,9 +91,9 @@
       other_children = ocr;
   }
   
  -APR_EXPORT(void) ap_unregister_other_child(void *data)
  +APR_EXPORT(void) apr_unregister_other_child(void *data)
   {
  -    ap_other_child_rec_t **pocr, *nocr;
  +    apr_other_child_rec_t **pocr, *nocr;
   
       for (pocr = &other_children; *pocr; pocr = &(*pocr)->next) {
           if ((*pocr)->data == data) {
  @@ -108,11 +108,11 @@
   
   /* test to ensure that the write_fds are all still writable, otherwise
    * invoke the maintenance functions as appropriate */
  -void ap_probe_writable_fds(void)
  +void apr_probe_writable_fds(void)
   {
       fd_set writable_fds;
       int fd_max;
  -    ap_other_child_rec_t *ocr, *nocr; 
  +    apr_other_child_rec_t *ocr, *nocr; 
       struct timeval tv; 
       int rc;
   
  @@ -156,9 +156,9 @@
       }
   }
   
  -APR_EXPORT(ap_status_t) ap_reap_other_child(ap_proc_t *pid, int status)
  +APR_EXPORT(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status)
   {
  -    ap_other_child_rec_t *ocr, *nocr;
  +    apr_other_child_rec_t *ocr, *nocr;
   
       for (ocr = other_children; ocr; ocr = nocr) {
           nocr = ocr->next;
  @@ -172,9 +172,9 @@
       return APR_CHILD_NOTDONE;
   }
   
  -APR_EXPORT(void) ap_check_other_child(void)
  +APR_EXPORT(void) apr_check_other_child(void)
   {
  -    ap_other_child_rec_t *ocr, *nocr;
  +    apr_other_child_rec_t *ocr, *nocr;
       pid_t waitret; 
       int status;
   
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/misc/unix/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/rand.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rand.c	2000/04/18 10:32:01	1.2
  +++ rand.c	2000/08/02 05:26:22	1.3
  @@ -65,7 +65,7 @@
   #define	XSTR(x)	#x
   #define	STR(x)	XSTR(x)
   
  -ap_status_t ap_generate_random_bytes(unsigned char * buf, int length) 
  +apr_status_t apr_generate_random_bytes(unsigned char * buf, int length) 
   {
   #ifdef	DEV_RANDOM
   
  
  
  
  1.38      +20 -20    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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- start.c	2000/07/21 19:50:44	1.37
  +++ start.c	2000/08/02 05:26:22	1.38
  @@ -56,15 +56,15 @@
   #include "locks.h"
   #include "apr_strings.h"
   
  -ap_status_t ap_create_pool(ap_pool_t **newcont, ap_pool_t *cont)
  +apr_status_t apr_create_pool(apr_pool_t **newcont, apr_pool_t *cont)
   {
  -    ap_pool_t *newpool;
  +    apr_pool_t *newpool;
   
       if (cont) {
  -        newpool = ap_make_sub_pool(cont, cont->apr_abort);
  +        newpool = apr_make_sub_pool(cont, cont->apr_abort);
       }
       else {
  -        newpool = ap_make_sub_pool(NULL, NULL);
  +        newpool = apr_make_sub_pool(NULL, NULL);
       }
           
       if (newpool == NULL) {
  @@ -78,13 +78,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_userdata(const void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *),
  -                            ap_pool_t *cont)
  +apr_status_t apr_set_userdata(const void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *),
  +                            apr_pool_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
   
  -    /* ### replace with an ap_hash_t */
  +    /* ### replace with an apr_hash_t */
   
       dptr = cont->prog_data;
       while (dptr) {
  @@ -94,9 +94,9 @@
           dptr = dptr->next;
       }
       if (dptr == NULL) {
  -        dptr = ap_pcalloc(cont, sizeof(datastruct));
  +        dptr = apr_pcalloc(cont, sizeof(datastruct));
           dptr->next = dptr->prev = NULL;
  -        dptr->key = ap_pstrdup(cont, key);
  +        dptr->key = apr_pstrdup(cont, key);
           if (dptr2) {
               dptr2->next = dptr;
               dptr->prev = dptr2;
  @@ -106,15 +106,15 @@
           }
       }
       dptr->data = data;
  -    ap_register_cleanup(cont, dptr->data, cleanup, cleanup);
  +    apr_register_cleanup(cont, dptr->data, cleanup, cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_userdata(void **data, const char *key, ap_pool_t *cont)
  +apr_status_t apr_get_userdata(void **data, const char *key, apr_pool_t *cont)
   {
       datastruct *dptr = NULL;
   
  -    /* ### replace with an ap_hash_t */
  +    /* ### replace with an apr_hash_t */
   
       dptr = cont->prog_data;
       while (dptr) {
  @@ -135,11 +135,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_initialize(void)
  +apr_status_t apr_initialize(void)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   #if !defined(BEOS) && !defined(OS2) && !defined(WIN32)
  -    ap_unix_setup_lock();
  +    apr_unix_setup_lock();
   #elif defined WIN32
       int iVersionRequested;
       WSADATA wsaData;
  @@ -156,16 +156,16 @@
           return APR_EEXIST;
       }
   #endif
  -    status = ap_init_alloc();
  +    status = apr_init_alloc();
       return status;
   }
   
  -void ap_terminate(void)
  +void apr_terminate(void)
   {
  -    ap_term_alloc();
  +    apr_term_alloc();
   }
   
  -ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_pool_t *cont)
  +apr_status_t apr_set_abort(int (*apr_abort)(int retcode), apr_pool_t *cont)
   {
       cont->apr_abort = apr_abort;
       return APR_SUCCESS;
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/misc/win32/misc.c
  
  Index: misc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- misc.c	2000/05/12 15:32:37	1.1
  +++ misc.c	2000/08/02 05:26:24	1.2
  @@ -55,7 +55,7 @@
   #include "apr_private.h"
   #include "misc.h"
   
  -ap_status_t ap_get_oslevel(ap_pool_t *cont, ap_oslevel_e *level)
  +apr_status_t ap_get_oslevel(apr_pool_t *cont, ap_oslevel_e *level)
   {
       static OSVERSIONINFO oslev;
       static unsigned int servpack = 0;
  
  
  
  1.14      +8 -8      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- names.c	2000/07/25 00:42:13	1.13
  +++ names.c	2000/08/02 05:26:24	1.14
  @@ -82,7 +82,7 @@
    * is present on the existing path.  This routine also
    * converts alias names to long names.
    */
  -APR_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont, 
  +APR_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pCont, 
                                                const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
  @@ -94,10 +94,10 @@
       WIN32_FIND_DATA wfd;
   
       if (!szFile || strlen(szFile) == 0 || strlen(szFile) >= sizeof(buf))
  -        return ap_pstrdup(pCont, "");
  +        return apr_pstrdup(pCont, "");
   
       buf[0] = '\0';
  -    pInputName = ap_pstrdup(pCont, szFile);
  +    pInputName = apr_pstrdup(pCont, szFile);
   
       /* First convert all slashes to \ so Win32 calls work OK */
       for (p = pInputName; *p; p++) {
  @@ -195,13 +195,13 @@
               *p = '/';
       }
   
  -    return ap_pstrdup(pCont, buf);
  +    return apr_pstrdup(pCont, buf);
   }
    
   /*  Perform canonicalization with the exception that the
    *  input case is preserved.
    */
  -char * canonical_filename(ap_pool_t *pCont, const char *szFile)
  +char * canonical_filename(apr_pool_t *pCont, const char *szFile)
   {
       char *pNewStr;
       char *s;
  @@ -209,9 +209,9 @@
       char *q;
   
       if (szFile == NULL || strlen(szFile) == 0)
  -        return ap_pstrdup(pCont, "");
  +        return apr_pstrdup(pCont, "");
   
  -    pNewStr = ap_pstrdup(pCont, szFile);
  +    pNewStr = apr_pstrdup(pCont, szFile);
   
       /*  Change all '\' characters to '/' characters.
        *  While doing this, remove any trailing '.'.
  @@ -309,7 +309,7 @@
   
               } while (p != NULL); 
   			
  -            pNewStr = ap_pstrdup(pCont, buf);
  +            pNewStr = apr_pstrdup(pCont, buf);
           }
       }
       return pNewStr;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/misc/win32/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/rand.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rand.c	2000/07/31 19:51:22	1.4
  +++ rand.c	2000/08/02 05:26:24	1.5
  @@ -56,7 +56,7 @@
   #include "apr_general.h"
   #include <wincrypt.h>
   
  -ap_status_t ap_generate_random_bytes(unsigned char * buf, int length) 
  +apr_status_t apr_generate_random_bytes(unsigned char * buf, int length) 
   {
       HCRYPTPROV hProv;
   
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/mmap/unix/common.c
  
  Index: common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- common.c	2000/07/07 19:14:54	1.16
  +++ common.c	2000/08/02 05:26:25	1.17
  @@ -68,7 +68,7 @@
   
   #if APR_HAS_MMAP || defined(BEOS)
   
  -ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_off_t offset)
  +apr_status_t apr_mmap_offset(void **addr, apr_mmap_t *mmap, apr_off_t offset)
   {  
       if (offset < 0 || offset > mmap->size)
           return APR_EINVAL;
  
  
  
  1.26      +11 -11    apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mmap.c	2000/07/07 19:14:54	1.25
  +++ mmap.c	2000/08/02 05:26:25	1.26
  @@ -79,9 +79,9 @@
   
   #if APR_HAS_MMAP || defined(BEOS)
   
  -static ap_status_t mmap_cleanup(void *themmap)
  +static apr_status_t mmap_cleanup(void *themmap)
   {
  -    ap_mmap_t *mm = themmap;
  +    apr_mmap_t *mm = themmap;
       int rv;
   #ifdef BEOS
       rv = delete_area(mm->area);
  @@ -101,8 +101,8 @@
       return errno;
   }
   
  -ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, 
  -       ap_size_t size, ap_pool_t *cont)
  +apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, apr_off_t offset, 
  +       apr_size_t size, apr_pool_t *cont)
   {
   #ifdef BEOS
       void *mm;
  @@ -115,11 +115,11 @@
      
       if (file == NULL || file->filedes == -1 || file->buffered)
           return APR_EBADF;
  -    (*new) = (ap_mmap_t *)ap_pcalloc(cont, sizeof(ap_mmap_t));
  +    (*new) = (apr_mmap_t *)apr_pcalloc(cont, sizeof(apr_mmap_t));
       
   #ifdef BEOS
       /* XXX: mmap shouldn't really change the seek offset */
  -    ap_seek(file, APR_SET, &offset);
  +    apr_seek(file, APR_SET, &offset);
       pages = ((size -1) / B_PAGE_SIZE) + 1;
   
       aid = create_area(areaname, &mm , B_ANY_ADDRESS, pages * B_PAGE_SIZE,
  @@ -148,20 +148,20 @@
       (*new)->cntxt = cont;
   
       /* register the cleanup... */
  -    ap_register_cleanup((*new)->cntxt, (void*)(*new), mmap_cleanup,
  -             ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void*)(*new), mmap_cleanup,
  +             apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_mmap_delete(ap_mmap_t *mmap)
  +apr_status_t apr_mmap_delete(apr_mmap_t *mmap)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if (mmap->mm == (caddr_t) -1)
           return APR_ENOENT;
         
       if ((rv = mmap_cleanup(mmap)) == APR_SUCCESS) {
  -        ap_kill_cleanup(mmap->cntxt, mmap, mmap_cleanup);
  +        apr_kill_cleanup(mmap->cntxt, mmap, mmap_cleanup);
           return APR_SUCCESS;
       }
       return rv;
  
  
  
  1.18      +7 -7      apache-2.0/src/lib/apr/network_io/beos/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- networkio.h	2000/06/13 16:44:29	1.17
  +++ networkio.h	2000/08/02 05:26:26	1.18
  @@ -91,26 +91,26 @@
   #define POLLHUP  16
   #define POLLNVAL 32
   
  -struct ap_socket_t {
  -    ap_pool_t *cntxt;
  +struct apr_socket_t {
  +    apr_pool_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
       struct sockaddr_in *remote_addr;
       int addr_len;
  -    ap_interval_time_t timeout;
  +    apr_interval_time_t timeout;
       int connected;
   };
   
  -struct ap_pollfd_t {
  -    ap_pool_t *cntxt;
  -    struct ap_socket_t *sock;
  +struct apr_pollfd_t {
  +    apr_pool_t *cntxt;
  +    struct apr_socket_t *sock;
       fd_set *read;
       fd_set *write;
       fd_set *except;
       int highsock;
   };
   
  -ap_int16_t get_event(ap_int16_t);
  +apr_int16_t get_event(apr_int16_t);
   
   int inet_aton(const char *cp, struct in_addr *addr);
   #include <ByteOrder.h> /* for the ntohs definition */
  
  
  
  1.21      +18 -18    apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- poll.c	2000/07/08 11:31:47	1.20
  +++ poll.c	2000/08/02 05:26:26	1.21
  @@ -67,16 +67,16 @@
   /*  select for R4.5 of BeOS.  So here we use code that uses the write */
   /*  bits. */
       
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +apr_status_t apr_setup_poll(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  -    (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
  +    (*new) = (apr_pollfd_t *)apr_palloc(cont, sizeof(apr_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont;
  -    (*new)->read = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  -    (*new)->write = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  -    (*new)->except = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  +    (*new)->read = (fd_set *)apr_palloc(cont, sizeof(fd_set));
  +    (*new)->write = (fd_set *)apr_palloc(cont, sizeof(fd_set));
  +    (*new)->except = (fd_set *)apr_palloc(cont, sizeof(fd_set));
       FD_ZERO((*new)->read);
       FD_ZERO((*new)->write);
       FD_ZERO((*new)->except);
  @@ -84,8 +84,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset,
  -                               ap_socket_t *sock, ap_int16_t event)
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset,
  +                               apr_socket_t *sock, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->socketdes, aprset->read);
  @@ -102,8 +102,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, 
  -		    ap_interval_time_t timeout)
  +apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds, 
  +		    apr_interval_time_t timeout)
   {
       int rv;
       struct timeval tv, *tvptr;
  @@ -130,9 +130,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset)
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
   {
  -    ap_int16_t revents = 0;
  +    apr_int16_t revents = 0;
       char data[256];
       int dummy = 256;
   
  @@ -175,7 +175,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
       FD_CLR(sock->socketdes, aprset->read);
       FD_CLR(sock->socketdes, aprset->read);
  @@ -183,7 +183,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t event)
  +apr_status_t apr_clear_poll_sockets(apr_pollfd_t *aprset, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_ZERO(aprset->read);
  @@ -198,15 +198,15 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
  +apr_status_t apr_get_polldata(apr_pollfd_t *pollfd, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, pollfd->cntxt);
  +    return apr_get_userdata(data, key, pollfd->cntxt);
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_polldata(apr_pollfd_t *pollfd, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
  +    return apr_set_userdata(data, key, cleanup, pollfd->cntxt);
   }
   
   #endif /* BEOS_BONE */
  
  
  
  1.14      +6 -6      apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sendrecv.c	2000/06/13 16:44:29	1.13
  +++ sendrecv.c	2000/08/02 05:26:26	1.14
  @@ -58,7 +58,7 @@
   #else
   #include "networkio.h"
   
  -static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read)
  +static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
   {
       struct timeval tv, *tvptr;
       fd_set fdset;
  @@ -92,7 +92,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
  +apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
   {
       ssize_t rv;
   	
  @@ -101,7 +101,7 @@
       } while (rv == -1 && errno == EINTR);
   
       if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
  -        ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +        apr_status_t arv = wait_for_io_or_timeout(sock, 0);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  @@ -120,16 +120,16 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len)
  +apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
      
       do {
           rv = recv(sock->socketdes, buf, (*len), 0);
       } while (rv == -1 && errno == EINTR);
   
       if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
  -        ap_status_t arv = wait_for_io_or_timeout(sock, 1);
  +        apr_status_t arv = wait_for_io_or_timeout(sock, 1);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  
  
  
  1.14      +12 -12    apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sockaddr.c	2000/06/26 20:37:36	1.13
  +++ sockaddr.c	2000/08/02 05:26:26	1.14
  @@ -58,7 +58,7 @@
   #else
   #include "networkio.h"
   
  -ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_local_port(apr_socket_t *sock, apr_uint32_t port)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -67,7 +67,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_remote_port(apr_socket_t *sock, apr_uint32_t port)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -76,7 +76,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_local_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -85,7 +85,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_remote_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -94,7 +94,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_local_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
   
  @@ -117,7 +117,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_remote_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
   
  @@ -140,28 +140,28 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_local_ipaddr(char **addr, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
       }
   
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_remote_ipaddr(char **addr, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
       }
   
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_local_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -171,7 +171,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  
  
  
  1.32      +30 -30    apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- sockets.c	2000/07/08 11:31:47	1.31
  +++ sockets.c	2000/08/02 05:26:26	1.32
  @@ -58,9 +58,9 @@
   #else
   #include "networkio.h"
   
  -ap_status_t socket_cleanup(void *sock)
  +apr_status_t socket_cleanup(void *sock)
   {
  -    ap_socket_t *thesocket = sock;
  +    apr_socket_t *thesocket = sock;
       if (closesocket(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -70,18 +70,18 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_socket_t *)ap_palloc(cont,sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_palloc(cont,sizeof(apr_socket_t));
       
       if ((*new) == NULL){
           return APR_ENOMEM;
       }
       
       (*new)->cntxt = cont;
  -	(*new)->local_addr = (struct sockaddr_in *) ap_palloc((*new)->cntxt,
  +	(*new)->local_addr = (struct sockaddr_in *) apr_palloc((*new)->cntxt,
   	                    sizeof (struct sockaddr_in));
  -	(*new)->remote_addr = (struct sockaddr_in *) ap_palloc((*new)->cntxt,
  +	(*new)->remote_addr = (struct sockaddr_in *) apr_palloc((*new)->cntxt,
   	                    sizeof (struct sockaddr_in));
       if ((*new)->local_addr == NULL || (*new)->remote_addr==NULL){
           return APR_ENOMEM;
  @@ -99,23 +99,23 @@
       }
   
       (*new)->timeout = -1;
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new),
  -                            socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new),
  +                            socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
   {
       return shutdown(thesocket->socketdes, how);
   }
   
  -ap_status_t ap_close_socket(ap_socket_t *thesocket)
  +apr_status_t apr_close_socket(apr_socket_t *thesocket)
   {
  -    ap_kill_cleanup(thesocket->cntxt,thesocket,socket_cleanup);
  +    apr_kill_cleanup(thesocket->cntxt,thesocket,socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
  -ap_status_t ap_bind(ap_socket_t *sock) 
  +apr_status_t apr_bind(apr_socket_t *sock) 
   { 
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) 
           return errno; 
  @@ -123,7 +123,7 @@
           return APR_SUCCESS; 
   } 
    
  -ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog) 
  +apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog) 
   { 
       if (listen(sock->socketdes, backlog) == -1) 
           return errno; 
  @@ -131,16 +131,16 @@
           return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context) 
  +apr_status_t apr_accept(apr_socket_t **new, apr_socket_t *sock, apr_pool_t *connection_context) 
   { 
  -	(*new) = (ap_socket_t *)ap_palloc(connection_context,
  -	                        sizeof(ap_socket_t)); 
  +	(*new) = (apr_socket_t *)apr_palloc(connection_context,
  +	                        sizeof(apr_socket_t)); 
   
       (*new)->cntxt = connection_context;
  -    (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, 
  +    (*new)->local_addr = (struct sockaddr_in *)apr_palloc((*new)->cntxt, 
                    sizeof(struct sockaddr_in));
   
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, 
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_palloc((*new)->cntxt, 
                    sizeof(struct sockaddr_in));
       (*new)->addr_len = sizeof(struct sockaddr_in);
       (*new)->connected = 1;
  @@ -156,12 +156,12 @@
   		return errno;
   	}
   
  -    ap_register_cleanup((*new)->cntxt, (void *)new, 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)new, 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   } 
    
  -ap_status_t ap_connect(ap_socket_t *sock, char *hostname) 
  +apr_status_t apr_connect(apr_socket_t *sock, char *hostname) 
   { 
       struct hostent *hp; 
   
  @@ -190,31 +190,31 @@
       return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock)
  +apr_status_t apr_get_socketdata(void **data, const char *key, apr_socket_t *sock)
   {
  -    return ap_get_userdata(data, key, sock->cntxt);
  +    return apr_get_userdata(data, key, sock->cntxt);
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_socketdata(apr_socket_t *sock, void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, sock->cntxt);
  +    return apr_set_userdata(data, key, cleanup, sock->cntxt);
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
  +apr_status_t apr_get_os_sock(apr_os_sock_t *thesock, apr_socket_t *sock)
   {
       *thesock = sock->socketdes;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, 
  +                           apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  +        (*sock) = (apr_socket_t *)apr_palloc(cont, sizeof(apr_socket_t));
           (*sock)->cntxt = cont;
       }
       (*sock)->socketdes = *thesock;
  
  
  
  1.22      +5 -5      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sockopt.c	2000/07/03 11:32:48	1.21
  +++ sockopt.c	2000/08/02 05:26:26	1.22
  @@ -64,7 +64,7 @@
           &on, sizeof(on));
   }
   
  -ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on)
   {
       int one;
       int rv;
  @@ -110,7 +110,7 @@
       return APR_SUCCESS;
   }         
   
  -ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t *on)
  +apr_status_t apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t *on)
   {
       switch(opt) {
       case APR_SO_TIMEOUT:
  @@ -122,7 +122,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_gethostname(char * buf, int len, ap_pool_t *cont)
  +apr_status_t apr_gethostname(char * buf, int len, apr_pool_t *cont)
   {
   	if (gethostname(buf, len) == -1){
   		return errno;
  @@ -131,14 +131,14 @@
   	}
   }
   
  -ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_hostname(char **name, apr_socket_t *sock)
   {
       struct hostent *hptr;
       
       hptr = gethostbyaddr((char *)&(sock->remote_addr->sin_addr), 
                            sizeof(struct in_addr), AF_INET);
       if (hptr != NULL) {
  -        *name = ap_pstrdup(sock->cntxt, hptr->h_name);
  +        *name = apr_pstrdup(sock->cntxt, hptr->h_name);
           if (*name) {
               return APR_SUCCESS;
           }
  
  
  
  1.13      +5 -5      apache-2.0/src/lib/apr/network_io/os2/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- networkio.h	2000/04/16 16:59:38	1.12
  +++ networkio.h	2000/08/02 05:26:27	1.13
  @@ -59,18 +59,18 @@
   #include "apr_general.h"
   #include "os2calls.h"
   
  -struct ap_socket_t {
  -    ap_pool_t *cntxt;
  +struct apr_socket_t {
  +    apr_pool_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
       struct sockaddr_in *remote_addr;
       int addr_len;
  -    ap_interval_time_t timeout;
  +    apr_interval_time_t timeout;
       int nonblock;
   };
   
  -struct ap_pollfd_t {
  -    ap_pool_t *cntxt;
  +struct apr_pollfd_t {
  +    apr_pool_t *cntxt;
       int *socket_list;
       int *r_socket_list;
       int num_read;
  
  
  
  1.16      +13 -13    apache-2.0/src/lib/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- poll.c	2000/04/28 04:09:54	1.15
  +++ poll.c	2000/08/02 05:26:27	1.16
  @@ -64,21 +64,21 @@
   
   /*  OS/2 doesn't have a poll function, implement using OS/2 style select */
    
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +apr_status_t apr_setup_poll(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  -    *new = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t));
  +    *new = (apr_pollfd_t *)apr_palloc(cont, sizeof(apr_pollfd_t));
   
       if (*new == NULL) {
           return APR_ENOMEM;
       }
   
  -    (*new)->socket_list = ap_palloc(cont, sizeof(int) * num);
  +    (*new)->socket_list = apr_palloc(cont, sizeof(int) * num);
       
       if ((*new)->socket_list == NULL) {
           return APR_ENOMEM;
       }
       
  -    (*new)->r_socket_list = ap_palloc(cont, sizeof(int) * num);
  +    (*new)->r_socket_list = apr_palloc(cont, sizeof(int) * num);
       
       if ((*new)->r_socket_list == NULL) {
           return APR_ENOMEM;
  @@ -95,8 +95,8 @@
   
   
   
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, 
  -			       ap_socket_t *sock, ap_int16_t events)
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset, 
  +			       apr_socket_t *sock, apr_int16_t events)
   {
       int i;
       
  @@ -126,8 +126,8 @@
   
   
   
  -ap_status_t ap_poll(ap_pollfd_t *pollfdset, ap_int32_t *nsds, 
  -                    ap_interval_time_t timeout)
  +apr_status_t apr_poll(apr_pollfd_t *pollfdset, apr_int32_t *nsds, 
  +                    apr_interval_time_t timeout)
   {
       int i;
       int rv = 0;
  @@ -167,7 +167,7 @@
   
   
   
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset)
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
   {
       int i;
       
  @@ -189,8 +189,8 @@
   
   
   
  -ap_status_t ap_mask_poll_socket(ap_pollfd_t *aprset, 
  -                                ap_socket_t *sock, ap_int16_t events)
  +apr_status_t apr_mask_poll_socket(apr_pollfd_t *aprset, 
  +                                apr_socket_t *sock, apr_int16_t events)
   {
       int start, *count, pos;
   
  @@ -227,7 +227,7 @@
   
   
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
  -    return ap_mask_poll_socket(aprset, sock, APR_POLLIN|APR_POLLOUT|APR_POLLPRI);
  +    return apr_mask_poll_socket(aprset, sock, APR_POLLIN|APR_POLLOUT|APR_POLLPRI);
   }
  
  
  
  1.14      +4 -4      apache-2.0/src/lib/apr/network_io/os2/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sendrecv.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sendrecv.c	2000/04/16 16:59:38	1.13
  +++ sendrecv.c	2000/08/02 05:26:27	1.14
  @@ -59,7 +59,7 @@
   #include "apr_lib.h"
   #include <sys/time.h>
   
  -ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
  +apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
   {
       ssize_t rv;
       int fds, err = 0;
  @@ -98,7 +98,7 @@
   
   
   
  -ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len)
  +apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
   {
       ssize_t rv;
       int fds, err = 0;
  @@ -137,9 +137,9 @@
   
   
   
  -ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec, ap_int32_t nvec, ap_int32_t *len)
  +apr_status_t apr_sendv(apr_socket_t *sock, const struct iovec *vec, apr_int32_t nvec, apr_int32_t *len)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       struct iovec *tmpvec;
       int fds, err = 0;
   
  
  
  
  1.25      +29 -29    apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- sockets.c	2000/07/08 11:31:48	1.24
  +++ sockets.c	2000/08/02 05:26:27	1.25
  @@ -66,9 +66,9 @@
   #include <netdb.h>
   #include "os2calls.h"
   
  -static ap_status_t socket_cleanup(void *sock)
  +static apr_status_t socket_cleanup(void *sock)
   {
  -    ap_socket_t *thesocket = sock;
  +    apr_socket_t *thesocket = sock;
       if (soclose(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -78,17 +78,17 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_palloc(cont, sizeof(apr_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont; 
  -    (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
  +    (*new)->local_addr = (struct sockaddr_in *)apr_palloc((*new)->cntxt,
                            sizeof(struct sockaddr_in));
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_palloc((*new)->cntxt,
                            sizeof(struct sockaddr_in));
   
       if ((*new)->local_addr == NULL || (*new)->remote_addr == NULL) {
  @@ -107,12 +107,12 @@
       }
       (*new)->timeout = -1;
       (*new)->nonblock = FALSE;
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
   {
       if (shutdown(thesocket->socketdes, how) == 0) {
           return APR_SUCCESS;
  @@ -122,16 +122,16 @@
       }
   }
   
  -ap_status_t ap_close_socket(ap_socket_t *thesocket)
  +apr_status_t apr_close_socket(apr_socket_t *thesocket)
   {
  -    ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
  +    apr_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
   
   
   
  -ap_status_t ap_bind(ap_socket_t *sock)
  +apr_status_t apr_bind(apr_socket_t *sock)
   {
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1)
           return APR_OS2_STATUS(sock_errno());
  @@ -139,7 +139,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
  +apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog)
   {
       if (listen(sock->socketdes, backlog) == -1)
           return APR_OS2_STATUS(sock_errno());
  @@ -147,13 +147,13 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
  +apr_status_t apr_accept(apr_socket_t **new, apr_socket_t *sock, apr_pool_t *connection_context)
   {
  -    (*new) = (ap_socket_t *)ap_palloc(connection_context, 
  -                            sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_palloc(connection_context, 
  +                            sizeof(apr_socket_t));
   
       (*new)->cntxt = connection_context;
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_palloc((*new)->cntxt,
                             sizeof(struct sockaddr_in));
       (*new)->local_addr = sock->local_addr;
       (*new)->addr_len = sizeof(struct sockaddr_in);
  @@ -167,12 +167,12 @@
           return APR_OS2_STATUS(sock_errno());
       }
   
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_connect(ap_socket_t *sock, char *hostname)
  +apr_status_t apr_connect(apr_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
   
  @@ -206,21 +206,21 @@
   
   
   
  -ap_status_t ap_get_socketdata(void **data, const char *key,
  -                              ap_socket_t *socket)
  +apr_status_t apr_get_socketdata(void **data, const char *key,
  +                              apr_socket_t *socket)
   {
  -    return ap_get_userdata(data, key, socket->cntxt);
  +    return apr_get_userdata(data, key, socket->cntxt);
   }
   
   
   
  -ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_socketdata(apr_socket_t *socket, void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, socket->cntxt);
  +    return apr_set_userdata(data, key, cleanup, socket->cntxt);
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
  +apr_status_t apr_get_os_sock(apr_os_sock_t *thesock, apr_socket_t *sock)
   {
       *thesock = sock->socketdes;
       return APR_SUCCESS;
  @@ -228,13 +228,13 @@
   
   
   
  -ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_pool_t *cont)
  +apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t));
  +        (*sock) = (apr_socket_t *)apr_palloc(cont, sizeof(apr_socket_t));
           (*sock)->cntxt = cont;
       }
       (*sock)->socketdes = *thesock;
  
  
  
  1.15      +5 -5      apache-2.0/src/lib/apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sockopt.c	2000/07/01 04:03:28	1.14
  +++ sockopt.c	2000/08/02 05:26:27	1.15
  @@ -66,7 +66,7 @@
   #include <sys/so_ioctl.h>
   
   
  -ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on)
   {
       int one;
       struct linger li;
  @@ -118,7 +118,7 @@
   
   
   
  -ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t *on)
  +apr_status_t apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t *on)
   {
       switch(opt) {
       case APR_SO_TIMEOUT:
  @@ -132,7 +132,7 @@
   
   
   
  -ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
  +apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
   {
       if (gethostname(buf, len) == -1)
           return APR_OS2_STATUS(sock_errno());
  @@ -142,14 +142,14 @@
   
   
   
  -ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_hostname(char **name, apr_socket_t *sock)
   {
       struct hostent *hptr;
   
       hptr = gethostbyaddr((char *)&(sock->remote_addr->sin_addr),
                            sizeof(struct in_addr), AF_INET);
       if (hptr != NULL) {
  -        *name = ap_pstrdup(sock->cntxt, hptr->h_name);
  +        *name = apr_pstrdup(sock->cntxt, hptr->h_name);
           if (*name) {
               return APR_SUCCESS;
           }
  
  
  
  1.31      +7 -7      apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- networkio.h	2000/06/28 22:36:28	1.30
  +++ networkio.h	2000/08/02 05:26:29	1.31
  @@ -116,13 +116,13 @@
   #define POLLNVAL 32
   #endif
   
  -struct ap_socket_t {
  -    ap_pool_t *cntxt;
  +struct apr_socket_t {
  +    apr_pool_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
       struct sockaddr_in *remote_addr;
       socklen_t addr_len;
  -    ap_interval_time_t timeout; 
  +    apr_interval_time_t timeout; 
   #ifndef HAVE_POLL
       int connected;
   #endif
  @@ -130,8 +130,8 @@
       int local_interface_unknown;
   };
   
  -struct ap_pollfd_t {
  -    ap_pool_t *cntxt;
  +struct apr_pollfd_t {
  +    apr_pool_t *cntxt;
   #ifdef HAVE_POLL
       struct pollfd *pollset;
       int num;
  @@ -142,8 +142,8 @@
       fd_set *except;
       int highsock;
   #endif
  -    ap_int16_t *events;
  -    ap_int16_t *revents;
  +    apr_int16_t *events;
  +    apr_int16_t *revents;
   
   };
   
  
  
  
  1.37      +39 -39    apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- poll.c	2000/07/08 11:31:48	1.36
  +++ poll.c	2000/08/02 05:26:29	1.37
  @@ -57,13 +57,13 @@
   
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +apr_status_t apr_setup_poll(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  -    (*new) = (ap_pollfd_t *)ap_pcalloc(cont, sizeof(ap_pollfd_t));
  +    (*new) = (apr_pollfd_t *)apr_pcalloc(cont, sizeof(apr_pollfd_t));
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
  -    (*new)->pollset = (struct pollfd *)ap_pcalloc(cont, 
  +    (*new)->pollset = (struct pollfd *)apr_pcalloc(cont, 
                                            sizeof(struct pollfd) * num);
   
       if ((*new)->pollset == NULL) {
  @@ -75,9 +75,9 @@
       return APR_SUCCESS;
   }
   
  -static ap_int16_t get_event(ap_int16_t event)
  +static apr_int16_t get_event(apr_int16_t event)
   {
  -    ap_int16_t rv = 0;
  +    apr_int16_t rv = 0;
   
       if (event & APR_POLLIN)
           rv |= POLLIN;        
  @@ -95,9 +95,9 @@
       return rv;
   }
   
  -static ap_int16_t get_revent(ap_int16_t event)
  +static apr_int16_t get_revent(apr_int16_t event)
   {
  -    ap_int16_t rv = 0;
  +    apr_int16_t rv = 0;
   
       if (event & POLLIN)
           rv |= APR_POLLIN;
  @@ -115,8 +115,8 @@
       return rv;
   }        
   
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, 
  -			       ap_socket_t *sock, ap_int16_t event)
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset, 
  +			       apr_socket_t *sock, apr_int16_t event)
   {
       int i = 0;
       
  @@ -135,8 +135,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, 
  -		    ap_interval_time_t timeout)
  +apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds, 
  +		    apr_interval_time_t timeout)
   {
       int rv;
   
  @@ -153,7 +153,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset)
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
   {
       int i = 0;
       
  @@ -167,10 +167,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_mask_poll_socket(ap_pollfd_t *aprset, 
  -                                  ap_socket_t *sock, ap_int16_t events)
  +apr_status_t apr_mask_poll_socket(apr_pollfd_t *aprset, 
  +                                  apr_socket_t *sock, apr_int16_t events)
   {
  -    ap_int16_t newevents;
  +    apr_int16_t newevents;
       int i = 0;
       
       while (i < aprset->curpos && aprset->pollset[i].fd != sock->socketdes) {
  @@ -187,7 +187,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
       int i = 0;
       while(i < aprset->curpos && aprset->pollset[i].fd != sock->socketdes) {
  @@ -204,10 +204,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events)
  +apr_status_t apr_clear_poll_sockets(apr_pollfd_t *aprset, apr_int16_t events)
   {
       int i = 0;
  -    ap_int16_t newevents;
  +    apr_int16_t newevents;
   
       newevents = get_event(events);
   
  @@ -222,16 +222,16 @@
   
   #else    /* Use select to mimic poll */
   
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +apr_status_t apr_setup_poll(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  -    (*new) = (ap_pollfd_t *)ap_pcalloc(cont, sizeof(ap_pollfd_t) * num);
  +    (*new) = (apr_pollfd_t *)apr_pcalloc(cont, sizeof(apr_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont;
  -    (*new)->read = (fd_set *)ap_pcalloc(cont, sizeof(fd_set));
  -    (*new)->write = (fd_set *)ap_pcalloc(cont, sizeof(fd_set));
  -    (*new)->except = (fd_set *)ap_pcalloc(cont, sizeof(fd_set));
  +    (*new)->read = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->write = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->except = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       FD_ZERO((*new)->read);
       FD_ZERO((*new)->write);
       FD_ZERO((*new)->except);
  @@ -239,8 +239,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset,
  -                               ap_socket_t *sock, ap_int16_t event)
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset,
  +                               apr_socket_t *sock, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->socketdes, aprset->read);
  @@ -257,8 +257,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, 
  -		    ap_interval_time_t timeout)
  +apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds, 
  +		    apr_interval_time_t timeout)
   {
       int rv;
       struct timeval tv, *tvptr;
  @@ -285,9 +285,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset)
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
   {
  -    ap_int16_t revents = 0;
  +    apr_int16_t revents = 0;
       char data[1];
       int flags = MSG_PEEK;
   
  @@ -332,7 +332,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
       FD_CLR(sock->socketdes, aprset->read);
       FD_CLR(sock->socketdes, aprset->read);
  @@ -340,7 +340,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t event)
  +apr_status_t apr_clear_poll_sockets(apr_pollfd_t *aprset, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_ZERO(aprset->read);
  @@ -357,25 +357,25 @@
   
   #endif 
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
  +apr_status_t apr_get_polldata(apr_pollfd_t *pollfd, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, pollfd->cntxt);
  +    return apr_get_userdata(data, key, pollfd->cntxt);
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_polldata(apr_pollfd_t *pollfd, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
  +    return apr_set_userdata(data, key, cleanup, pollfd->cntxt);
   }
   
   #if APR_FILES_AS_SOCKETS
  -/* I'm not sure if this needs to return an ap_status_t or not, but
  +/* I'm not sure if this needs to return an apr_status_t or not, but
    * for right now, we'll leave it this way, and change it later if
    * necessary.
    */
  -ap_status_t ap_socket_from_file(ap_socket_t **newsock, ap_file_t *file)
  +apr_status_t apr_socket_from_file(apr_socket_t **newsock, apr_file_t *file)
   {
  -    (*newsock) = ap_pcalloc(file->cntxt, sizeof(**newsock));
  +    (*newsock) = apr_pcalloc(file->cntxt, sizeof(**newsock));
       (*newsock)->socketdes = file->filedes;
       (*newsock)->cntxt = file->cntxt;
       return APR_SUCCESS;
  
  
  
  1.37      +51 -51    apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- sendrecv.c	2000/07/18 15:16:46	1.36
  +++ sendrecv.c	2000/08/02 05:26:29	1.37
  @@ -66,7 +66,7 @@
   #endif
   
   #if APR_HAS_SENDFILE
  -/* This file is needed to allow us access to the ap_file_t internals. */
  +/* This file is needed to allow us access to the apr_file_t internals. */
   #include "../../file_io/unix/fileio.h"
   
   /* Glibc2.1.1 fails to define TCP_CORK.  This is a bug that will be 
  @@ -78,7 +78,7 @@
   
   #endif /* APR_HAS_SENDFILE */
   
  -static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read)
  +static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
   {
       struct timeval tv, *tvptr;
       fd_set fdset;
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
  +apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
   {
       ssize_t rv;
       
  @@ -122,7 +122,7 @@
   
       if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) 
           && sock->timeout != 0) {
  -        ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +        apr_status_t arv = wait_for_io_or_timeout(sock, 0);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return arv;
  @@ -141,7 +141,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len)
  +apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
   {
       ssize_t rv;
       
  @@ -152,7 +152,7 @@
       if (rv == -1 && 
           (errno == EAGAIN || errno == EWOULDBLOCK) && 
           sock->timeout != 0) {
  -	ap_status_t arv = wait_for_io_or_timeout(sock, 1);
  +	apr_status_t arv = wait_for_io_or_timeout(sock, 1);
   	if (arv != APR_SUCCESS) {
   	    *len = 0;
   	    return arv;
  @@ -172,10 +172,10 @@
   }
   
   #ifdef HAVE_WRITEV
  -ap_status_t ap_sendv(ap_socket_t * sock, const struct iovec *vec,
  -                     ap_int32_t nvec, ap_ssize_t *len)
  +apr_status_t apr_sendv(apr_socket_t * sock, const struct iovec *vec,
  +                     apr_int32_t nvec, apr_ssize_t *len)
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
   
       do {
           rv = writev(sock->socketdes, vec, nvec);
  @@ -184,7 +184,7 @@
       if (rv == -1 && 
           (errno == EAGAIN || errno == EWOULDBLOCK) && 
           sock->timeout != 0) {
  -	ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +	apr_status_t arv = wait_for_io_or_timeout(sock, 0);
   	if (arv != APR_SUCCESS) {
   	    *len = 0;
   	    return arv;
  @@ -211,7 +211,7 @@
     *     - Should flags be an int_32 or what?
     */
   
  -static ap_hdtr_t no_hdtr; /* used below when caller passes NULL for ap_hdtr_t */
  +static apr_hdtr_t no_hdtr; /* used below when caller passes NULL for apr_hdtr_t */
   
   #if defined(__linux__) && defined(HAVE_WRITEV)
   
  @@ -219,14 +219,14 @@
    * however, it is mutually exclusive w/TCP_NODELAY  
    */
   
  -static int os_cork(ap_socket_t *sock)
  +static int os_cork(apr_socket_t *sock)
   {
       /* Linux only for now */
   
       int nodelay_off = 0, corkflag = 1, rv, delayflag;
       socklen_t delaylen = sizeof(delayflag);
   
  -    /* XXX it would be cheaper to use an ap_socket_t flag here */
  +    /* XXX it would be cheaper to use an apr_socket_t flag here */
       rv = getsockopt(sock->socketdes, SOL_TCP, TCP_NODELAY,
                       (void *) &delayflag, &delaylen);
       if (rv == 0) {  
  @@ -245,7 +245,7 @@
       return rv == 0 ? delayflag : rv;
   }   
   
  -static int os_uncork(ap_socket_t *sock, int delayflag)
  +static int os_uncork(apr_socket_t *sock, int delayflag)
   {
       /* Uncork to send queued frames - Linux only for now */
       
  @@ -260,13 +260,13 @@
       return rv;
   }
   
  -ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file,
  -        		ap_hdtr_t *hdtr, ap_off_t *offset, ap_size_t *len,
  -        		ap_int32_t flags)
  +apr_status_t ap_sendfile(apr_socket_t *sock, apr_file_t *file,
  +        		apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
  +        		apr_int32_t flags)
   {
       off_t off = *offset;
       int rv, nbytes = 0, total_hdrbytes, i, delayflag = APR_EINIT, corked = 0;
  -    ap_status_t arv;
  +    apr_status_t arv;
   
       if (!hdtr) {
           hdtr = &no_hdtr;
  @@ -276,7 +276,7 @@
       flags = 0;
   
       if (hdtr->numheaders > 0) {
  -        ap_int32_t hdrbytes;
  +        apr_int32_t hdrbytes;
           
           /* cork before writing headers */
           rv = os_cork(sock);
  @@ -287,7 +287,7 @@
           corked = 1;
   
           /* Now write the headers */
  -        arv = ap_sendv(sock, hdtr->headers, hdtr->numheaders, &hdrbytes);
  +        arv = apr_sendv(sock, hdtr->headers, hdtr->numheaders, &hdrbytes);
           if (arv != APR_SUCCESS) {
   	    *len = 0;
               return errno;
  @@ -361,8 +361,8 @@
   
       /* Now write the footers */
       if (hdtr->numtrailers > 0) {
  -        ap_int32_t trbytes;
  -        arv = ap_sendv(sock, hdtr->trailers, hdtr->numtrailers, &trbytes);
  +        apr_int32_t trbytes;
  +        arv = apr_sendv(sock, hdtr->trailers, hdtr->numtrailers, &trbytes);
           nbytes += trbytes;
           if (arv != APR_SUCCESS) {
   	    *len = nbytes;
  @@ -391,9 +391,9 @@
   #elif defined(__FreeBSD__)
   
   /* Release 3.1 or greater */
  -ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
  -        		ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
  -        		ap_int32_t flags)
  +apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +        		apr_int32_t flags)
   {
       off_t nbytes;
       int rv, i;
  @@ -453,7 +453,7 @@
       if (rv == -1 && 
           (errno == EAGAIN || errno == EWOULDBLOCK) && 
           sock->timeout > 0) {
  -	ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +	apr_status_t arv = wait_for_io_or_timeout(sock, 0);
   	if (arv != APR_SUCCESS) {
   	    *len = 0;
   	    return arv;
  @@ -484,9 +484,9 @@
   #error "there's no way this ap_sendfile implementation works -djg"
   
   /* HP-UX Version 10.30 or greater */
  -ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
  -        		ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
  -        		ap_int32_t flags)
  +apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +        		apr_int32_t flags)
   {
       int i, ptr = 0;
       size_t nbytes = 0, headerlen = 0, trailerlen = 0;
  @@ -508,7 +508,7 @@
       }
   
       /* XXX:  BUHHH? wow, what a memory leak! */
  -    headerbuf = ap_palloc(sock->cntxt, headerlen);
  +    headerbuf = apr_palloc(sock->cntxt, headerlen);
   
       for (i = 0; i < hdtr->numheaders; i++) {
           memcpy(headerbuf + ptr, hdtr->headers[i].iov_base,
  @@ -521,7 +521,7 @@
       }
   
       /* XXX:  BUHHH? wow, what a memory leak! */
  -    trailerbuf = ap_palloc(sock->cntxt, trailerlen);
  +    trailerbuf = apr_palloc(sock->cntxt, trailerlen);
   
       for (i = 0; i < hdtr->numtrailers; i++) {
           memcpy(trailerbuf + ptr, hdtr->trailers[i].iov_base,
  @@ -548,7 +548,7 @@
       if (rv == -1 && 
           (errno == EAGAIN || errno == EWOULDBLOCK) && 
           sock->timeout > 0) {
  -        ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +        apr_status_t arv = wait_for_io_or_timeout(sock, 0);
   
           if (arv != APR_SUCCESS) {
               /* jlt: not tested, but this matches other sendfile logic */
  @@ -591,13 +591,13 @@
    * AIX -  version 4.3.2 with APAR IX85388, or version 4.3.3 and above
    * OS/390 - V2R7 and above
    */
  -ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
  -                        ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
  -                        ap_int32_t flags)
  +apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +                        apr_int32_t flags)
   {
       int i, ptr, rv = 0;
       void * hbuf=NULL, * tbuf=NULL;
  -    ap_status_t arv;
  +    apr_status_t arv;
       struct sf_parms parms;
   
       if (!hdtr) {
  @@ -619,13 +619,13 @@
                   parms.header_length += hdtr->headers[i].iov_len;
               }
   #if 0
  -            /* Keepalives make ap_palloc a bad idea */
  +            /* Keepalives make apr_palloc a bad idea */
               hbuf = malloc(parms.header_length);
   #else
               /* but headers are small, so maybe we can hold on to the
                * memory for the life of the socket...
                */
  -            hbuf = ap_palloc(sock->cntxt, parms.header_length);
  +            hbuf = apr_palloc(sock->cntxt, parms.header_length);
   #endif
               ptr = 0;
               for (i = 0; i < hdtr->numheaders; i++) {
  @@ -648,10 +648,10 @@
                   parms.trailer_length += hdtr->trailers[i].iov_len;
               }
   #if 0
  -            /* Keepalives make ap_palloc a bad idea */
  +            /* Keepalives make apr_palloc a bad idea */
               tbuf = malloc(parms.trailer_length);
   #else
  -            tbuf = ap_palloc(sock->cntxt, parms.trailer_length);
  +            tbuf = apr_palloc(sock->cntxt, parms.trailer_length);
   #endif
               ptr = 0;
               for (i = 0; i < hdtr->numtrailers; i++) {
  @@ -717,16 +717,16 @@
    * each and not an array as is passed into this function. In
    * addition, there is a limitation on the size of the header/trailer
    * that can be referenced ( > 4096 seems to cause an ENOMEM)
  - * Rather than code these special cases in, using ap_sendv for
  + * Rather than code these special cases in, using apr_sendv for
    * all cases of the headers and trailers seems to be a good idea.
    */
  -ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
  -                        ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
  -                        ap_int32_t flags)
  +apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +                        apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +                        apr_int32_t flags)
   {
       off_t nbytes = 0;
       int rv, i;
  -    ap_status_t arv;
  +    apr_status_t arv;
       struct iovec headerstruct[2] = {(0, 0), (0, 0)};
       size_t bytes_to_send = *len;
       
  @@ -738,9 +738,9 @@
       flags = 0;
       
       if (hdtr->numheaders > 0) {
  -        ap_ssize_t hdrbytes = 0;
  +        apr_ssize_t hdrbytes = 0;
   
  -        arv = ap_sendv(sock, hdtr->headers, hdtr->numheaders, &hdrbytes);
  +        arv = apr_sendv(sock, hdtr->headers, hdtr->numheaders, &hdrbytes);
           if (arv != APR_SUCCESS) {
               *len = 0;
               return errno;
  @@ -753,7 +753,7 @@
            * socket.
            */
           if (sock->timeout <= 0) {
  -            ap_size_t total_hdrbytes = 0;
  +            apr_size_t total_hdrbytes = 0;
               for (i = 0; i < hdtr->numheaders; i++) {
                   total_hdrbytes += hdtr->headers[i].iov_len;
               }
  @@ -784,7 +784,7 @@
       if (rv == -1 &&
           (errno == EAGAIN || errno == EWOULDBLOCK) &&
           sock->timeout > 0) {
  -        ap_status_t arv = wait_for_io_or_timeout(sock, 0);
  +        apr_status_t arv = wait_for_io_or_timeout(sock, 0);
   
           if (arv != APR_SUCCESS) {
               *len = 0;
  @@ -806,10 +806,10 @@
           nbytes += rv;
   
           if (hdtr->numtrailers > 0) {
  -            ap_ssize_t trlbytes = 0;
  +            apr_ssize_t trlbytes = 0;
   
               /* send the trailers now */
  -            arv = ap_sendv(sock, hdtr->trailers, hdtr->numtrailers, &trlbytes);
  +            arv = apr_sendv(sock, hdtr->trailers, hdtr->numtrailers, &trlbytes);
               if (arv != APR_SUCCESS) {
                   *len = 0;
                   return errno;
  
  
  
  1.15      +16 -16    apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sockaddr.c	2000/07/21 19:50:44	1.14
  +++ sockaddr.c	2000/08/02 05:26:29	1.15
  @@ -55,7 +55,7 @@
   #include "networkio.h"
   #include "apr_strings.h"
   
  -ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_local_port(apr_socket_t *sock, apr_uint32_t port)
   {
       sock->local_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -63,7 +63,7 @@
   
   
   
  -ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_remote_port(apr_socket_t *sock, apr_uint32_t port)
   {
       sock->remote_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -71,7 +71,7 @@
   
   
   
  -static ap_status_t get_local_addr(ap_socket_t *sock)
  +static apr_status_t get_local_addr(apr_socket_t *sock)
   {
       socklen_t namelen = sizeof(*sock->local_addr);
   
  @@ -87,10 +87,10 @@
   
   
   
  -ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_local_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       if (sock->local_port_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
  @@ -103,7 +103,7 @@
   
   
   
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_remote_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       *port = ntohs(sock->remote_addr->sin_port);
       return APR_SUCCESS;
  @@ -111,7 +111,7 @@
   
   
   
  -ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_local_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -132,7 +132,7 @@
   
   
   
  -ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_remote_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -153,35 +153,35 @@
   
   
   
  -ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_local_ipaddr(char **addr, apr_socket_t *sock)
   {
       if (sock->local_interface_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
           }
       }
   
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_remote_ipaddr(char **addr, apr_socket_t *sock)
   {
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
   
   #if APR_HAVE_NETINET_IN_H
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_local_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       if (sock->local_port_unknown || sock->local_interface_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
  @@ -194,7 +194,7 @@
   
   
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.52      +32 -32    apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- sockets.c	2000/07/08 11:15:52	1.51
  +++ sockets.c	2000/08/02 05:26:29	1.52
  @@ -55,9 +55,9 @@
   #include "networkio.h"
   #include "apr_portable.h"
   
  -static ap_status_t socket_cleanup(void *sock)
  +static apr_status_t socket_cleanup(void *sock)
   {
  -    ap_socket_t *thesocket = sock;
  +    apr_socket_t *thesocket = sock;
       if (close(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -67,17 +67,17 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_socket_t *)ap_pcalloc(cont, sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_pcalloc(cont, sizeof(apr_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont; 
  -    (*new)->local_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
  +    (*new)->local_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt,
                            sizeof(struct sockaddr_in));
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt,
                             sizeof(struct sockaddr_in));
   
       if ((*new)->local_addr == NULL || (*new)->remote_addr == NULL) {
  @@ -95,23 +95,23 @@
           return errno;
       }
       (*new)->timeout = -1;
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
   {
       return (shutdown(thesocket->socketdes, how) == -1) ? errno : APR_SUCCESS;
   }
   
  -ap_status_t ap_close_socket(ap_socket_t *thesocket)
  +apr_status_t apr_close_socket(apr_socket_t *thesocket)
   {
  -    ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
  +    apr_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
  -ap_status_t ap_bind(ap_socket_t *sock)
  +apr_status_t apr_bind(apr_socket_t *sock)
   {
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1)
           return errno;
  @@ -123,7 +123,7 @@
       }
   }
   
  -ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
  +apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog)
   {
       if (listen(sock->socketdes, backlog) == -1)
           return errno;
  @@ -131,16 +131,16 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
  +apr_status_t apr_accept(apr_socket_t **new, apr_socket_t *sock, apr_pool_t *connection_context)
   {
  -    (*new) = (ap_socket_t *)ap_pcalloc(connection_context, 
  -                            sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_pcalloc(connection_context, 
  +                            sizeof(apr_socket_t));
   
       (*new)->cntxt = connection_context;
  -    (*new)->local_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt, 
  +    (*new)->local_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt, 
                    sizeof(struct sockaddr_in));
   
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt, 
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt, 
                    sizeof(struct sockaddr_in));
       (*new)->addr_len = sizeof(struct sockaddr_in);
   #ifndef HAVE_POLL
  @@ -173,12 +173,12 @@
           (*new)->local_interface_unknown = 1;
       }
   
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_connect(ap_socket_t *sock, char *hostname)
  +apr_status_t apr_connect(apr_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
   
  @@ -231,32 +231,32 @@
       }
   }
   
  -ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *sock)
  +apr_status_t apr_get_socketdata(void **data, const char *key, apr_socket_t *sock)
   {
  -    return ap_get_userdata(data, key, sock->cntxt);
  +    return apr_get_userdata(data, key, sock->cntxt);
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_socketdata(apr_socket_t *sock, void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, sock->cntxt);
  +    return apr_set_userdata(data, key, cleanup, sock->cntxt);
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
  +apr_status_t apr_get_os_sock(apr_os_sock_t *thesock, apr_socket_t *sock)
   {
       *thesock = sock->socketdes;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, 
  +                           apr_pool_t *cont)
   {
       if ((*sock) == NULL) {
  -        (*sock) = (ap_socket_t *)ap_pcalloc(cont, sizeof(ap_socket_t));
  +        (*sock) = (apr_socket_t *)apr_pcalloc(cont, sizeof(apr_socket_t));
           (*sock)->cntxt = cont;
  -        (*sock)->local_addr = (struct sockaddr_in *)ap_pcalloc((*sock)->cntxt,
  +        (*sock)->local_addr = (struct sockaddr_in *)apr_pcalloc((*sock)->cntxt,
                                sizeof(struct sockaddr_in));
  -        (*sock)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*sock)->cntxt,
  +        (*sock)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*sock)->cntxt,
                                 sizeof(struct sockaddr_in));
   
           if ((*sock)->local_addr == NULL || (*sock)->remote_addr == NULL) {
  
  
  
  1.32      +8 -8      apache-2.0/src/lib/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- sockopt.c	2000/07/21 19:50:44	1.31
  +++ sockopt.c	2000/08/02 05:26:29	1.32
  @@ -55,7 +55,7 @@
   #include "networkio.h"
   #include "apr_strings.h"
   
  -static ap_status_t soblock(int sd)
  +static apr_status_t soblock(int sd)
   {
   /* BeOS uses setsockopt at present for non blocking... */
   #ifndef BEOS
  @@ -83,7 +83,7 @@
       return APR_SUCCESS;
   }
   
  -static ap_status_t sononblock(int sd)
  +static apr_status_t sononblock(int sd)
   {
   #ifndef BEOS
       int fd_flags;
  @@ -110,11 +110,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on)
   {
       int one;
       struct linger li;
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if (on)
           one = 1;
  @@ -173,7 +173,7 @@
       return APR_SUCCESS; 
   }         
   
  -ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t *on)
  +apr_status_t apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t *on)
   {
       switch(opt) {
       case APR_SO_TIMEOUT:
  @@ -185,7 +185,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_pool_t *cont)
  +apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
   {
       if (gethostname(buf, len) == -1)
           return errno;
  @@ -193,14 +193,14 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_hostname(char **name, apr_socket_t *sock)
   {
       struct hostent *hptr;
       
       hptr = gethostbyaddr((char *)&(sock->remote_addr->sin_addr), 
                            sizeof(struct in_addr), AF_INET);
       if (hptr != NULL) {
  -        *name = ap_pstrdup(sock->cntxt, hptr->h_name);
  +        *name = apr_pstrdup(sock->cntxt, hptr->h_name);
           if (*name) {
               return APR_SUCCESS;
           }
  
  
  
  1.13      +7 -7      apache-2.0/src/lib/apr/network_io/win32/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/networkio.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- networkio.h	2000/08/01 20:59:52	1.12
  +++ networkio.h	2000/08/02 05:26:31	1.13
  @@ -58,20 +58,20 @@
   #include "apr_network_io.h"
   #include "apr_general.h"
   
  -struct ap_socket_t {
  -    ap_pool_t *cntxt;
  +struct apr_socket_t {
  +    apr_pool_t *cntxt;
       SOCKET sock;
       struct sockaddr_in *local_addr;
       struct sockaddr_in *remote_addr;
       size_t addr_len;
  -    ap_interval_time_t timeout;
  -    ap_int32_t disconnected;
  +    apr_interval_time_t timeout;
  +    apr_int32_t disconnected;
       int local_port_unknown;
       int local_interface_unknown;
   };
   
  -struct ap_pollfd_t {
  -    ap_pool_t *cntxt;
  +struct apr_pollfd_t {
  +    apr_pool_t *cntxt;
       fd_set *read;
       int numread;
       fd_set *write;
  @@ -80,7 +80,7 @@
       int numexcept;    
   };
   
  -ap_status_t status_from_res_error(int);
  +apr_status_t status_from_res_error(int);
   
   #endif  /* ! NETWORK_IO_H */
   
  
  
  
  1.19      +23 -23    apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- poll.c	2000/07/08 11:31:49	1.18
  +++ poll.c	2000/08/02 05:26:31	1.19
  @@ -60,16 +60,16 @@
   #include <time.h>
   
   
  -ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_pool_t *cont)
  +apr_status_t apr_setup_poll(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  -    (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num);
  +    (*new) = (apr_pollfd_t *)apr_palloc(cont, sizeof(apr_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont;
  -    (*new)->read = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  -    (*new)->write = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  -    (*new)->except = (fd_set *)ap_palloc(cont, sizeof(fd_set));
  +    (*new)->read = (fd_set *)apr_palloc(cont, sizeof(fd_set));
  +    (*new)->write = (fd_set *)apr_palloc(cont, sizeof(fd_set));
  +    (*new)->except = (fd_set *)apr_palloc(cont, sizeof(fd_set));
       FD_ZERO((*new)->read);
       (*new)->numread = 0;
       FD_ZERO((*new)->write);
  @@ -79,8 +79,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, 
  -			       ap_socket_t *sock, ap_int16_t event)
  +apr_status_t apr_add_poll_socket(apr_pollfd_t *aprset, 
  +			       apr_socket_t *sock, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->sock, aprset->read);
  @@ -97,8 +97,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, 
  -                    ap_interval_time_t timeout)
  +apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds, 
  +                    apr_interval_time_t timeout)
   {
       int rv;
       struct timeval tv, *tvptr;
  @@ -118,7 +118,7 @@
   
       if (newread == NULL && newwrite == NULL && newexcept == NULL) {
           Sleep(timeout / 1000); /* convert microseconds into milliseconds */
  -        return APR_TIMEUP; /* TODO - get everybody in synch with Win32 ap_status_t */
  +        return APR_TIMEUP; /* TODO - get everybody in synch with Win32 apr_status_t */
       }
       else {
           if (timeout < 0) {
  @@ -140,9 +140,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset)
  +apr_status_t apr_get_revents(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
   {
  -    ap_int16_t revents = 0;
  +    apr_int16_t revents = 0;
       WSABUF data;
       int dummy;
       int flags = MSG_PEEK;
  @@ -151,7 +151,7 @@
        * variable here.
        */
       data.len = 256;
  -    data.buf = (char *)ap_palloc(aprset->cntxt, 256);
  +    data.buf = (char *)apr_palloc(aprset->cntxt, 256);
   
       if (FD_ISSET(sock->sock, aprset->read)) {
           revents |= APR_POLLIN;
  @@ -193,19 +193,19 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, const char *key, void *data)
  +apr_status_t apr_get_polldata(apr_pollfd_t *pollfd, const char *key, void *data)
   {
  -    return ap_get_userdata(data, key, pollfd->cntxt);
  +    return apr_get_userdata(data, key, pollfd->cntxt);
   }
   
  -ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, const char *key,
  -                            ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_polldata(apr_pollfd_t *pollfd, void *data, const char *key,
  +                            apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, pollfd->cntxt);
  +    return apr_set_userdata(data, key, cleanup, pollfd->cntxt);
   }
   
  -ap_status_t ap_mask_poll_socket(ap_pollfd_t *aprset, 
  -                                ap_socket_t *sock, ap_int16_t events)
  +apr_status_t apr_mask_poll_socket(apr_pollfd_t *aprset, 
  +                                apr_socket_t *sock, apr_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_CLR(sock->sock, aprset->read);
  @@ -222,12 +222,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
  +apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
  -    return ap_mask_poll_socket(aprset, sock, ~0);
  +    return apr_mask_poll_socket(aprset, sock, ~0);
   }
   
  -ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events)
  +apr_status_t apr_clear_poll_sockets(apr_pollfd_t *aprset, apr_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_ZERO(aprset->read);
  
  
  
  1.23      +15 -15    apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- sendrecv.c	2000/08/01 19:33:17	1.22
  +++ sendrecv.c	2000/08/02 05:26:31	1.23
  @@ -60,9 +60,9 @@
   #include "fileio.h"
   #include <time.h>
   
  -ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len)
  +apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
       WSABUF wsaData;
       int lasterror;
       DWORD dwBytes = 0;
  @@ -81,9 +81,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len) 
  +apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len) 
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
       WSABUF wsaData;
       int lasterror;
       DWORD dwBytes = 0;
  @@ -104,10 +104,10 @@
   
   }
   
  -ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec,
  -                     ap_int32_t nvec, ap_int32_t *nbytes)
  +apr_status_t apr_sendv(apr_socket_t *sock, const struct iovec *vec,
  +                     apr_int32_t nvec, apr_int32_t *nbytes)
   {
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
       int i;
       int lasterror;
       DWORD dwBytes = 0;
  @@ -136,8 +136,8 @@
   }
   #if APR_HAS_SENDFILE
   /*
  - * ap_status_t ap_sendfile(ap_socket_t *, ap_file_t *, ap_hdtr_t *, 
  - *                         ap_off_t *, ap_size_t *, ap_int32_t flags)
  + * apr_status_t ap_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, 
  + *                         apr_off_t *, apr_size_t *, apr_int32_t flags)
    *    Send a file from an open file descriptor to a socket, along with 
    *    optional headers and trailers
    * arg 1) The socket to which we're writing
  @@ -147,9 +147,9 @@
    * arg 5) Number of bytes to send 
    * arg 6) APR flags that are mapped to OS specific flags
    */
  -ap_status_t ap_sendfile(ap_socket_t * sock, ap_file_t * file,
  -        		ap_hdtr_t * hdtr, ap_off_t * offset, ap_size_t * len,
  -        		ap_int32_t flags) 
  +apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +        		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
  +        		apr_int32_t flags) 
   {
   /*
    *#define WAIT_FOR_EVENT
  @@ -162,7 +162,7 @@
    * socket timeout code will work. I am hoping the socket will be signaled if the
    * setsockopt timeout expires. Need to verify this...
    */
  -    ap_ssize_t rv;
  +    apr_ssize_t rv;
       OVERLAPPED overlapped;
       TRANSMIT_FILE_BUFFERS tfb, *ptfb = NULL;
       int i, ptr = 0;
  @@ -188,7 +188,7 @@
               for (i = 0; i < hdtr->numheaders; i++) {
                   ptfb->HeadLength += hdtr->headers[i].iov_len;
               }
  -            ptfb->Head = ap_palloc(sock->cntxt, ptfb->HeadLength); /* Should this be a malloc? */
  +            ptfb->Head = apr_palloc(sock->cntxt, ptfb->HeadLength); /* Should this be a malloc? */
   
               for (i = 0; i < hdtr->numheaders; i++) {
                   memcpy((char*)ptfb->Head + ptr, hdtr->headers[i].iov_base,
  @@ -209,7 +209,7 @@
                   ptfb->TailLength += hdtr->headers[i].iov_len;
               }
   
  -            ptfb->Tail = ap_palloc(sock->cntxt, ptfb->TailLength); /* Should this be a malloc? */
  +            ptfb->Tail = apr_palloc(sock->cntxt, ptfb->TailLength); /* Should this be a malloc? */
   
               for (i = 0; i < hdtr->numtrailers; i++) {
                   memcpy((char*)ptfb->Tail + ptr, hdtr->trailers[i].iov_base,
  
  
  
  1.11      +16 -16    apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sockaddr.c	2000/08/01 20:59:52	1.10
  +++ sockaddr.c	2000/08/02 05:26:31	1.11
  @@ -58,7 +58,7 @@
   #include "apr_strings.h"
   #include <string.h>
   
  -static ap_status_t get_local_addr(ap_socket_t *sock)
  +static apr_status_t get_local_addr(apr_socket_t *sock)
   {
       size_t namelen = sizeof(*sock->local_addr);
   
  @@ -74,7 +74,7 @@
   
   
   
  -ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_local_port(apr_socket_t *sock, apr_uint32_t port)
   {
       sock->local_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -82,7 +82,7 @@
   
   
   
  -ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port)
  +apr_status_t apr_set_remote_port(apr_socket_t *sock, apr_uint32_t port)
   {
       sock->remote_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -90,10 +90,10 @@
   
   
   
  -ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_local_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       if (sock->local_port_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
  @@ -106,7 +106,7 @@
   
   
   
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock)
  +apr_status_t apr_get_remote_port(apr_uint32_t *port, apr_socket_t *sock)
   {
       *port = ntohs(sock->remote_addr->sin_port);
       return APR_SUCCESS;
  @@ -114,7 +114,7 @@
   
   
   
  -ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_local_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -133,7 +133,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
  +apr_status_t apr_set_remote_ipaddr(apr_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -152,33 +152,33 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_local_ipaddr(char **addr, apr_socket_t *sock)
   {
       if (sock->local_interface_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
           }
       }
   
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
  +apr_status_t apr_get_remote_ipaddr(char **addr, apr_socket_t *sock)
   {
  -    *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
  +    *addr = apr_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_local_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       if (sock->local_port_unknown || sock->local_interface_unknown) {
  -        ap_status_t rv = get_local_addr(sock);
  +        apr_status_t rv = get_local_addr(sock);
   
           if (rv != APR_SUCCESS) {
               return rv;
  @@ -191,7 +191,7 @@
   
   
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_name(struct sockaddr_in **name, apr_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.36      +32 -32    apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- sockets.c	2000/08/01 20:59:52	1.35
  +++ sockets.c	2000/08/02 05:26:31	1.36
  @@ -60,9 +60,9 @@
   #include <string.h>
   
   
  -static ap_status_t socket_cleanup(void *sock)
  +static apr_status_t socket_cleanup(void *sock)
   {
  -    ap_socket_t *thesocket = sock;
  +    apr_socket_t *thesocket = sock;
   
       if (thesocket->sock != INVALID_SOCKET) {
           if (closesocket(thesocket->sock) == SOCKET_ERROR) {
  @@ -73,17 +73,17 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_tcp_socket(apr_socket_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_socket_t *)ap_pcalloc(cont, sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_pcalloc(cont, sizeof(apr_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
       (*new)->cntxt = cont; 
  -    (*new)->local_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
  +    (*new)->local_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt,
                                                             sizeof(struct sockaddr_in));
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt,
                             sizeof(struct sockaddr_in));
   
       if (((*new)->local_addr == NULL) || ((*new)->remote_addr == NULL)) {
  @@ -107,13 +107,13 @@
       (*new)->timeout = -1;
       (*new)->disconnected = 0;
   
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
   
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
   {
       int winhow;
   
  @@ -139,13 +139,13 @@
       }
   }
   
  -ap_status_t ap_close_socket(ap_socket_t *thesocket)
  +apr_status_t apr_close_socket(apr_socket_t *thesocket)
   {
  -    ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
  +    apr_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
  -ap_status_t ap_bind(ap_socket_t *sock)
  +apr_status_t apr_bind(apr_socket_t *sock)
   {
       if (bind(sock->sock, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) {
           return WSAGetLastError();
  @@ -158,7 +158,7 @@
       }
   }
   
  -ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
  +apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog)
   {
       if (listen(sock->sock, backlog) == SOCKET_ERROR)
           return WSAGetLastError();
  @@ -166,15 +166,15 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
  +apr_status_t apr_accept(apr_socket_t **new, apr_socket_t *sock, apr_pool_t *connection_context)
   {
  -    (*new) = (ap_socket_t *)ap_pcalloc(connection_context, 
  -                            sizeof(ap_socket_t));
  +    (*new) = (apr_socket_t *)apr_pcalloc(connection_context, 
  +                            sizeof(apr_socket_t));
   
       (*new)->cntxt = connection_context;
  -    (*new)->local_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt, 
  +    (*new)->local_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt, 
                    sizeof(struct sockaddr_in));
  -    (*new)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*new)->cntxt,
  +    (*new)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*new)->cntxt,
                    sizeof(struct sockaddr_in));
       memcpy((*new)->local_addr, sock->local_addr, sizeof(struct sockaddr_in));
   
  @@ -207,12 +207,12 @@
           (*new)->local_interface_unknown = 1;
       }
   
  -    ap_register_cleanup((*new)->cntxt, (void *)(*new), 
  -                        socket_cleanup, ap_null_cleanup);
  +    apr_register_cleanup((*new)->cntxt, (void *)(*new), 
  +                        socket_cleanup, apr_null_cleanup);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_connect(ap_socket_t *sock, char *hostname)
  +apr_status_t apr_connect(apr_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
       int lasterror;
  @@ -263,35 +263,35 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_socketdata(void **data, const char *key, ap_socket_t *socket)
  +apr_status_t apr_get_socketdata(void **data, const char *key, apr_socket_t *socket)
   {
  -    return ap_get_userdata(data, key, socket->cntxt);
  +    return apr_get_userdata(data, key, socket->cntxt);
   }
   
  -ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, const char *key, 
  -                              ap_status_t (*cleanup) (void *))
  +apr_status_t apr_set_socketdata(apr_socket_t *socket, void *data, const char *key, 
  +                              apr_status_t (*cleanup) (void *))
   {
  -    return ap_set_userdata(data, key, cleanup, socket->cntxt);
  +    return apr_set_userdata(data, key, cleanup, socket->cntxt);
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock)
  +apr_status_t apr_get_os_sock(apr_os_sock_t *thesock, apr_socket_t *sock)
   {
       *thesock = sock->sock;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, 
  -                           ap_pool_t *cont)
  +apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, 
  +                           apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (ap_socket_t *)ap_pcalloc(cont, sizeof(ap_socket_t));
  +        (*sock) = (apr_socket_t *)apr_pcalloc(cont, sizeof(apr_socket_t));
           (*sock)->cntxt = cont;
  -        (*sock)->local_addr = (struct sockaddr_in *)ap_pcalloc((*sock)->cntxt,
  +        (*sock)->local_addr = (struct sockaddr_in *)apr_pcalloc((*sock)->cntxt,
                                sizeof(struct sockaddr_in));
  -        (*sock)->remote_addr = (struct sockaddr_in *)ap_pcalloc((*sock)->cntxt,
  +        (*sock)->remote_addr = (struct sockaddr_in *)apr_pcalloc((*sock)->cntxt,
                                 sizeof(struct sockaddr_in));
   
           if ((*sock)->local_addr == NULL || (*sock)->remote_addr == NULL) {
  
  
  
  1.22      +8 -8      apache-2.0/src/lib/apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sockopt.c	2000/07/25 00:42:14	1.21
  +++ sockopt.c	2000/08/02 05:26:31	1.22
  @@ -58,7 +58,7 @@
   #include "apr_strings.h"
   #include <string.h>
   
  -ap_status_t soblock(SOCKET sd)
  +apr_status_t soblock(SOCKET sd)
   {
       int zero = 0;
   
  @@ -68,7 +68,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t sononblock(SOCKET sd)
  +apr_status_t sononblock(SOCKET sd)
   {
       int one = 1;
   
  @@ -78,10 +78,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on)
   {
       int one;
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       one = on ? 1 : 0;
   
  @@ -166,7 +166,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t *on)
  +apr_status_t apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t *on)
   {
       switch (opt) {
       case APR_SO_TIMEOUT: 
  @@ -190,7 +190,7 @@
   }
   
   
  -ap_status_t ap_gethostname(char *buf, int len, ap_pool_t *cont)
  +apr_status_t apr_gethostname(char *buf, int len, apr_pool_t *cont)
   {
       if (gethostname(buf, len) == -1)
           return WSAGetLastError();
  @@ -198,7 +198,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
  +apr_status_t apr_get_remote_hostname(char **name, apr_socket_t *sock)
   {
       struct hostent *hptr;
   
  @@ -206,7 +206,7 @@
                            sizeof(struct in_addr), AF_INET);
   
       if (hptr != NULL) {
  -        *name = ap_pstrdup(sock->cntxt, hptr->h_name);
  +        *name = apr_pstrdup(sock->cntxt, hptr->h_name);
           if (*name) {
               return APR_SUCCESS;
           }
  
  
  
  1.2       +3 -3      apache-2.0/src/lib/apr/passwd/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/passwd/apr_getpass.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_getpass.c	2000/07/24 22:37:14	1.1
  +++ apr_getpass.c	2000/08/02 05:26:32	1.2
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -/* ap_getpass.c: abstraction to provide for obtaining a password from the
  +/* apr_getpass.c: abstraction to provide for obtaining a password from the
    * command line in whatever way the OS supports.  In the best case, it's a
    * wrapper for the system library's getpass() routine; otherwise, we
    * use one we define ourselves.
  @@ -204,7 +204,7 @@
    * but the caller is *not* made aware of it.
    */
   
  -APR_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsiz)
  +APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsiz)
   {
       char *pw_got = NULL;
       int result = 0;
  @@ -214,7 +214,7 @@
   	*bufsiz = ERR_OVERFLOW;
           return APR_ENAMETOOLONG;
       }
  -    ap_cpystrn(pwbuf, pw_got, *bufsiz);
  +    apr_cpystrn(pwbuf, pw_got, *bufsiz);
       *bufsiz = result;
       return APR_SUCCESS; 
   }
  
  
  
  1.2       +40 -40    apache-2.0/src/lib/apr/passwd/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/passwd/apr_md5.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_md5.c	2000/07/24 22:37:14	1.1
  +++ apr_md5.c	2000/08/02 05:26:32	1.2
  @@ -86,7 +86,7 @@
    */
   
   /*
  - * The ap_MD5Encode() routine uses much code obtained from the FreeBSD 3.0
  + * The apr_MD5Encode() routine uses much code obtained from the FreeBSD 3.0
    * MD5 crypt() function, which is licenced as follows:
    * ----------------------------------------------------------------------------
    * "THE BEER-WARE LICENSE" (Revision 42):
  @@ -146,7 +146,7 @@
   };
   
   #ifdef CHARSET_EBCDIC
  -static ap_xlate_t *xlate_ebcdic_to_ascii; /* used in ap_MD5Encode() */
  +static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_MD5Encode() */
   #endif
   
   /* F, G, H and I are basic MD5 functions.
  @@ -186,7 +186,7 @@
   
   /* MD5 initialization. Begins an MD5 operation, writing a new context.
    */
  -APR_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context)
  +APR_EXPORT(apr_status_t) apr_MD5Init(ap_md5_ctx_t *context)
   {
       context->count[0] = context->count[1] = 0;
       /* Load magic initialization constants. */
  @@ -205,9 +205,9 @@
    * to be used for translating the content before calculating the
    * digest.
    */
  -APR_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate)
  +APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       int is_sb;
   
       /* TODO: remove the single-byte-only restriction from this code
  @@ -228,13 +228,13 @@
      operation, processing another message block, and updating the
      context.
    */
  -APR_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context,
  +APR_EXPORT(apr_status_t) apr_MD5Update(ap_md5_ctx_t *context,
                                        const unsigned char *input,
                                        unsigned int inputLen)
   {
       unsigned int i, idx, partLen;
   #if APR_HAS_XLATE
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_size_t inbytes_left, outbytes_left;
   #endif
   
       /* Compute number of bytes mod 64 */
  @@ -309,7 +309,7 @@
   /* MD5 finalization. Ends an MD5 message-digest operation, writing the
      the message digest and zeroizing the context.
    */
  -APR_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  +APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
                                       ap_md5_ctx_t *context)
   {
       unsigned char bits[8];
  @@ -319,17 +319,17 @@
       Encode(bits, context->count, 8);
   
   #if APR_HAS_XLATE
  -    /* ap_MD5Update() should not translate for this final round. */
  +    /* apr_MD5Update() should not translate for this final round. */
       context->xlate = NULL;
   #endif /*APR_HAS_XLATE*/
   
       /* Pad out to 56 mod 64. */
       idx = (unsigned int) ((context->count[0] >> 3) & 0x3f);
       padLen = (idx < 56) ? (56 - idx) : (120 - idx);
  -    ap_MD5Update(context, PADDING, padLen);
  +    apr_MD5Update(context, PADDING, padLen);
   
       /* Append length (before padding) */
  -    ap_MD5Update(context, bits, 8);
  +    apr_MD5Update(context, bits, 8);
   
       /* Store state in digest */
       Encode(digest, context->state, MD5_DIGESTSIZE);
  @@ -459,7 +459,7 @@
   }
   
   #ifdef CHARSET_EBCDIC
  -APR_EXPORT(ap_status_t) ap_MD5InitEBCDIC(ap_xlate_t *xlate)
  +APR_EXPORT(apr_status_t) ap_MD5InitEBCDIC(apr_xlate_t *xlate)
   {
       xlate_ebcdic_to_ascii = xlate;
       return APR_SUCCESS;
  @@ -489,7 +489,7 @@
       }
   }
   
  -APR_EXPORT(ap_status_t) ap_MD5Encode(const char *pw, const char *salt,
  +APR_EXPORT(apr_status_t) apr_MD5Encode(const char *pw, const char *salt,
                                char *result, size_t nbytes)
   {
       /*
  @@ -534,7 +534,7 @@
       /*
        * 'Time to make the doughnuts..'
        */
  -    ap_MD5Init(&ctx);
  +    apr_MD5Init(&ctx);
   #ifdef CHARSET_EBCDIC
       ap_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii);
   #endif
  @@ -542,28 +542,28 @@
       /*
        * The password first, since that is what is most unknown
        */
  -    ap_MD5Update(&ctx, (unsigned char *)pw, strlen(pw));
  +    apr_MD5Update(&ctx, (unsigned char *)pw, strlen(pw));
   
       /*
        * Then our magic string
        */
  -    ap_MD5Update(&ctx, (unsigned char *)apr1_id, strlen(apr1_id));
  +    apr_MD5Update(&ctx, (unsigned char *)apr1_id, strlen(apr1_id));
   
       /*
        * Then the raw salt
        */
  -    ap_MD5Update(&ctx, (unsigned char *)sp, sl);
  +    apr_MD5Update(&ctx, (unsigned char *)sp, sl);
   
       /*
        * Then just as many characters of the MD5(pw, salt, pw)
        */
  -    ap_MD5Init(&ctx1);
  -    ap_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  -    ap_MD5Update(&ctx1, (unsigned char *)sp, sl);
  -    ap_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  -    ap_MD5Final(final, &ctx1);
  +    apr_MD5Init(&ctx1);
  +    apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  +    apr_MD5Update(&ctx1, (unsigned char *)sp, sl);
  +    apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  +    apr_MD5Final(final, &ctx1);
       for (pl = strlen(pw); pl > 0; pl -= MD5_DIGESTSIZE) {
  -	ap_MD5Update(&ctx, final, (pl > MD5_DIGESTSIZE) ? MD5_DIGESTSIZE : pl);
  +	apr_MD5Update(&ctx, final, (pl > MD5_DIGESTSIZE) ? MD5_DIGESTSIZE : pl);
       }
   
       /*
  @@ -576,10 +576,10 @@
        */
       for (i = strlen(pw); i != 0; i >>= 1) {
   	if (i & 1) {
  -	    ap_MD5Update(&ctx, final, 1);
  +	    apr_MD5Update(&ctx, final, 1);
   	}
   	else {
  -	    ap_MD5Update(&ctx, (unsigned char *)pw, 1);
  +	    apr_MD5Update(&ctx, (unsigned char *)pw, 1);
   	}
       }
   
  @@ -591,7 +591,7 @@
       strncat(passwd, sp, sl);
       strcat(passwd, "$");
   
  -    ap_MD5Final(final, &ctx);
  +    apr_MD5Final(final, &ctx);
   
       /*
        * And now, just to make sure things don't run too fast..
  @@ -599,28 +599,28 @@
        * need 30 seconds to build a 1000 entry dictionary...
        */
       for (i = 0; i < 1000; i++) {
  -	ap_MD5Init(&ctx1);
  +	apr_MD5Init(&ctx1);
   	if (i & 1) {
  -	    ap_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  +	    apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
   	}
   	else {
  -	    ap_MD5Update(&ctx1, final, MD5_DIGESTSIZE);
  +	    apr_MD5Update(&ctx1, final, MD5_DIGESTSIZE);
   	}
   	if (i % 3) {
  -	    ap_MD5Update(&ctx1, (unsigned char *)sp, sl);
  +	    apr_MD5Update(&ctx1, (unsigned char *)sp, sl);
   	}
   
   	if (i % 7) {
  -	    ap_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  +	    apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
   	}
   
   	if (i & 1) {
  -	    ap_MD5Update(&ctx1, final, MD5_DIGESTSIZE);
  +	    apr_MD5Update(&ctx1, final, MD5_DIGESTSIZE);
   	}
   	else {
  -	    ap_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
  +	    apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
   	}
  -	ap_MD5Final(final,&ctx1);
  +	apr_MD5Final(final,&ctx1);
       }
   
       p = passwd + strlen(passwd);
  @@ -638,18 +638,18 @@
        */
       memset(final, 0, sizeof(final));
   
  -    ap_cpystrn(result, passwd, nbytes - 1);
  +    apr_cpystrn(result, passwd, nbytes - 1);
       return APR_SUCCESS;
   }
   
   /*
    * Validate a plaintext password against a smashed one.  Use either
  - * crypt() (if available) or ap_MD5Encode(), depending upon the format
  + * crypt() (if available) or apr_MD5Encode(), depending upon the format
    * of the smashed input password.  Return APR_SUCCESS if they match, or
    * APR_EMISMATCH if they don't.
    */
   
  -APR_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash)
  +APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, const char *hash)
   {
       char sample[120];
   #if !defined(WIN32) && !defined(BEOS)
  @@ -659,17 +659,17 @@
   	/*
   	 * The hash was created using our custom algorithm.
   	 */
  -	ap_MD5Encode(passwd, hash, sample, sizeof(sample));
  +	apr_MD5Encode(passwd, hash, sample, sizeof(sample));
       }
       else {
   	/*
   	 * It's not our algorithm, so feed it to crypt() if possible.
   	 */
   #if defined(WIN32) || defined(BEOS)
  -	ap_cpystrn(sample, passwd, sizeof(sample) - 1);
  +	apr_cpystrn(sample, passwd, sizeof(sample) - 1);
   #else
   	crypt_pw = crypt(passwd, hash);
  -	ap_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
  +	apr_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
   #endif
       }
       return (strcmp(sample, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
  
  
  
  1.6       +11 -11    apache-2.0/src/lib/apr/shmem/os2/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/os2/shmem.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- shmem.c	2000/05/29 09:02:50	1.5
  +++ shmem.c	2000/08/02 05:26:33	1.6
  @@ -68,14 +68,14 @@
   
   
   
  -ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont)
  +apr_status_t apr_shm_init(struct shmem_t **m, apr_size_t reqsize, const char *file, apr_pool_t *cont)
   {
       int rc;
  -    struct shmem_t *newm = (struct shmem_t *)ap_palloc(cont, sizeof(struct shmem_t));
  +    struct shmem_t *newm = (struct shmem_t *)apr_palloc(cont, sizeof(struct shmem_t));
       char *name = NULL;
   
       if (file)
  -        name = ap_pstrcat(cont, "\\SHAREMEM\\", file, NULL);
  +        name = apr_pstrcat(cont, "\\SHAREMEM\\", file, NULL);
   
       rc = DosAllocSharedMem(&(newm->memblock), name, reqsize, PAG_COMMIT|OBJ_GETTABLE|PAG_READ|PAG_WRITE);
   
  @@ -90,7 +90,7 @@
   
   
   
  -ap_status_t ap_shm_destroy(struct shmem_t *m)
  +apr_status_t apr_shm_destroy(struct shmem_t *m)
   {
       _uclose(m->heap);
       _udestroy(m->heap, _FORCE);
  @@ -100,21 +100,21 @@
   
   
   
  -void *ap_shm_malloc(struct shmem_t *m, ap_size_t reqsize)
  +void *apr_shm_malloc(struct shmem_t *m, apr_size_t reqsize)
   {
       return _umalloc(m->heap, reqsize);
   }
   
   
   
  -void *ap_shm_calloc(struct shmem_t *m, ap_size_t size)
  +void *apr_shm_calloc(struct shmem_t *m, apr_size_t size)
   {
       return _ucalloc(m->heap, size, 1);
   }
   
   
   
  -ap_status_t ap_shm_free(struct shmem_t *m, void *entity)
  +apr_status_t apr_shm_free(struct shmem_t *m, void *entity)
   {
       free(entity);
       return APR_SUCCESS;
  @@ -122,7 +122,7 @@
   
   
   
  -ap_status_t ap_get_shm_name(ap_shmem_t *c, ap_shm_name_t **name)
  +apr_status_t apr_get_shm_name(apr_shmem_t *c, apr_shm_name_t **name)
   {
       *name = NULL;
       return APR_ANONYMOUS;
  @@ -130,14 +130,14 @@
   
   
   
  -ap_status_t ap_set_shm_name(ap_shmem_t *c, ap_shm_name_t *name)
  +apr_status_t apr_set_shm_name(apr_shmem_t *c, apr_shm_name_t *name)
   {
       return APR_ANONYMOUS;
   }
   
   
   
  -ap_status_t ap_open_shmem(struct shmem_t *m)
  +apr_status_t apr_open_shmem(struct shmem_t *m)
   {
       int rc;
   
  @@ -152,7 +152,7 @@
   
   
   
  -ap_status_t ap_shm_avail(struct shmem_t *c, ap_size_t *size)
  +apr_status_t apr_shm_avail(struct shmem_t *c, apr_size_t *size)
   {
   
       return APR_ENOTIMPL;
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- shmem.c	2000/05/29 09:02:52	1.13
  +++ shmem.c	2000/08/02 05:26:33	1.14
  @@ -61,7 +61,7 @@
       MM *mm;
   };
   
  -ap_status_t ap_shm_init(struct shmem_t **m, ap_size_t reqsize, const char *file, ap_pool_t *cont)
  +apr_status_t apr_shm_init(struct shmem_t **m, apr_size_t reqsize, const char *file, apr_pool_t *cont)
   {
       MM *newmm = mm_create(reqsize, file);
       if (newmm == NULL) {
  @@ -72,13 +72,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_shm_destroy(struct shmem_t *m)
  +apr_status_t apr_shm_destroy(struct shmem_t *m)
   {
       mm_destroy(m->mm);
       return APR_SUCCESS;
   }
   
  -void *ap_shm_malloc(struct shmem_t *c, ap_size_t reqsize)
  +void *apr_shm_malloc(struct shmem_t *c, apr_size_t reqsize)
   {
       if (c->mm == NULL) {
           return NULL;
  @@ -86,7 +86,7 @@
       return mm_malloc(c->mm, reqsize);
   }
   
  -void *ap_shm_calloc(struct shmem_t *shared, ap_size_t size) 
  +void *apr_shm_calloc(struct shmem_t *shared, apr_size_t size) 
   {
       if (shared == NULL) {
           return NULL;
  @@ -94,13 +94,13 @@
       return mm_calloc(shared->mm, 1, size);
   }
   
  -ap_status_t ap_shm_free(struct shmem_t *shared, void *entity)
  +apr_status_t apr_shm_free(struct shmem_t *shared, void *entity)
   {
       mm_free(shared->mm, entity);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_shm_name(ap_shmem_t *c, ap_shm_name_t **name)
  +apr_status_t apr_get_shm_name(apr_shmem_t *c, apr_shm_name_t **name)
   {
   #if APR_USES_ANONYMOUS_SHM
       *name = NULL;
  @@ -115,7 +115,7 @@
   #endif
   }
   
  -ap_status_t ap_set_shm_name(ap_shmem_t *c, ap_shm_name_t *name)
  +apr_status_t apr_set_shm_name(apr_shmem_t *c, apr_shm_name_t *name)
   {
   #if APR_USES_ANONYMOUS_SHM
       return APR_ANONYMOUS;
  @@ -129,7 +129,7 @@
   #endif
   }
   
  -ap_status_t ap_open_shmem(struct shmem_t *c)
  +apr_status_t apr_open_shmem(struct shmem_t *c)
   {
   #if APR_USES_ANONYMOUS_SHM
   /* When using MM, we don't need to open shared memory segments in child
  @@ -146,7 +146,7 @@
   #endif
   }
   
  -ap_status_t ap_shm_avail(struct shmem_t *c, ap_size_t *size)
  +apr_status_t apr_shm_avail(struct shmem_t *c, apr_size_t *size)
   {
       *size = mm_available(c);
       if (*size == 0) {
  
  
  
  1.2       +10 -10    apache-2.0/src/lib/apr/strings/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_cpystrn.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_cpystrn.c	2000/07/21 19:50:45	1.1
  +++ apr_cpystrn.c	2000/08/02 05:26:34	1.2
  @@ -77,10 +77,10 @@
    *       the destination string, we return a pointer to the
    *       terminating '\0' to allow us to "check" for truncation
    *
  - * ap_cpystrn() follows the same call structure as strncpy().
  + * apr_cpystrn() follows the same call structure as strncpy().
    */
   
  -APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size)
  +APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size)
   {
   
       char *d, *end;
  @@ -120,9 +120,9 @@
    *                   pool and filled in with copies of the tokens
    *                   found during parsing of the arg_str. 
    */
  -APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, 
  +APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
                                               char ***argv_out,
  -                                            ap_pool_t *token_context)
  +                                            apr_pool_t *token_context)
   {
       const char *cp;
       const char *tmpCnt;
  @@ -172,7 +172,7 @@
           SKIP_WHITESPACE(tmpCnt);
       }
   
  -    *argv_out = ap_palloc(token_context, numargs*sizeof(char*));
  +    *argv_out = apr_palloc(token_context, numargs*sizeof(char*));
       if (*argv_out == NULL) {
           return (APR_ENOMEM);
       }
  @@ -184,15 +184,15 @@
           tmpCnt = cp;
           DETERMINE_NEXTSTRING(cp, isquoted);
           if (*cp == '\0') {
  -            (*argv_out)[numargs] = ap_pstrdup(token_context, tmpCnt);
  +            (*argv_out)[numargs] = apr_pstrdup(token_context, tmpCnt);
               numargs++;
               (*argv_out)[numargs] = '\0';
               break;
           }
           else {
               cp++;
  -            (*argv_out)[numargs] = ap_palloc(token_context, cp - tmpCnt);
  -            ap_cpystrn((*argv_out)[numargs], tmpCnt, cp - tmpCnt);
  +            (*argv_out)[numargs] = apr_palloc(token_context, cp - tmpCnt);
  +            apr_cpystrn((*argv_out)[numargs], tmpCnt, cp - tmpCnt);
               numargs++;
           }
           
  @@ -212,7 +212,7 @@
    * Corrected Win32 to accept "a/b\\stuff", "a:stuff"
    */
   
  -APR_EXPORT(const char *) ap_filename_of_pathname(const char *pathname)
  +APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname)
   {
       const char path_separator = '/';
       const char *s = strrchr(pathname, path_separator);
  @@ -234,7 +234,7 @@
    * collapse in place (src == dest) is legal.
    * returns terminating null ptr to dest string.
    */
  -APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src)
  +APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src)
   {
       while (*src) {
           if (!ap_isspace(*src)) 
  
  
  
  1.2       +3 -3      apache-2.0/src/lib/apr/strings/apr_fnmatch.c
  
  Index: apr_fnmatch.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_fnmatch.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_fnmatch.c	2000/07/21 20:05:58	1.1
  +++ apr_fnmatch.c	2000/08/02 05:26:34	1.2
  @@ -56,7 +56,7 @@
   
   static const char *rangematch(const char *, int, int);
   
  -APR_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *string, int flags)
  +APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
   {
       const char *stringstart;
       char c, test;
  @@ -110,7 +110,7 @@
   
   	    /* General case, use recursion. */
   	    while ((test = *string) != EOS) {
  -	        if (!ap_fnmatch(pattern, string, flags & ~FNM_PERIOD)) {
  +	        if (!apr_fnmatch(pattern, string, flags & ~FNM_PERIOD)) {
   		    return (APR_SUCCESS);
   		}
   		if (test == '/' && flags & FNM_PATHNAME) {
  @@ -210,7 +210,7 @@
   
   /* This function is an Apache addition */
   /* return non-zero if pattern has any glob chars in it */
  -APR_EXPORT(int) ap_is_fnmatch(const char *pattern)
  +APR_EXPORT(int) apr_is_fnmatch(const char *pattern)
   {
       int nesting;
   
  
  
  
  1.3       +11 -11    apache-2.0/src/lib/apr/strings/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_snprintf.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_snprintf.c	2000/07/25 01:33:26	1.2
  +++ apr_snprintf.c	2000/08/02 05:26:34	1.3
  @@ -51,7 +51,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - * The ap_vsnprintf/ap_snprintf functions are based on, and used with the
  + * The apr_vsnprintf/apr_snprintf functions are based on, and used with the
    * permission of, the  SIO stdio-replacement strx_* functions by Panos
    * Tsirigotis <panos@alumni.cs.colorado.edu> for xinetd.
    */
  @@ -656,8 +656,8 @@
   /*
    * Do format conversion placing the output in buffer
    */
  -APR_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *),
  -    ap_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
  +APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
  +    apr_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
   {
       register char *sp;
       register char *bep;
  @@ -1149,21 +1149,21 @@
   }
   
   
  -static int snprintf_flush(ap_vformatter_buff_t *vbuff)
  +static int snprintf_flush(apr_vformatter_buff_t *vbuff)
   {
       /* if the buffer fills we have to abort immediately, there is no way
  -     * to "flush" an ap_snprintf... there's nowhere to flush it to.
  +     * to "flush" an apr_snprintf... there's nowhere to flush it to.
        */
       return -1;
   }
   
   
  -APR_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, 
  +APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, 
                                      const char *format, ...)
   {
       int cc;
       va_list ap;
  -    ap_vformatter_buff_t vbuff;
  +    apr_vformatter_buff_t vbuff;
   
       if (len == 0)
   	return 0;
  @@ -1172,18 +1172,18 @@
       vbuff.curpos = buf;
       vbuff.endpos = buf + len - 1;
       va_start(ap, format);
  -    cc = ap_vformatter(snprintf_flush, &vbuff, format, ap);
  +    cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
       va_end(ap);
       *vbuff.curpos = '\0';
       return (cc == -1) ? len : cc;
   }
   
   
  -APR_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  +APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format,
   			     va_list ap)
   {
       int cc;
  -    ap_vformatter_buff_t vbuff;
  +    apr_vformatter_buff_t vbuff;
   
       if (len == 0)
   	return 0;
  @@ -1191,7 +1191,7 @@
       /* save one byte for nul terminator */
       vbuff.curpos = buf;
       vbuff.endpos = buf + len - 1;
  -    cc = ap_vformatter(snprintf_flush, &vbuff, format, ap);
  +    cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
       *vbuff.curpos = '\0';
       return (cc == -1) ? len : cc;
   }
  
  
  
  1.2       +7 -7      apache-2.0/src/lib/apr/strings/apr_strings.c
  
  Index: apr_strings.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_strings.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_strings.c	2000/07/21 19:50:45	1.1
  +++ apr_strings.c	2000/08/02 05:26:34	1.2
  @@ -57,7 +57,7 @@
   #include "apr_private.h"
   #include "apr_lib.h"
   
  -APR_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s)
  +APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s)
   {
       char *res;
       size_t len;
  @@ -66,31 +66,31 @@
           return NULL;
       }
       len = strlen(s) + 1;
  -    res = ap_palloc(a, len);
  +    res = apr_palloc(a, len);
       memcpy(res, s, len);
       return res;
   }
   
  -APR_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, ap_size_t n)
  +APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
   {
       char *res;
   
       if (s == NULL) {
           return NULL;
       }
  -    res = ap_palloc(a, n + 1);
  +    res = apr_palloc(a, n + 1);
       memcpy(res, s, n);
       res[n] = '\0';
       return res;
   }
   
  -APR_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...)
  +APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
   {
       char *cp, *argp, *res;
   
       /* Pass one --- find length of required string */
   
  -    ap_size_t len = 0;
  +    apr_size_t len = 0;
       va_list adummy;
   
       va_start(adummy, a);
  @@ -103,7 +103,7 @@
   
       /* Allocate the required string */
   
  -    res = (char *) ap_palloc(a, len + 1);
  +    res = (char *) apr_palloc(a, len + 1);
       cp = res;
       *cp = '\0';
   
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/strings/apr_strnatcmp.c
  
  Index: apr_strnatcmp.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/strings/apr_strnatcmp.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_strnatcmp.c	2000/07/23 17:31:08	1.2
  +++ apr_strnatcmp.c	2000/08/02 05:26:34	1.3
  @@ -140,12 +140,12 @@
   
   
   
  -int ap_strnatcmp(char const *a, char const *b) {
  +int apr_strnatcmp(char const *a, char const *b) {
        return strnatcmp0(a, b, 0);
   }
   
   
   /* Compare, recognizing numeric string and ignoring case. */
  -int ap_strnatcasecmp(char const *a, char const *b) {
  +int apr_strnatcasecmp(char const *a, char const *b) {
        return strnatcmp0(a, b, 1);
   }
  
  
  
  1.2       +23 -23    apache-2.0/src/lib/apr/tables/apr_hash.c
  
  Index: apr_hash.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_hash.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_hash.c	2000/07/24 23:28:08	1.1
  +++ apr_hash.c	2000/08/02 05:26:35	1.2
  @@ -97,8 +97,8 @@
    * The count of hash entries may be greater depending on the chosen
    * collision rate.
    */
  -struct ap_hash_t {
  -    ap_pool_t		 *pool;
  +struct apr_hash_t {
  +    apr_pool_t		 *pool;
       ap_hash_entry_t	**array;
       size_t		  count, max;
   };
  @@ -109,10 +109,10 @@
    *
    * We keep a pointer to the next hash entry here to allow the current
    * hash entry to be freed or otherwise mangled between calls to
  - * ap_hash_next().
  + * apr_hash_next().
    */
  -struct ap_hash_index_t {
  -    ap_hash_t		*ht;
  +struct apr_hash_index_t {
  +    apr_hash_t		*ht;
       ap_hash_entry_t	*this, *next;
       int			 index;
   };
  @@ -122,15 +122,15 @@
    * Hash creation functions.
    */
   
  -static ap_hash_entry_t **alloc_array(ap_hash_t *ht)
  +static ap_hash_entry_t **alloc_array(apr_hash_t *ht)
   {
  -   return ap_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1));
  +   return apr_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1));
   }
   
  -APR_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool)
  +APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool)
   {
  -    ap_hash_t *ht;
  -    ht = ap_palloc(pool, sizeof(ap_hash_t));
  +    apr_hash_t *ht;
  +    ht = apr_palloc(pool, sizeof(apr_hash_t));
       ht->pool = pool;
       ht->count = 0;
       ht->max = INITIAL_MAX;
  @@ -143,7 +143,7 @@
    * Hash iteration functions.
    */
   
  -APR_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi)
  +APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi)
   {
       hi->this = hi->next;
       while (!hi->this) {
  @@ -155,18 +155,18 @@
       return hi;
   }
   
  -APR_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht)
  +APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht)
   {
  -    ap_hash_index_t *hi;
  -    hi = ap_palloc(ht->pool, sizeof(*hi));
  +    apr_hash_index_t *hi;
  +    hi = apr_palloc(ht->pool, sizeof(*hi));
       hi->ht = ht;
       hi->index = 0;
       hi->this = NULL;
       hi->next = NULL;
  -    return ap_hash_next(hi);
  +    return apr_hash_next(hi);
   }
   
  -APR_EXPORT(void) ap_hash_this(ap_hash_index_t *hi,
  +APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi,
   			      const void **key,
   			      size_t *klen,
   			      void **val)
  @@ -181,14 +181,14 @@
    * Resizing a hash table
    */
   
  -static void resize_array(ap_hash_t *ht)
  +static void resize_array(apr_hash_t *ht)
   {
  -    ap_hash_index_t *hi;
  +    apr_hash_index_t *hi;
       ap_hash_entry_t **new_array;
       int i;
   
       new_array = alloc_array(ht);
  -    for (hi = ap_hash_first(ht); hi; hi = ap_hash_next(hi)) {
  +    for (hi = apr_hash_first(ht); hi; hi = apr_hash_next(hi)) {
   	i = hi->this->hash & ht->max;
   	hi->this->next = new_array[i];
   	new_array[i] = hi->this;
  @@ -205,7 +205,7 @@
    * that hash entries can be removed.
    */
   
  -static ap_hash_entry_t **find_entry(ap_hash_t *ht,
  +static ap_hash_entry_t **find_entry(apr_hash_t *ht,
   				    const void *key,
   				    size_t klen,
   				    const void *val)
  @@ -266,7 +266,7 @@
       if (he || !val)
   	return hep;
       /* add a new entry for non-NULL values */
  -    he = ap_pcalloc(ht->pool, sizeof(*he));
  +    he = apr_pcalloc(ht->pool, sizeof(*he));
       he->hash = hash;
       he->key  = key;
       he->klen = klen;
  @@ -280,7 +280,7 @@
       return hep;
   }
   
  -APR_EXPORT(void *) ap_hash_get(ap_hash_t *ht,
  +APR_EXPORT(void *) apr_hash_get(apr_hash_t *ht,
   			       const void *key,
   			       size_t klen)
   {
  @@ -292,7 +292,7 @@
   	return NULL;
   }
   
  -APR_EXPORT(void) ap_hash_set(ap_hash_t *ht,
  +APR_EXPORT(void) apr_hash_set(apr_hash_t *ht,
   			     const void *key,
   			     size_t klen,
   			     const void *val)
  
  
  
  1.3       +103 -103  apache-2.0/src/lib/apr/tables/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/tables/apr_tables.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_tables.c	2000/07/26 01:56:02	1.2
  +++ apr_tables.c	2000/08/02 05:26:35	1.3
  @@ -81,7 +81,7 @@
   #endif
   
   /*****************************************************************
  - * This file contains array and ap_table_t functions only.
  + * This file contains array and apr_table_t functions only.
    */
   
   /*****************************************************************
  @@ -89,7 +89,7 @@
    * The 'array' functions...
    */
   
  -static void make_array_core(ap_array_header_t *res, ap_pool_t *c,
  +static void make_array_core(apr_array_header_t *res, apr_pool_t *c,
   			    int nelts, int elt_size)
   {
       /*
  @@ -100,7 +100,7 @@
   	nelts = 1;
       }
   
  -    res->elts = ap_pcalloc(c, nelts * elt_size);
  +    res->elts = apr_pcalloc(c, nelts * elt_size);
   
       res->cont = c;
       res->elt_size = elt_size;
  @@ -108,23 +108,23 @@
       res->nalloc = nelts;	/* ...but this many allocated */
   }
   
  -APR_EXPORT(ap_array_header_t *) ap_make_array(ap_pool_t *p,
  +APR_EXPORT(apr_array_header_t *) apr_make_array(apr_pool_t *p,
   						int nelts, int elt_size)
   {
  -    ap_array_header_t *res;
  +    apr_array_header_t *res;
   
  -    res = (ap_array_header_t *) ap_palloc(p, sizeof(ap_array_header_t));
  +    res = (apr_array_header_t *) apr_palloc(p, sizeof(apr_array_header_t));
       make_array_core(res, p, nelts, elt_size);
       return res;
   }
   
  -APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr)
  +APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr)
   {
       if (arr->nelts == arr->nalloc) {
   	int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2;
   	char *new_data;
   
  -	new_data = ap_pcalloc(arr->cont, arr->elt_size * new_size);
  +	new_data = apr_pcalloc(arr->cont, arr->elt_size * new_size);
   
   	memcpy(new_data, arr->elts, arr->nalloc * arr->elt_size);
   	arr->elts = new_data;
  @@ -135,8 +135,8 @@
       return arr->elts + (arr->elt_size * (arr->nelts - 1));
   }
   
  -APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
  -			       const ap_array_header_t *src)
  +APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst,
  +			       const apr_array_header_t *src)
   {
       int elt_size = dst->elt_size;
   
  @@ -148,7 +148,7 @@
   	    new_size *= 2;
   	}
   
  -	new_data = ap_pcalloc(dst->cont, elt_size * new_size);
  +	new_data = apr_pcalloc(dst->cont, elt_size * new_size);
   	memcpy(new_data, dst->elts, dst->nalloc * elt_size);
   
   	dst->elts = new_data;
  @@ -160,10 +160,10 @@
       dst->nelts += src->nelts;
   }
   
  -APR_EXPORT(ap_array_header_t *) ap_copy_array(ap_pool_t *p,
  -						const ap_array_header_t *arr)
  +APR_EXPORT(apr_array_header_t *) apr_copy_array(apr_pool_t *p,
  +						const apr_array_header_t *arr)
   {
  -    ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size);
  +    apr_array_header_t *res = apr_make_array(p, arr->nalloc, arr->elt_size);
   
       memcpy(res->elts, arr->elts, arr->elt_size * arr->nelts);
       res->nelts = arr->nelts;
  @@ -177,8 +177,8 @@
    * overhead of the full copy only where it is really needed.
    */
   
  -static APR_INLINE void copy_array_hdr_core(ap_array_header_t *res,
  -					   const ap_array_header_t *arr)
  +static APR_INLINE void copy_array_hdr_core(apr_array_header_t *res,
  +					   const apr_array_header_t *arr)
   {
       res->elts = arr->elts;
       res->elt_size = arr->elt_size;
  @@ -186,13 +186,13 @@
       res->nalloc = arr->nelts;	/* Force overflow on push */
   }
   
  -APR_EXPORT(ap_array_header_t *)
  -    ap_copy_array_hdr(ap_pool_t *p,
  -		       const ap_array_header_t *arr)
  +APR_EXPORT(apr_array_header_t *)
  +    apr_copy_array_hdr(apr_pool_t *p,
  +		       const apr_array_header_t *arr)
   {
  -    ap_array_header_t *res;
  +    apr_array_header_t *res;
   
  -    res = (ap_array_header_t *) ap_palloc(p, sizeof(ap_array_header_t));
  +    res = (apr_array_header_t *) apr_palloc(p, sizeof(apr_array_header_t));
       res->cont = p;
       copy_array_hdr_core(res, arr);
       return res;
  @@ -200,32 +200,32 @@
   
   /* The above is used here to avoid consing multiple new array bodies... */
   
  -APR_EXPORT(ap_array_header_t *)
  -    ap_append_arrays(ap_pool_t *p,
  -		      const ap_array_header_t *first,
  -		      const ap_array_header_t *second)
  +APR_EXPORT(apr_array_header_t *)
  +    apr_append_arrays(apr_pool_t *p,
  +		      const apr_array_header_t *first,
  +		      const apr_array_header_t *second)
   {
  -    ap_array_header_t *res = ap_copy_array_hdr(p, first);
  +    apr_array_header_t *res = apr_copy_array_hdr(p, first);
   
  -    ap_array_cat(res, second);
  +    apr_array_cat(res, second);
       return res;
   }
   
  -/* ap_array_pstrcat generates a new string from the ap_pool_t containing
  +/* apr_array_pstrcat generates a new string from the apr_pool_t containing
    * the concatenated sequence of substrings referenced as elements within
    * the array.  The string will be empty if all substrings are empty or null,
    * or if there are no elements in the array.
    * If sep is non-NUL, it will be inserted between elements as a separator.
    */
  -APR_EXPORT(char *) ap_array_pstrcat(ap_pool_t *p,
  -				     const ap_array_header_t *arr,
  +APR_EXPORT(char *) apr_array_pstrcat(apr_pool_t *p,
  +				     const apr_array_header_t *arr,
   				     const char sep)
   {
       char *cp, *res, **strpp;
       int i, len;
   
       if (arr->nelts <= 0 || arr->elts == NULL) {    /* Empty table? */
  -        return (char *) ap_pcalloc(p, 1);
  +        return (char *) apr_pcalloc(p, 1);
       }
   
       /* Pass one --- find length of required string */
  @@ -245,7 +245,7 @@
   
       /* Allocate the required string */
   
  -    res = (char *) ap_palloc(p, len + 1);
  +    res = (char *) apr_palloc(p, len + 1);
       cp = res;
   
       /* Pass two --- copy the argument strings into the result space */
  @@ -282,32 +282,32 @@
    * in alloc.h
    */
   #ifdef MAKE_TABLE_PROFILE
  -static ap_table_entry_t *table_push(ap_table_t *t)
  +static apr_table_entry_t *table_push(apr_table_t *t)
   {
       if (t->a.nelts == t->a.nalloc) {
           return NULL;
       }
  -    return (ap_table_entry_t *) ap_push_array(&t->a);
  +    return (apr_table_entry_t *) apr_push_array(&t->a);
   }
   #else /* MAKE_TABLE_PROFILE */
  -#define table_push(t)	((ap_table_entry_t *) ap_push_array(&(t)->a))
  +#define table_push(t)	((apr_table_entry_t *) apr_push_array(&(t)->a))
   #endif /* MAKE_TABLE_PROFILE */
   
   
  -APR_EXPORT(ap_table_t *) ap_make_table(ap_pool_t *p, int nelts)
  +APR_EXPORT(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts)
   {
  -    ap_table_t *t = ap_palloc(p, sizeof(ap_table_t));
  +    apr_table_t *t = apr_palloc(p, sizeof(apr_table_t));
   
  -    make_array_core(&t->a, p, nelts, sizeof(ap_table_entry_t));
  +    make_array_core(&t->a, p, nelts, sizeof(apr_table_entry_t));
   #ifdef MAKE_TABLE_PROFILE
       t->creator = __builtin_return_address(0);
   #endif
       return t;
   }
   
  -APR_EXPORT(ap_table_t *) ap_copy_table(ap_pool_t *p, const ap_table_t *t)
  +APR_EXPORT(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t)
   {
  -    ap_table_t *new = ap_palloc(p, sizeof(ap_table_t));
  +    apr_table_t *new = apr_palloc(p, sizeof(apr_table_t));
   
   #ifdef POOL_DEBUG
       /* we don't copy keys and values, so it's necessary that t->a.pool
  @@ -318,20 +318,20 @@
   	abort();
       }
   #endif
  -    make_array_core(&new->a, p, t->a.nalloc, sizeof(ap_table_entry_t));
  -    memcpy(new->a.elts, t->a.elts, t->a.nelts * sizeof(ap_table_entry_t));
  +    make_array_core(&new->a, p, t->a.nalloc, sizeof(apr_table_entry_t));
  +    memcpy(new->a.elts, t->a.elts, t->a.nelts * sizeof(apr_table_entry_t));
       new->a.nelts = t->a.nelts;
       return new;
   }
   
  -APR_EXPORT(void) ap_clear_table(ap_table_t *t)
  +APR_EXPORT(void) apr_clear_table(apr_table_t *t)
   {
       t->a.nelts = 0;
   }
   
  -APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key)
  +APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int i;
   
       if (key == NULL) {
  @@ -347,17 +347,17 @@
       return NULL;
   }
   
  -APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key,
   			       const char *val)
   {
       register int i, j, k;
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int done = 0;
   
       for (i = 0; i < t->a.nelts; ) {
   	if (!strcasecmp(elts[i].key, key)) {
   	    if (!done) {
  -		elts[i].val = ap_pstrdup(t->a.cont, val);
  +		elts[i].val = apr_pstrdup(t->a.cont, val);
   		done = 1;
   		++i;
   	    }
  @@ -375,17 +375,17 @@
       }
   
       if (!done) {
  -	elts = (ap_table_entry_t *) table_push(t);
  -	elts->key = ap_pstrdup(t->a.cont, key);
  -	elts->val = ap_pstrdup(t->a.cont, val);
  +	elts = (apr_table_entry_t *) table_push(t);
  +	elts->key = apr_pstrdup(t->a.cont, key);
  +	elts->val = apr_pstrdup(t->a.cont, val);
       }
   }
   
  -APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key,
   				const char *val)
   {
       register int i, j, k;
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int done = 0;
   
   #ifdef POOL_DEBUG
  @@ -422,16 +422,16 @@
       }
   
       if (!done) {
  -	elts = (ap_table_entry_t *) table_push(t);
  +	elts = (apr_table_entry_t *) table_push(t);
   	elts->key = (char *)key;
   	elts->val = (char *)val;
       }
   }
   
  -APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key)
  +APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key)
   {
       register int i, j, k;
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
   
       for (i = 0; i < t->a.nelts; ) {
   	if (!strcasecmp(elts[i].key, key)) {
  @@ -453,28 +453,28 @@
       }
   }
   
  -APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key,
   				 const char *val)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int i;
   
       for (i = 0; i < t->a.nelts; ++i) {
   	if (!strcasecmp(elts[i].key, key)) {
  -	    elts[i].val = ap_pstrcat(t->a.cont, elts[i].val, ", ", val, NULL);
  +	    elts[i].val = apr_pstrcat(t->a.cont, elts[i].val, ", ", val, NULL);
   	    return;
   	}
       }
   
  -    elts = (ap_table_entry_t *) table_push(t);
  -    elts->key = ap_pstrdup(t->a.cont, key);
  -    elts->val = ap_pstrdup(t->a.cont, val);
  +    elts = (apr_table_entry_t *) table_push(t);
  +    elts->key = apr_pstrdup(t->a.cont, key);
  +    elts->val = apr_pstrdup(t->a.cont, val);
   }
   
  -APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key,
   				  const char *val)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int i;
   
   #ifdef POOL_DEBUG
  @@ -492,30 +492,30 @@
   
       for (i = 0; i < t->a.nelts; ++i) {
   	if (!strcasecmp(elts[i].key, key)) {
  -	    elts[i].val = ap_pstrcat(t->a.cont, elts[i].val, ", ", val, NULL);
  +	    elts[i].val = apr_pstrcat(t->a.cont, elts[i].val, ", ", val, NULL);
   	    return;
   	}
       }
   
  -    elts = (ap_table_entry_t *) table_push(t);
  +    elts = (apr_table_entry_t *) table_push(t);
       elts->key = (char *)key;
       elts->val = (char *)val;
   }
   
  -APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key,
   			       const char *val)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
   
  -    elts = (ap_table_entry_t *) table_push(t);
  -    elts->key = ap_pstrdup(t->a.cont, key);
  -    elts->val = ap_pstrdup(t->a.cont, val);
  +    elts = (apr_table_entry_t *) table_push(t);
  +    elts->key = apr_pstrdup(t->a.cont, key);
  +    elts->val = apr_pstrdup(t->a.cont, val);
   }
   
  -APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
  +APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key,
   				const char *val)
   {
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
   
   #ifdef POOL_DEBUG
       {
  @@ -530,16 +530,16 @@
       }
   #endif
   
  -    elts = (ap_table_entry_t *) table_push(t);
  +    elts = (apr_table_entry_t *) table_push(t);
       elts->key = (char *)key;
       elts->val = (char *)val;
   }
   
  -APR_EXPORT(ap_table_t *) ap_overlay_tables(ap_pool_t *p,
  -					     const ap_table_t *overlay,
  -					     const ap_table_t *base)
  +APR_EXPORT(apr_table_t *) apr_overlay_tables(apr_pool_t *p,
  +					     const apr_table_t *overlay,
  +					     const apr_table_t *base)
   {
  -    ap_table_t *res;
  +    apr_table_t *res;
   
   #ifdef POOL_DEBUG
       /* we don't copy keys and values, so it's necessary that
  @@ -558,11 +558,11 @@
       }
   #endif
   
  -    res = ap_palloc(p, sizeof(ap_table_t));
  +    res = apr_palloc(p, sizeof(apr_table_t));
       /* behave like append_arrays */
       res->a.cont = p;
       copy_array_hdr_core(&res->a, &overlay->a);
  -    ap_array_cat(&res->a, &base->a);
  +    apr_array_cat(&res->a, &base->a);
   
       return res;
   }
  @@ -572,7 +572,7 @@
    * For each key value given as a vararg:
    *   run the function pointed to as
    *     int comp(void *r, char *key, char *value);
  - *   on each valid key-value pair in the ap_table_t t that matches the vararg key,
  + *   on each valid key-value pair in the apr_table_t t that matches the vararg key,
    *   or once for every valid key-value pair if the vararg list is empty,
    *   until the function returns false (0) or we finish the table.
    *
  @@ -582,47 +582,47 @@
    * only one traversal will be made and will cut short if comp returns 0.
    *
    * Note that the table_get and table_merge functions assume that each key in
  - * the ap_table_t is unique (i.e., no multiple entries with the same key).  This
  + * the apr_table_t is unique (i.e., no multiple entries with the same key).  This
    * function does not make that assumption, since it (unfortunately) isn't
    * true for some of Apache's tables.
    *
    * Note that rec is simply passed-on to the comp function, so that the
    * caller can pass additional info for the task.
    *
  - * ADDENDUM for ap_table_vdo():
  + * ADDENDUM for apr_table_vdo():
    * 
    * The caching api will allow a user to walk the header values:
    *
  - * ap_status_t ap_cache_el_header_walk(ap_cache_el *el, 
  + * apr_status_t ap_cache_el_header_walk(ap_cache_el *el, 
    *    int (*comp)(void *, const char *, const char *), void *rec, ...);
    *
    * So it can be ..., however from there I use a  callback that use a va_list:
    *
  - * ap_status_t (*cache_el_header_walk)(ap_cache_el *el, 
  + * apr_status_t (*cache_el_header_walk)(ap_cache_el *el, 
    *    int (*comp)(void *, const char *, const char *), void *rec, va_list);
    *
    * To pass those ...'s on down to the actual module that will handle walking
    * their headers, in the file case this is actually just an ap_table - and
  - * rather than reimplementing ap_table_do (which IMHO would be bad) I just
  + * rather than reimplementing apr_table_do (which IMHO would be bad) I just
    * called it with the va_list. For mod_shmem_cache I don't need it since I
    * can't use ap_table's, but mod_file_cache should (though a good hash would
    * be better, but that's a different issue :). 
    *
    * So to make mod_file_cache easier to maintain, it's a good thing
    */
  -APR_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *),
  -			      void *rec, const ap_table_t *t, ...)
  +APR_EXPORT(void) apr_table_do(int (*comp) (void *, const char *, const char *),
  +			      void *rec, const apr_table_t *t, ...)
   {
       va_list vp;
       va_start(vp, t);
  -    ap_table_vdo(comp, rec, t, vp);
  +    apr_table_vdo(comp, rec, t, vp);
       va_end(vp);  
   } 
  -APR_EXPORT(void) ap_table_vdo(int (*comp) (void *, const char *, const char *),
  -				void *rec, const ap_table_t *t, va_list vp)
  +APR_EXPORT(void) apr_table_vdo(int (*comp) (void *, const char *, const char *),
  +				void *rec, const apr_table_t *t, va_list vp)
   {
       char *argp;
  -    ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
       int rv, i;
       argp = va_arg(vp, char *);
       do {
  @@ -666,14 +666,14 @@
   #define ap_OVERLAP_TABLES_ON_STACK	(512)
   #endif
   
  -APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
  +APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
   				    unsigned flags)
   {
       overlap_key cat_keys_buf[ap_OVERLAP_TABLES_ON_STACK];
       overlap_key *cat_keys;
       int nkeys;
  -    ap_table_entry_t *e;
  -    ap_table_entry_t *last_e;
  +    apr_table_entry_t *e;
  +    apr_table_entry_t *last_e;
       overlap_key *left;
       overlap_key *right;
       overlap_key *last;
  @@ -686,7 +686,7 @@
   	/* XXX: could use scratch free space in a or b's pool instead...
   	 * which could save an allocation in b's pool.
   	 */
  -	cat_keys = ap_palloc(b->a.cont, sizeof(overlap_key) * nkeys);
  +	cat_keys = apr_palloc(b->a.cont, sizeof(overlap_key) * nkeys);
       }
   
       nkeys = 0;
  @@ -694,7 +694,7 @@
       /* Create a list of the entries from a concatenated with the entries
        * from b.
        */
  -    e = (ap_table_entry_t *)a->a.elts;
  +    e = (apr_table_entry_t *)a->a.elts;
       last_e = e + a->a.nelts;
       while (e < last_e) {
   	cat_keys[nkeys].key = e->key;
  @@ -704,7 +704,7 @@
   	++e;
       }
   
  -    e = (ap_table_entry_t *)b->a.elts;
  +    e = (apr_table_entry_t *)b->a.elts;
       last_e = e + b->a.nelts;
       while (e < last_e) {
   	cat_keys[nkeys].key = e->key;
  @@ -721,7 +721,7 @@
        */
       a->a.nelts = 0;
       if (a->a.nalloc < nkeys) {
  -	a->a.elts = ap_palloc(a->a.cont, a->a.elt_size * nkeys * 2);
  +	a->a.elts = apr_palloc(a->a.cont, a->a.elt_size * nkeys * 2);
   	a->a.nalloc = nkeys * 2;
       }
   
  @@ -743,7 +743,7 @@
   	    right = left + 1;
   	    if (right == last
   		|| strcasecmp(left->key, right->key)) {
  -		ap_table_addn(a, left->key, left->val);
  +		apr_table_addn(a, left->key, left->val);
   		left = right;
   	    }
   	    else {
  @@ -763,7 +763,7 @@
   		} while (right < last
   			 && !strcasecmp(left->key, right->key));
   		/* right points one past the last header to merge */
  -		value = ap_palloc(a->a.cont, len + 1);
  +		value = apr_palloc(a->a.cont, len + 1);
   		strp = value;
   		for (;;) {
   		    memcpy(strp, left->val, left->order);
  @@ -776,7 +776,7 @@
   		    *strp++ = ' ';
   		}
   		*strp = 0;
  -		ap_table_addn(a, (left-1)->key, value);
  +		apr_table_addn(a, (left-1)->key, value);
   	    }
   	}
       }
  @@ -788,7 +788,7 @@
   	    while (right < last && !strcasecmp(left->key, right->key)) {
   		++right;
   	    }
  -	    ap_table_addn(a, (right-1)->key, (right-1)->val);
  +	    apr_table_addn(a, (right-1)->key, (right-1)->val);
   	    left = right;
   	}
       }
  
  
  
  1.8       +5 -5      apache-2.0/src/lib/apr/test/abc.c
  
  Index: abc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/abc.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- abc.c	2000/04/14 15:58:43	1.7
  +++ abc.c	2000/08/02 05:26:36	1.8
  @@ -6,17 +6,17 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_file_t *fd = NULL;
  +    apr_file_t *fd = NULL;
       char ch;
       int status = 0;
  -    ap_pool_t *context;
  +    apr_pool_t *context;
   
  -    ap_create_pool(&context, NULL); 
  +    apr_create_pool(&context, NULL); 
   
  -    ap_open(&fd, argv[1], APR_READ, -1, context);
  +    apr_open(&fd, argv[1], APR_READ, -1, context);
       
       while (!status) {
  -        status = ap_getc(&ch, fd);
  +        status = apr_getc(&ch, fd);
           if (status == APR_EOF )
               fprintf(stdout, "EOF, YEAH!!!!!!!!!\n");
           else if (status == APR_SUCCESS)
  
  
  
  1.13      +31 -31    apache-2.0/src/lib/apr/test/client.c
  
  Index: client.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/client.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- client.c	2000/06/03 15:59:37	1.12
  +++ client.c	2000/08/02 05:26:36	1.13
  @@ -62,17 +62,17 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_pool_t *context;
  -    ap_socket_t *sock;
  -    ap_ssize_t length;
  -    ap_status_t stat;
  +    apr_pool_t *context;
  +    apr_socket_t *sock;
  +    apr_ssize_t length;
  +    apr_status_t stat;
       char datasend[STRLEN] = "Send data test";
       char datarecv[STRLEN];
       char msgbuf[80];
       char *local_ipaddr, *remote_ipaddr;
       char *dest = "127.0.0.1";
  -    ap_uint32_t local_port, remote_port;
  -    ap_interval_time_t read_timeout = -1;
  +    apr_uint32_t local_port, remote_port;
  +    apr_interval_time_t read_timeout = -1;
   
       setbuf(stdout, NULL);
       if (argc > 1) {
  @@ -84,22 +84,22 @@
       }
   
       fprintf(stdout, "Initializing.........");
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Something went wrong\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Something went wrong\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Creating new socket.......");
  -    if (ap_create_tcp_socket(&sock, context) != APR_SUCCESS) {
  +    if (apr_create_tcp_socket(&sock, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't create socket\n");
           exit(-1);
       }
  @@ -107,8 +107,8 @@
   
       if (read_timeout == -1) {
           fprintf(stdout, "\tClient:  Setting socket option NONBLOCK.......");
  -        if (ap_setsocketopt(sock, APR_SO_NONBLOCK, 1) != APR_SUCCESS) {
  -            ap_close_socket(sock);
  +        if (apr_setsocketopt(sock, APR_SO_NONBLOCK, 1) != APR_SUCCESS) {
  +            apr_close_socket(sock);
               fprintf(stderr, "Couldn't set socket option\n");
               exit(-1);
           }
  @@ -116,8 +116,8 @@
       }
   
       fprintf(stdout, "\tClient:  Setting port for socket.......");
  -    if (ap_set_remote_port(sock, 8021) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_set_remote_port(sock, 8021) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Couldn't set the port correctly\n");
           exit(-1);
       }
  @@ -125,27 +125,27 @@
   
       fprintf(stdout, "\tClient:  Connecting to socket.......");
   
  -    stat = ap_connect(sock, dest);
  +    stat = apr_connect(sock, dest);
   
       if (stat != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +        apr_close_socket(sock);
           fprintf(stderr, "Could not connect: %s (%d)\n", 
  -		ap_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
  +		apr_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
           fflush(stderr);
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
  -    ap_get_remote_ipaddr(&remote_ipaddr, sock);
  -    ap_get_remote_port(&remote_port, sock);
  -    ap_get_local_ipaddr(&local_ipaddr, sock);
  -    ap_get_local_port(&local_port, sock);
  +    apr_get_remote_ipaddr(&remote_ipaddr, sock);
  +    apr_get_remote_port(&remote_port, sock);
  +    apr_get_local_ipaddr(&local_ipaddr, sock);
  +    apr_get_local_port(&local_port, sock);
       fprintf(stdout, "\tClient socket: %s:%u -> %s:%u\n", local_ipaddr, local_port, remote_ipaddr, remote_port);
   
       fprintf(stdout, "\tClient:  Trying to send data over socket.......");
       length = STRLEN;
  -    if (ap_send(sock, datasend, &length) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_send(sock, datasend, &length) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Problem sending data\n");
           exit(-1);
       }
  @@ -153,7 +153,7 @@
      
       if (read_timeout != -1) {
           fprintf(stdout, "\tClient:  Setting read timeout.......");
  -        stat = ap_setsocketopt(sock, APR_SO_TIMEOUT, read_timeout);
  +        stat = apr_setsocketopt(sock, APR_SO_TIMEOUT, read_timeout);
           if (stat) {
               fprintf(stderr, "Problem setting timeout: %d\n", stat);
               exit(-1);
  @@ -164,29 +164,29 @@
       length = STRLEN; 
       fprintf(stdout, "\tClient:  Trying to receive data over socket.......");
   
  -    if ((stat = ap_recv(sock, datarecv, &length)) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if ((stat = apr_recv(sock, datarecv, &length)) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Problem receiving data: %s (%d)\n", 
  -		ap_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
  +		apr_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
           exit(-1);
       }
       if (strcmp(datarecv, "Recv data test")) {
  -        ap_close_socket(sock);
  +        apr_close_socket(sock);
           fprintf(stderr, "I did not receive the correct data %s\n", datarecv);
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Shutting down socket.......");
  -    if (ap_shutdown(sock, APR_SHUTDOWN_WRITE) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_shutdown(sock, APR_SHUTDOWN_WRITE) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Could not shutdown socket\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tClient:  Closing down socket.......");
  -    if (ap_close_socket(sock) != APR_SUCCESS) {
  +    if (apr_close_socket(sock) != APR_SUCCESS) {
           fprintf(stderr, "Could not shutdown socket\n");
           exit(-1);
       }
  
  
  
  1.13      +46 -46    apache-2.0/src/lib/apr/test/server.c
  
  Index: server.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/server.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- server.c	2000/06/27 02:00:58	1.12
  +++ server.c	2000/08/02 05:26:36	1.13
  @@ -61,123 +61,123 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_pool_t *context;
  -    ap_socket_t *sock;
  -    ap_socket_t *sock2;
  -    ap_ssize_t length;
  -    ap_int32_t rv;
  -    ap_pollfd_t *sdset;
  +    apr_pool_t *context;
  +    apr_socket_t *sock;
  +    apr_socket_t *sock2;
  +    apr_ssize_t length;
  +    apr_int32_t rv;
  +    apr_pollfd_t *sdset;
       char datasend[STRLEN];
       char datarecv[STRLEN] = "Recv data test";
       char *local_ipaddr, *remote_ipaddr;
  -    ap_uint32_t local_port, remote_port;
  +    apr_uint32_t local_port, remote_port;
   
       fprintf(stdout, "Initializing.........");
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Something went wrong\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Could not create a context\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Creating new socket.......");
  -    if (ap_create_tcp_socket(&sock, context) != APR_SUCCESS) {
  +    if (apr_create_tcp_socket(&sock, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't create socket\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting socket option NONBLOCK.......");
  -    if (ap_setsocketopt(sock, APR_SO_NONBLOCK, 1) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_setsocketopt(sock, APR_SO_NONBLOCK, 1) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Couldn't set socket option\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting socket option REUSEADDR.......");
  -    if (ap_setsocketopt(sock, APR_SO_REUSEADDR, 1) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_setsocketopt(sock, APR_SO_REUSEADDR, 1) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Couldn't set socket option\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting port for socket.......");
  -    if (ap_set_local_port(sock, 8021) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_set_local_port(sock, 8021) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Couldn't set the port correctly\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Binding socket to port.......");
  -    if (ap_bind(sock) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_bind(sock) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Could not bind\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Listening to socket.......");
  -    if (ap_listen(sock, 8021) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_listen(sock, 8021) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Could not listen\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Setting up socket for polling.......");
  -    ap_setup_poll(&sdset, 1, context);
  -    ap_add_poll_socket(sdset, sock, APR_POLLIN);
  +    apr_setup_poll(&sdset, 1, context);
  +    apr_add_poll_socket(sdset, sock, APR_POLLIN);
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Beginning to poll for socket.......");
       rv = 1; 
  -    if (ap_poll(sdset, &rv, -1) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_poll(sdset, &rv, -1) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Select caused an error\n");
           exit(-1);
       }
       else if (rv == 0) {
  -        ap_close_socket(sock);
  +        apr_close_socket(sock);
           fprintf(stderr, "I should not return until rv == 1\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  Accepting a connection.......");
  -    if (ap_accept(&sock2, sock, context) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_accept(&sock2, sock, context) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Could not accept connection.\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
  -    ap_get_remote_ipaddr(&remote_ipaddr, sock2);
  -    ap_get_remote_port(&remote_port, sock2);
  -    ap_get_local_ipaddr(&local_ipaddr, sock2);
  -    ap_get_local_port(&local_port, sock2);
  +    apr_get_remote_ipaddr(&remote_ipaddr, sock2);
  +    apr_get_remote_port(&remote_port, sock2);
  +    apr_get_local_ipaddr(&local_ipaddr, sock2);
  +    apr_get_local_port(&local_port, sock2);
       fprintf(stdout, "\tServer socket: %s:%u -> %s:%u\n", local_ipaddr, local_port, remote_ipaddr, remote_port);
   
       length = STRLEN;
       fprintf(stdout, "\tServer:  Trying to recv data from socket.......");
  -    if (ap_recv(sock2, datasend, &length) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  -        ap_close_socket(sock2);
  +    if (apr_recv(sock2, datasend, &length) != APR_SUCCESS) {
  +        apr_close_socket(sock);
  +        apr_close_socket(sock2);
           fprintf(stderr, "Problem recving data\n");
           exit(-1);
       }
       if (strcmp(datasend, "Send data test")) {
  -        ap_close_socket(sock);
  -        ap_close_socket(sock2);
  +        apr_close_socket(sock);
  +        apr_close_socket(sock2);
           fprintf(stderr, "I did not receive the correct data %s\n", datarecv);
           exit(-1);
       }
  @@ -185,33 +185,33 @@
   
       length = STRLEN;
       fprintf(stdout, "\tServer:  Sending data over socket.......");
  -    if (ap_send(sock2, datarecv, &length) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  -        ap_close_socket(sock2);
  +    if (apr_send(sock2, datarecv, &length) != APR_SUCCESS) {
  +        apr_close_socket(sock);
  +        apr_close_socket(sock2);
           fprintf(stderr, "Problem sending data\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  Shutting down accepte socket.......");
  -    if (ap_shutdown(sock2, APR_SHUTDOWN_READ) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  -        ap_close_socket(sock2);
  +    if (apr_shutdown(sock2, APR_SHUTDOWN_READ) != APR_SUCCESS) {
  +        apr_close_socket(sock);
  +        apr_close_socket(sock2);
           fprintf(stderr, "Problem shutting down\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\tServer:  closing duplicate socket.......");
  -    if (ap_close_socket(sock2) != APR_SUCCESS) {
  -        ap_close_socket(sock);
  +    if (apr_close_socket(sock2) != APR_SUCCESS) {
  +        apr_close_socket(sock);
           fprintf(stderr, "Problem closing down\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tServer:  closing original socket.......");
  -    if (ap_close_socket(sock) != APR_SUCCESS) {
  +    if (apr_close_socket(sock) != APR_SUCCESS) {
           fprintf(stderr, "Problem closing down\n");
           exit(-1);
       }
  
  
  
  1.13      +6 -6      apache-2.0/src/lib/apr/test/testargs.c
  
  Index: testargs.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- testargs.c	2000/04/14 15:58:44	1.12
  +++ testargs.c	2000/08/02 05:26:36	1.13
  @@ -65,14 +65,14 @@
   
   int main(int argc, char * const argv[])
   {
  -    ap_pool_t *context;
  -    ap_int32_t data;
  +    apr_pool_t *context;
  +    apr_int32_t data;
   
  -    ap_initialize();
  -    atexit(ap_terminate);
  -    ap_create_pool(&context, NULL);
  +    apr_initialize();
  +    atexit(apr_terminate);
  +    apr_create_pool(&context, NULL);
   
  -    while (ap_getopt(argc, argv, "abc:d::", &data, context) == APR_SUCCESS) {
  +    while (apr_getopt(argc, argv, "abc:d::", &data, context) == APR_SUCCESS) {
           switch(data) {
               case 'a':
               case 'b':
  
  
  
  1.10      +8 -8      apache-2.0/src/lib/apr/test/testcontext.c
  
  Index: testcontext.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- testcontext.c	2000/08/01 23:10:29	1.9
  +++ testcontext.c	2000/08/02 05:26:37	1.10
  @@ -63,33 +63,33 @@
   #include <unistd.h>
   #endif
   
  -ap_status_t string_cleanup(void *data)
  +apr_status_t string_cleanup(void *data)
   {
       return APR_SUCCESS;
   }
   
   int main()
   {
  -    ap_pool_t *context;
  +    apr_pool_t *context;
       char *testdata;
       char *retdata;
   
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Couldn't initialize.");
           exit(-1);
       }
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
   
  -    testdata = ap_pstrdup(context, "This is a test\n");
  +    testdata = apr_pstrdup(context, "This is a test\n");
   
  -    ap_set_userdata(testdata, "TEST", string_cleanup, context);    
  +    apr_set_userdata(testdata, "TEST", string_cleanup, context);    
   
  -    ap_get_userdata((void **)&retdata, "TEST", context);
  +    apr_get_userdata((void **)&retdata, "TEST", context);
   
       if (!strcmp(testdata, retdata)) {
           fprintf(stdout, "User data is working ok\n");
  
  
  
  1.7       +15 -15    apache-2.0/src/lib/apr/test/testdso.c
  
  Index: testdso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testdso.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- testdso.c	2000/07/15 01:07:42	1.6
  +++ testdso.c	2000/08/02 05:26:37	1.7
  @@ -9,11 +9,11 @@
   
   int main (int argc, char ** argv)
   {
  -    ap_dso_handle_t *h = NULL;
  -    ap_dso_handle_sym_t func1 = NULL;
  -    ap_dso_handle_sym_t func2 = NULL;
  -    ap_status_t status;
  -    ap_pool_t *cont;
  +    apr_dso_handle_t *h = NULL;
  +    apr_dso_handle_sym_t func1 = NULL;
  +    apr_dso_handle_sym_t func2 = NULL;
  +    apr_status_t status;
  +    apr_pool_t *cont;
       void (*function)(void);
       void (*function1)(int);
       int *retval;
  @@ -23,19 +23,19 @@
       strcat(filename, "/");
       strcat(filename, LIB_NAME);
   
  -    ap_initialize();
  -    atexit(ap_terminate);
  +    apr_initialize();
  +    atexit(apr_terminate);
           
  -    if (ap_create_pool(&cont, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&cont, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
   
       fprintf(stdout,"Trying to load DSO now.....................");
       fflush(stdout);
  -    if ((status = ap_dso_load(&h, filename, cont)) != APR_SUCCESS){
  +    if ((status = apr_dso_load(&h, filename, cont)) != APR_SUCCESS){
           char my_error[256];
  -        ap_strerror(status, my_error, sizeof(my_error));
  +        apr_strerror(status, my_error, sizeof(my_error));
           fprintf(stderr, "%s!\n", my_error);
           exit (-1);
       }
  @@ -43,7 +43,7 @@
   
       fprintf(stdout,"Trying to get the DSO's attention..........");
       fflush(stdout);
  -    if (ap_dso_sym(&func1, h, "print_hello") != APR_SUCCESS) { 
  +    if (apr_dso_sym(&func1, h, "print_hello") != APR_SUCCESS) { 
           fprintf(stderr, "Failed!\n");
           exit (-1);
       }        
  @@ -54,7 +54,7 @@
   
       fprintf(stdout,"Saying farewell 5 times....................");
       fflush(stdout);
  -    if (ap_dso_sym(&func2, h, "print_goodbye") != APR_SUCCESS) {
  +    if (apr_dso_sym(&func2, h, "print_goodbye") != APR_SUCCESS) {
           fprintf(stderr, "Failed!\n");
           exit (-1);
       }        
  @@ -65,7 +65,7 @@
   
       fprintf(stdout,"Checking how many times I said goodbye..");
       fflush(stdout);
  -    if (ap_dso_sym(&func1, h, "goodbyes") != APR_SUCCESS) {
  +    if (apr_dso_sym(&func1, h, "goodbyes") != APR_SUCCESS) {
           fprintf(stderr, "Failed!\n");
           exit (-1);
       }
  @@ -79,7 +79,7 @@
       }
          
       fprintf(stdout,"Trying to unload DSO now...................");
  -    if (ap_dso_unload(h) != APR_SUCCESS) {
  +    if (apr_dso_unload(h) != APR_SUCCESS) {
           fprintf(stderr, "Failed!\n");
           exit (-1);
       }
  @@ -87,7 +87,7 @@
   
       fprintf(stdout,"Checking it's been unloaded................");
       fflush(stdout);
  -    if (ap_dso_sym(&func1, h, "print_hello") == APR_SUCCESS) {
  +    if (apr_dso_sym(&func1, h, "print_hello") == APR_SUCCESS) {
           fprintf(stderr, "Failed!\n");
           exit (-1);
       }        
  
  
  
  1.16      +115 -115  apache-2.0/src/lib/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- testfile.c	2000/06/17 21:08:29	1.15
  +++ testfile.c	2000/08/02 05:26:37	1.16
  @@ -64,37 +64,37 @@
   #include <unistd.h>
   #endif
   
  -int test_filedel(ap_pool_t *);
  -int testdirs(ap_pool_t *);
  -static void test_read(ap_pool_t *);
  +int test_filedel(apr_pool_t *);
  +int testdirs(apr_pool_t *);
  +static void test_read(apr_pool_t *);
   
   int main()
   {
  -    ap_pool_t *context;
  -    ap_pool_t *cont2;
  -    ap_file_t *thefile = NULL;
  -    ap_socket_t *testsock = NULL;
  -    ap_pollfd_t *sdset = NULL;
  -    ap_status_t status = 0;
  -    ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
  -    ap_ssize_t nbytes = 0;
  -    ap_int32_t rv;
  -    ap_off_t zer = 0;
  +    apr_pool_t *context;
  +    apr_pool_t *cont2;
  +    apr_file_t *thefile = NULL;
  +    apr_socket_t *testsock = NULL;
  +    apr_pollfd_t *sdset = NULL;
  +    apr_status_t status = 0;
  +    apr_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
  +    apr_ssize_t nbytes = 0;
  +    apr_int32_t rv;
  +    apr_off_t zer = 0;
       char *buf;
       char *str;
       char *filename = "test.fil";
       char *teststr;
   
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Couldn't initialize.");
           exit(-1);
       }
  -    atexit(ap_terminate);
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    atexit(apr_terminate);
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  -    if (ap_create_pool(&cont2, context) != APR_SUCCESS) {
  +    if (apr_create_pool(&cont2, context) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  @@ -102,7 +102,7 @@
       fprintf(stdout, "Testing file functions.\n");
   
       fprintf(stdout, "\tOpening file.......");
  -    if (ap_open(&thefile, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD, context) != APR_SUCCESS) {
  +    if (apr_open(&thefile, filename, flag, APR_UREAD | APR_UWRITE | APR_GREAD, context) != APR_SUCCESS) {
           perror("Didn't open file");
           exit(-1);
       }
  @@ -115,7 +115,7 @@
           fprintf(stderr, "Bad file des\n");
           exit(-1);
       }
  -    ap_get_filename(&str, thefile);
  +    apr_get_filename(&str, thefile);
       if (strcmp(str, filename) != 0) {
           fprintf(stderr, "wrong filename\n");
           exit(-1);
  @@ -126,12 +126,12 @@
   
       fprintf(stdout, "\tWriting to file.......");
       
  -    nbytes = (ap_ssize_t)strlen("this is a test");
  -    if (ap_write(thefile, "this is a test", &nbytes) != APR_SUCCESS) {
  +    nbytes = (apr_ssize_t)strlen("this is a test");
  +    if (apr_write(thefile, "this is a test", &nbytes) != APR_SUCCESS) {
           perror("something's wrong");
           exit(-1);
       }
  -    if (nbytes != (ap_ssize_t)strlen("this is a test")) {
  +    if (nbytes != (apr_ssize_t)strlen("this is a test")) {
           fprintf(stderr, "didn't write properly.\n");
           exit(-1);
       }
  @@ -141,7 +141,7 @@
   
       fprintf(stdout, "\tMoving to start of file.......");
       zer = 0;
  -    if (ap_seek(thefile, SEEK_SET, &zer) != 0) {
  +    if (apr_seek(thefile, SEEK_SET, &zer) != 0) {
           perror("couldn't seek to beginning of file.");
           exit(-1);
       }
  @@ -152,17 +152,17 @@
   #if APR_FILES_AS_SOCKETS
       fprintf(stdout, "\tThis platform supports files_like_sockets\n");
       fprintf(stdout, "\t\tMaking file look like a socket.......");
  -    if (ap_socket_from_file(&testsock, thefile) != APR_SUCCESS) {
  +    if (apr_socket_from_file(&testsock, thefile) != APR_SUCCESS) {
           perror("Something went wrong");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tChecking for incoming data.......");
  -    ap_setup_poll(&sdset, 1, context);
  -    ap_add_poll_socket(sdset, testsock, APR_POLLIN);
  +    apr_setup_poll(&sdset, 1, context);
  +    apr_add_poll_socket(sdset, testsock, APR_POLLIN);
       rv = 1;
  -    if (ap_poll(sdset, &rv, -1) != APR_SUCCESS) {
  +    if (apr_poll(sdset, &rv, -1) != APR_SUCCESS) {
           fprintf(stderr, "Select caused an error\n");
           exit(-1);
       }
  @@ -175,13 +175,13 @@
   
   
       fprintf(stdout, "\tReading from the file.......");
  -    nbytes = (ap_ssize_t)strlen("this is a test");
  -    buf = (char *)ap_palloc(context, nbytes + 1);
  -    if (ap_read(thefile, buf, &nbytes) != APR_SUCCESS) {
  +    nbytes = (apr_ssize_t)strlen("this is a test");
  +    buf = (char *)apr_palloc(context, nbytes + 1);
  +    if (apr_read(thefile, buf, &nbytes) != APR_SUCCESS) {
           perror("something's wrong");
           exit(-1);
       }
  -    if (nbytes != (ap_ssize_t)strlen("this is a test")) {
  +    if (nbytes != (apr_ssize_t)strlen("this is a test")) {
           fprintf(stderr, "didn't read properly.\n");
           exit(-1);
       }
  @@ -190,7 +190,7 @@
       }
   
       fprintf(stdout, "\tAdding user data to the file.......");
  -    status = ap_set_filedata(thefile, "This is a test", "test", ap_null_cleanup);
  +    status = apr_set_filedata(thefile, "This is a test", "test", apr_null_cleanup);
       if (status  != APR_SUCCESS) {
           fprintf(stderr, "Couldn't add the data\n");
           exit(-1); 
  @@ -200,7 +200,7 @@
       }
   
       fprintf(stdout, "\tGetting user data from the file.......");
  -    status = ap_get_filedata((void **)&teststr, "test", thefile);
  +    status = apr_get_filedata((void **)&teststr, "test", thefile);
       if (status  != APR_SUCCESS || strcmp(teststr, "This is a test")) {
           fprintf(stderr, "Couldn't get the data\n");
           exit(-1); 
  @@ -210,7 +210,7 @@
       }
   
       fprintf(stdout, "\tClosing File.......");
  -    status = ap_close(thefile);
  +    status = apr_close(thefile);
       if (status  != APR_SUCCESS) {
           fprintf(stderr, "Couldn't close the file\n");
           exit(-1); 
  @@ -220,7 +220,7 @@
       }
       
       fprintf(stdout, "\tDeleting file.......");
  -    status = ap_remove_file(filename, context);
  +    status = apr_remove_file(filename, context);
       if (status  != APR_SUCCESS) {
           fprintf(stderr, "Couldn't delete the file\n");
           exit(-1); 
  @@ -230,7 +230,7 @@
       }
       
       fprintf(stdout, "\tMaking sure it's gone.......");
  -    status = ap_open(&thefile, filename, APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, context);
  +    status = apr_open(&thefile, filename, APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, context);
       if (status == APR_SUCCESS) {
           fprintf(stderr, "I could open the file for some reason?\n");
           exit(-1);
  @@ -246,26 +246,26 @@
       return 1;
   }
   
  -int test_filedel(ap_pool_t *context)
  +int test_filedel(apr_pool_t *context)
   {
  -    ap_file_t *thefile = NULL;
  -    ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
  -    ap_status_t stat;
  +    apr_file_t *thefile = NULL;
  +    apr_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
  +    apr_status_t stat;
     
  -    stat = ap_open(&thefile, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD, context);
  +    stat = apr_open(&thefile, "testdel", flag, APR_UREAD | APR_UWRITE | APR_GREAD, context);
       if (stat != APR_SUCCESS) {
            return stat;
       }
   
  -    if ((stat = ap_close(thefile))  != APR_SUCCESS) {
  +    if ((stat = apr_close(thefile))  != APR_SUCCESS) {
           return stat;
       }
   
  -    if ((stat = ap_remove_file("testdel", context))  != APR_SUCCESS) {
  +    if ((stat = apr_remove_file("testdel", context))  != APR_SUCCESS) {
           return stat;
       }
   
  -    stat = ap_open(&thefile, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, context);
  +    stat = apr_open(&thefile, "testdel", APR_READ, APR_UREAD | APR_UWRITE | APR_GREAD, context);
       if (stat == APR_SUCCESS) {
           return stat;
       }
  @@ -273,18 +273,18 @@
       return APR_SUCCESS;
   }
   
  -int testdirs(ap_pool_t *context)
  +int testdirs(apr_pool_t *context)
   {
  -    ap_dir_t *temp;  
  -    ap_file_t *file = NULL;
  -    ap_ssize_t bytes;
  +    apr_dir_t *temp;  
  +    apr_file_t *file = NULL;
  +    apr_ssize_t bytes;
       ap_filetype_e type;
       char *fname;
   
       fprintf(stdout, "Testing Directory functions.\n");
   
       fprintf(stdout, "\tMakeing Directory.......");
  -    if (ap_make_dir("testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE | APR_GREAD | APR_GWRITE | APR_GEXECUTE | APR_WREAD | APR_WWRITE | APR_WEXECUTE, context)  != APR_SUCCESS) {
  +    if (apr_make_dir("testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE | APR_GREAD | APR_GWRITE | APR_GEXECUTE | APR_WREAD | APR_WWRITE | APR_WEXECUTE, context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not create directory\n");
           return -1;
       }
  @@ -292,16 +292,16 @@
           fprintf(stdout, "OK\n");
       }
   
  -    if (ap_open(&file, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE, APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {;
  +    if (apr_open(&file, "testdir/testfile", APR_READ | APR_WRITE | APR_CREATE, APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {;
           return -1;
       }
   
       bytes = strlen("Another test!!!");
  -    ap_write(file, "Another test!!", &bytes); 
  -	ap_close(file);
  +    apr_write(file, "Another test!!", &bytes); 
  +	apr_close(file);
   
       fprintf(stdout, "\tOpening Directory.......");
  -    if (ap_opendir(&temp, "testdir", context) != APR_SUCCESS) {
  +    if (apr_opendir(&temp, "testdir", context) != APR_SUCCESS) {
           fprintf(stderr, "Could not open directory\n");
           return -1;
       }
  @@ -310,7 +310,7 @@
       }
   
       fprintf(stdout, "\tReading Directory.......");
  -    if ((ap_readdir(temp))  != APR_SUCCESS) {
  +    if ((apr_readdir(temp))  != APR_SUCCESS) {
           fprintf(stderr, "Could not read directory\n");
           return -1;
       }
  @@ -324,11 +324,11 @@
           /* Because I want the file I created, I am skipping the "." and ".."
            * files that are here. 
            */
  -        if (ap_readdir(temp) != APR_SUCCESS) {
  +        if (apr_readdir(temp) != APR_SUCCESS) {
               fprintf(stderr, "Error reading directory testdir"); 
               return -1;
           }
  -        ap_get_dir_filename(&fname, temp);
  +        apr_get_dir_filename(&fname, temp);
       } while (fname[0] == '.');
       if (strcmp(fname, "testfile")) {
           fprintf(stderr, "Got wrong file name %s\n", fname);
  @@ -337,7 +337,7 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile type.......");
  -    ap_dir_entry_ftype(&type, temp);
  +    apr_dir_entry_ftype(&type, temp);
       if (type != APR_REG) {
           fprintf(stderr, "Got wrong file type\n");
           return -1;
  @@ -345,19 +345,19 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "\t\tFile size.......");
  -    ap_dir_entry_size(&bytes, temp);
  -    if (bytes != (ap_ssize_t)strlen("Another test!!!")) {
  +    apr_dir_entry_size(&bytes, temp);
  +    if (bytes != (apr_ssize_t)strlen("Another test!!!")) {
           fprintf(stderr, "Got wrong file size %d\n", bytes);
           return -1;
       }
       fprintf(stdout, "OK\n");
        
       fprintf(stdout, "\tRewinding directory.......");
  -    ap_rewinddir(temp); 
  +    apr_rewinddir(temp); 
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "\tClosing Directory.......");
  -    if (ap_closedir(temp)  != APR_SUCCESS) {
  +    if (apr_closedir(temp)  != APR_SUCCESS) {
           fprintf(stderr, "Could not close directory\n");
           return -1;
       }
  @@ -366,7 +366,7 @@
       }
   
       fprintf(stdout, "\tRemoving file from directory.......");
  -    if (ap_remove_file("testdir/testfile", context)  != APR_SUCCESS) {
  +    if (apr_remove_file("testdir/testfile", context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not remove file\n");
           return -1;
       }
  @@ -375,7 +375,7 @@
       }
   
       fprintf(stdout, "\tRemoving Directory.......");
  -    if (ap_remove_dir("testdir", context)  != APR_SUCCESS) {
  +    if (apr_remove_dir("testdir", context)  != APR_SUCCESS) {
           fprintf(stderr, "Could not remove directory\n");
           return -1;
       }
  @@ -389,51 +389,51 @@
   #define TESTREAD_BLKSIZE 1024
   #define APR_BUFFERSIZE   4096 /* This should match APR's buffer size. */
   
  -static void create_testread(ap_pool_t *p, const char *fname)
  +static void create_testread(apr_pool_t *p, const char *fname)
   {
  -    ap_file_t *f = NULL;
  -    ap_status_t rv;
  +    apr_file_t *f = NULL;
  +    apr_status_t rv;
       char buf[TESTREAD_BLKSIZE];
  -    ap_ssize_t nbytes;
  +    apr_ssize_t nbytes;
   
       /* Create a test file with known content.
        */
  -    rv = ap_open(&f, fname, APR_CREATE | APR_WRITE | APR_TRUNCATE, APR_UREAD | APR_UWRITE, p);
  +    rv = apr_open(&f, fname, APR_CREATE | APR_WRITE | APR_TRUNCATE, APR_UREAD | APR_UWRITE, p);
       if (rv) {
  -        fprintf(stderr, "ap_open()->%d/%s\n",
  -                rv, ap_strerror(rv, buf, sizeof buf));
  +        fprintf(stderr, "apr_open()->%d/%s\n",
  +                rv, apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       nbytes = 4;
  -    rv = ap_write(f, "abc\n", &nbytes);
  +    rv = apr_write(f, "abc\n", &nbytes);
       assert(!rv && nbytes == 4);
       memset(buf, 'a', sizeof buf);
       nbytes = sizeof buf;
  -    rv = ap_write(f, buf, &nbytes);
  +    rv = apr_write(f, buf, &nbytes);
       assert(!rv && nbytes == sizeof buf);
       nbytes = 2;
  -    rv = ap_write(f, "\n\n", &nbytes);
  +    rv = apr_write(f, "\n\n", &nbytes);
       assert(!rv && nbytes == 2);
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       assert(!rv);
   }
   
  -static char read_one(ap_file_t *f, int expected)
  +static char read_one(apr_file_t *f, int expected)
   {
     char bytes[3];
  -  ap_status_t rv;
  +  apr_status_t rv;
     static int counter = 0;
  -  ap_ssize_t nbytes;
  +  apr_ssize_t nbytes;
   
     counter += 1;
   
     bytes[0] = bytes[2] = 0x01;
     if (counter % 2) {
  -      rv = ap_getc(bytes + 1, f);
  +      rv = apr_getc(bytes + 1, f);
     }
     else {
         nbytes = 1;
  -      rv = ap_read(f, bytes + 1, &nbytes);
  +      rv = apr_read(f, bytes + 1, &nbytes);
         assert(nbytes == 1);
     }
     assert(!rv);
  @@ -444,31 +444,31 @@
     return bytes[1];
   }
   
  -static void test_read_guts(ap_pool_t *p, const char *fname, ap_int32_t extra_flags)
  +static void test_read_guts(apr_pool_t *p, const char *fname, apr_int32_t extra_flags)
   {
  -    ap_file_t *f = NULL;
  -    ap_status_t rv;
  -    ap_ssize_t nbytes;
  +    apr_file_t *f = NULL;
  +    apr_status_t rv;
  +    apr_ssize_t nbytes;
       char buf[1024];
       int i;
   
  -    rv = ap_open(&f, fname, APR_READ | extra_flags, 0, p);
  +    rv = apr_open(&f, fname, APR_READ | extra_flags, 0, p);
       assert(!rv);
       read_one(f, 'a');
       read_one(f, 'b');
       if (extra_flags & APR_BUFFERED) {
           fprintf(stdout, 
  -                "\n\t\tskipping ap_ungetc() for APR_BUFFERED... "
  +                "\n\t\tskipping apr_ungetc() for APR_BUFFERED... "
                   "doesn't work yet...\n\t\t\t\t ");
       }
       else {
  -        rv = ap_ungetc('b', f);
  +        rv = apr_ungetc('b', f);
           assert(!rv);
           /* Note: some implementations move the file ptr back;
            *       others just save up to one char; it isn't 
            *       portable to unget more than once.
            */
  -        /* Don't do this: rv = ap_ungetc('a', f); */
  +        /* Don't do this: rv = apr_ungetc('a', f); */
           read_one(f, 'b');
       }
       read_one(f, 'c');
  @@ -478,20 +478,20 @@
       }
       read_one(f, '\n');
       read_one(f, '\n');
  -    rv = ap_getc(buf, f);
  +    rv = apr_getc(buf, f);
       assert(rv == APR_EOF);
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       assert(!rv);
   
       f = NULL;
  -    rv = ap_open(&f, fname, APR_READ | extra_flags, 0, p);
  +    rv = apr_open(&f, fname, APR_READ | extra_flags, 0, p);
       assert(!rv);
  -    rv = ap_fgets(buf, 10, f);
  +    rv = apr_fgets(buf, 10, f);
       assert(!rv);
       assert(!strcmp(buf, "abc\n"));
       /* read first 800 of TESTREAD_BLKSIZE 'a's 
        */
  -    rv = ap_fgets(buf, 801, f);
  +    rv = apr_fgets(buf, 801, f);
       assert(!rv);
       assert(strlen(buf) == 800);
       for (i = 0; i < 800; i++) {
  @@ -499,7 +499,7 @@
       }
       /* read rest of the 'a's and the first newline
        */
  -    rv = ap_fgets(buf, sizeof buf, f);
  +    rv = apr_fgets(buf, sizeof buf, f);
       assert(!rv);
       assert(strlen(buf) == TESTREAD_BLKSIZE - 800 + 1);
       for (i = 0; i < TESTREAD_BLKSIZE - 800; i++) {
  @@ -508,63 +508,63 @@
       assert(buf[TESTREAD_BLKSIZE - 800] == '\n');
       /* read the last newline
        */
  -    rv = ap_fgets(buf, sizeof buf, f);
  +    rv = apr_fgets(buf, sizeof buf, f);
       assert(!rv);
       assert(!strcmp(buf, "\n"));
       /* get APR_EOF
        */
  -    rv = ap_fgets(buf, sizeof buf, f);
  +    rv = apr_fgets(buf, sizeof buf, f);
       assert(rv == APR_EOF);
  -    /* get APR_EOF with ap_getc
  +    /* get APR_EOF with apr_getc
        */
  -    rv = ap_getc(buf, f);
  +    rv = apr_getc(buf, f);
       assert(rv == APR_EOF);
  -    /* get APR_EOF with ap_read
  +    /* get APR_EOF with apr_read
        */
       nbytes = sizeof buf;
  -    rv = ap_read(f, buf, &nbytes);
  +    rv = apr_read(f, buf, &nbytes);
       assert(rv == APR_EOF);
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       assert(!rv);
   }
   
  -static void test_bigread(ap_pool_t *p, const char *fname, ap_int32_t extra_flags)
  +static void test_bigread(apr_pool_t *p, const char *fname, apr_int32_t extra_flags)
   {
  -    ap_file_t *f = NULL;
  -    ap_status_t rv;
  +    apr_file_t *f = NULL;
  +    apr_status_t rv;
       char buf[APR_BUFFERSIZE * 2];
  -    ap_ssize_t nbytes;
  +    apr_ssize_t nbytes;
   
       /* Create a test file with known content.
        */
  -    rv = ap_open(&f, fname, APR_CREATE | APR_WRITE | APR_TRUNCATE, APR_UREAD | APR_UWRITE, p);
  +    rv = apr_open(&f, fname, APR_CREATE | APR_WRITE | APR_TRUNCATE, APR_UREAD | APR_UWRITE, p);
       if (rv) {
  -        fprintf(stderr, "ap_open()->%d/%s\n",
  -                rv, ap_strerror(rv, buf, sizeof buf));
  +        fprintf(stderr, "apr_open()->%d/%s\n",
  +                rv, apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       nbytes = APR_BUFFERSIZE;
       memset(buf, 0xFE, nbytes);
  -    rv = ap_write(f, buf, &nbytes);
  +    rv = apr_write(f, buf, &nbytes);
       assert(!rv && nbytes == APR_BUFFERSIZE);
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       assert(!rv);
   
       f = NULL;
  -    rv = ap_open(&f, fname, APR_READ | extra_flags, 0, p);
  +    rv = apr_open(&f, fname, APR_READ | extra_flags, 0, p);
       assert(!rv);
       nbytes = sizeof buf;
  -    rv = ap_read(f, buf, &nbytes);
  +    rv = apr_read(f, buf, &nbytes);
       assert(!rv);
       assert(nbytes == APR_BUFFERSIZE);
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       assert(!rv);
   }
   
  -static void test_read(ap_pool_t *p)
  +static void test_read(apr_pool_t *p)
   {
       const char *fname = "testread.dat";
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       fprintf(stdout, "Testing file read functions.\n");
   
  @@ -581,7 +581,7 @@
       fprintf(stdout, "\tMore unbuffered file tests......");
       test_bigread(p, fname, 0);
       fprintf(stdout, "OK\n");
  -    rv = ap_remove_file(fname, p);
  +    rv = apr_remove_file(fname, p);
       assert(!rv);
       fprintf(stdout, "\tAll read tests...........OK\n");
   }
  
  
  
  1.2       +12 -12    apache-2.0/src/lib/apr/test/testmd5.c
  
  Index: testmd5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testmd5.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testmd5.c	2000/05/06 13:41:58	1.1
  +++ testmd5.c	2000/08/02 05:26:37	1.2
  @@ -81,15 +81,15 @@
        "\xd1\xa1\xc0\x97\x8a\x60\xbb\xfb\x2a\x25\x46\x9d\xa5\xae\xd0\xb0"}
   };
   
  -static void try(const void *buf, size_t bufLen, ap_xlate_t *xlate,
  +static void try(const void *buf, size_t bufLen, apr_xlate_t *xlate,
                   const void *digest)
   {
       int i;
  -    ap_status_t rv;
  +    apr_status_t rv;
       ap_md5_ctx_t context;
       unsigned char hash[MD5_DIGESTSIZE];
   
  -    rv = ap_MD5Init(&context);
  +    rv = apr_MD5Init(&context);
       assert(!rv);
   
       if (xlate) {
  @@ -101,10 +101,10 @@
   #endif
       }
       
  -    rv = ap_MD5Update(&context, buf, bufLen);
  +    rv = apr_MD5Update(&context, buf, bufLen);
       assert(!rv);
   
  -    rv = ap_MD5Final(hash, &context);
  +    rv = apr_MD5Final(hash, &context);
       assert(!rv);
   
       for (i = 0; i < MD5_DIGESTSIZE; i++) {
  @@ -128,9 +128,9 @@
   
   int main(int argc, char **argv)
   {
  -    ap_status_t rv;
  -    ap_xlate_t *xlate = NULL;
  -    ap_pool_t *pool;
  +    apr_status_t rv;
  +    apr_xlate_t *xlate = NULL;
  +    apr_pool_t *pool;
       const char *src = NULL, *dst = NULL;
       int cur;
   
  @@ -148,11 +148,11 @@
           exit(1);
       }
   
  -    rv = ap_initialize();
  +    rv = apr_initialize();
       assert(!rv);
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
  -    rv = ap_create_pool(&pool, NULL);
  +    rv = apr_create_pool(&pool, NULL);
   
       if (src) {
   #if APR_HAS_XLATE
  @@ -161,7 +161,7 @@
               char buf[80];
   
               fprintf(stderr, "ap_xlate_open()->%s (%d)\n",
  -                    ap_strerror(rv, buf, sizeof(buf)), rv);
  +                    apr_strerror(rv, buf, sizeof(buf)), rv);
               exit(1);
           }
   #else
  
  
  
  1.13      +13 -13    apache-2.0/src/lib/apr/test/testmmap.c
  
  Index: testmmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testmmap.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- testmmap.c	2000/04/14 15:58:44	1.12
  +++ testmmap.c	2000/08/02 05:26:37	1.13
  @@ -69,36 +69,36 @@
   
   int main()
   {
  -    ap_pool_t *context;
  -    ap_mmap_t *themmap = NULL;
  -    ap_file_t *thefile = NULL;
  -    ap_finfo_t finfo;
  -    ap_int32_t flag = APR_READ;
  +    apr_pool_t *context;
  +    apr_mmap_t *themmap = NULL;
  +    apr_file_t *thefile = NULL;
  +    apr_finfo_t finfo;
  +    apr_int32_t flag = APR_READ;
       char *file1;
       
       fprintf (stdout,"APR MMAP Test\n*************\n\n");
       
       fprintf(stdout,"Initializing........................");
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Failed.\n");
           exit(-1);
       }
       fprintf(stdout,"OK\n");
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
       fprintf(stdout,"Creating context....................");    
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Failed.\n");
           exit(-1);
       }
       fprintf(stdout,"OK\n");
       
  -    file1 = (char*) ap_palloc(context, sizeof(char) * PATH_LEN);
  +    file1 = (char*) apr_palloc(context, sizeof(char) * PATH_LEN);
       getcwd(file1, PATH_LEN);
       strncat(file1,"/testmmap.c",11);  
   
       fprintf(stdout, "Opening file........................");
  -    if (ap_open(&thefile, file1, flag, APR_UREAD | APR_GREAD, context) != APR_SUCCESS) {
  +    if (apr_open(&thefile, file1, flag, APR_UREAD | APR_GREAD, context) != APR_SUCCESS) {
           perror("Didn't open file");
           exit(-1);
       }
  @@ -107,7 +107,7 @@
       }
       
       fprintf(stderr, "Getting file size...................");
  -    if (ap_getfileinfo(&finfo, thefile) != APR_SUCCESS) {
  +    if (apr_getfileinfo(&finfo, thefile) != APR_SUCCESS) {
           perror("Didn't get file information!");
           exit(-1);
       }
  @@ -116,14 +116,14 @@
       }  
       
       fprintf(stdout,"Trying to mmap the file.............");
  -    if (ap_mmap_create(&themmap, thefile, 0, finfo.size, context) != APR_SUCCESS) {
  +    if (apr_mmap_create(&themmap, thefile, 0, finfo.size, context) != APR_SUCCESS) {
           fprintf(stderr,"Failed!\n");
           exit(-1);
       }
       fprintf(stdout,"OK\n");
   
       fprintf(stdout,"Trying to delete the mmap file......");
  -    if (ap_mmap_delete(themmap) != APR_SUCCESS) {
  +    if (apr_mmap_delete(themmap) != APR_SUCCESS) {
           fprintf(stderr,"Failed!\n");
           exit (-1);
       }
  
  
  
  1.12      +16 -16    apache-2.0/src/lib/apr/test/testoc.c
  
  Index: testoc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testoc.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- testoc.c	2000/08/01 23:10:29	1.11
  +++ testoc.c	2000/08/02 05:26:37	1.12
  @@ -85,44 +85,44 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_pool_t *context;
  -    ap_proc_t newproc;
  -    ap_procattr_t *procattr = NULL;
  -    ap_file_t *std = NULL;
  +    apr_pool_t *context;
  +    apr_proc_t newproc;
  +    apr_procattr_t *procattr = NULL;
  +    apr_file_t *std = NULL;
       char *args[3];
   
       if (argc > 1) {
           while (1);
       }
   
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Couldn't initialize.");
           exit(-1);
       }
  -    atexit(ap_terminate);
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    atexit(apr_terminate);
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
       
  -    args[0] = ap_pstrdup(context, "occhild");
  -    args[1] = ap_pstrdup(context, "-X");
  +    args[0] = apr_pstrdup(context, "occhild");
  +    args[1] = apr_pstrdup(context, "-X");
       args[2] = NULL;
   
       fprintf(stdout, "[PARENT] Creating procattr.............");
       fflush(stdout);
  -    if (ap_createprocattr_init(&procattr, context) != APR_SUCCESS) {
  +    if (apr_createprocattr_init(&procattr, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create attr\n");
           exit(-1);;
       }
       else {
  -        ap_setprocattr_io(procattr, APR_FULL_BLOCK, APR_NO_PIPE, APR_NO_PIPE);
  +        apr_setprocattr_io(procattr, APR_FULL_BLOCK, APR_NO_PIPE, APR_NO_PIPE);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "[PARENT] Starting other child..........");
       fflush(stdout);
  -    if (ap_create_process(&newproc, "./occhild", args, NULL, procattr, context) 
  +    if (apr_create_process(&newproc, "./occhild", args, NULL, procattr, context) 
                             != APR_SUCCESS) {
           fprintf(stderr, "error starting other child\n");
           exit(-1);
  @@ -131,12 +131,12 @@
   
       std = newproc.in;
   
  -    ap_register_other_child(&newproc, ocmaint, NULL, std, context);
  +    apr_register_other_child(&newproc, ocmaint, NULL, std, context);
   
       fprintf(stdout, "[PARENT] Sending SIGKILL to child......");
       fflush(stdout);
       sleep(1);
  -    if (ap_kill(&newproc, SIGKILL) != APR_SUCCESS) {
  +    if (apr_kill(&newproc, SIGKILL) != APR_SUCCESS) {
           fprintf(stderr,"couldn't send the signal!\n");
           exit(-1);
       }
  @@ -144,10 +144,10 @@
       
       /* allow time for things to settle... */
       sleep(3);
  -    ap_probe_writable_fds();
  +    apr_probe_writable_fds();
       
       fprintf(stdout, "[PARENT] Checking on children..........\n");
  -    ap_check_other_child();
  +    apr_check_other_child();
       
       return 1;
   }    
  
  
  
  1.9       +17 -17    apache-2.0/src/lib/apr/test/testpipe.c
  
  Index: testpipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testpipe.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- testpipe.c	2000/06/19 13:54:48	1.8
  +++ testpipe.c	2000/08/02 05:26:37	1.9
  @@ -64,20 +64,20 @@
   
   int main(void)
   {
  -    ap_pool_t *context;
  -    ap_file_t *readp = NULL;
  -    ap_file_t *writep = NULL;
  -    ap_size_t nbytes;
  -    ap_status_t rv;
  +    apr_pool_t *context;
  +    apr_file_t *readp = NULL;
  +    apr_file_t *writep = NULL;
  +    apr_size_t nbytes;
  +    apr_status_t rv;
       char *buf;
       char msgbuf[120];
   
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Couldn't initialize.");
           exit(-1);
       }
  -    atexit(ap_terminate);
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    atexit(apr_terminate);
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't allocate context.");
           exit(-1);
       }
  @@ -85,9 +85,9 @@
       fprintf(stdout, "Testing pipe functions.\n");
   
       fprintf(stdout, "\tCreating pipes.......");
  -    if ((rv = ap_create_pipe(&readp, &writep, context)) != APR_SUCCESS) {
  -        fprintf(stderr, "ap_create_pipe()->%d/%s\n",
  -                rv, ap_strerror(rv, msgbuf, sizeof msgbuf));
  +    if ((rv = apr_create_pipe(&readp, &writep, context)) != APR_SUCCESS) {
  +        fprintf(stderr, "apr_create_pipe()->%d/%s\n",
  +                rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
           exit(-1);
       }
       else {
  @@ -95,18 +95,18 @@
       }
       
       fprintf(stdout, "\tSetting pipe timeout.......");
  -    if ((rv = ap_set_pipe_timeout(readp, 1 * AP_USEC_PER_SEC)) != APR_SUCCESS) {
  -        fprintf(stderr, "ap_set_pipe_timeout()->%d/%s\n",
  -                rv, ap_strerror(rv, msgbuf, sizeof msgbuf));
  +    if ((rv = apr_set_pipe_timeout(readp, 1 * AP_USEC_PER_SEC)) != APR_SUCCESS) {
  +        fprintf(stderr, "apr_set_pipe_timeout()->%d/%s\n",
  +                rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
           exit(-1);
       } else {
           fprintf(stdout, "OK\n");
       }        
   
       fprintf(stdout, "\tReading from the pipe.......");
  -    nbytes = (ap_ssize_t)strlen("this is a test");
  -    buf = (char *)ap_palloc(context, nbytes + 1);
  -    if (ap_read(readp, buf, &nbytes) == APR_TIMEUP) {
  +    nbytes = (apr_ssize_t)strlen("this is a test");
  +    buf = (char *)apr_palloc(context, nbytes + 1);
  +    if (apr_read(readp, buf, &nbytes) == APR_TIMEUP) {
           fprintf(stdout, "OK\n");
       }
       else {
  
  
  
  1.20      +23 -23    apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- testproc.c	2000/08/01 23:10:30	1.19
  +++ testproc.c	2000/08/02 05:26:37	1.20
  @@ -71,47 +71,47 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_pool_t *context;
  -    ap_proc_t newproc;
  -    ap_procattr_t *attr;
  -    ap_file_t *testfile = NULL;
  -    ap_ssize_t length;
  +    apr_pool_t *context;
  +    apr_proc_t newproc;
  +    apr_procattr_t *attr;
  +    apr_file_t *testfile = NULL;
  +    apr_ssize_t length;
       char *buf;
       char *args[3];
       char *teststr;
   
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Couldn't initialize.");
           exit(-1);
       }
  -    atexit(ap_terminate);
  -    ap_create_pool(&context, NULL);
  +    atexit(apr_terminate);
  +    apr_create_pool(&context, NULL);
   
   
       if (argc > 1) {
  -        teststr = ap_palloc(context, 256);
  +        teststr = apr_palloc(context, 256);
           teststr = fgets(teststr, 256, stdin);      
           fprintf(stdout, "%s", teststr);      
           exit(1);
       }
  -    teststr = ap_pstrdup(context, "Whooo Hoooo\0");
  +    teststr = apr_pstrdup(context, "Whooo Hoooo\0");
   
       fprintf(stdout, "Creating directory for later use.......");
  -    if (ap_make_dir("proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {
  +    if (apr_make_dir("proctest", APR_UREAD | APR_UWRITE | APR_UEXECUTE, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create dir\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Creating procattr.......");
  -    if (ap_createprocattr_init(&attr, context) != APR_SUCCESS) {
  +    if (apr_createprocattr_init(&attr, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create attr\n");
           exit(-1);;
       }
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Setting attr pipes, all three.......");
  -    if (ap_setprocattr_io(attr, APR_FULL_BLOCK, 
  +    if (apr_setprocattr_io(attr, APR_FULL_BLOCK, 
                             APR_CHILD_BLOCK, APR_NO_PIPE) != APR_SUCCESS) {
           fprintf(stderr, "Could not set pipes attr\n");
           exit(-1);
  @@ -119,25 +119,25 @@
       fprintf(stdout, "OK.\n");
       
       fprintf(stdout, "Setting attr dir.......");
  -    if (ap_setprocattr_dir(attr, "proctest") != APR_SUCCESS) {
  +    if (apr_setprocattr_dir(attr, "proctest") != APR_SUCCESS) {
           fprintf(stderr, "Could not set directory attr\n");
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
   
       fprintf(stdout, "Setting attr cmd type.......");
  -    if (ap_setprocattr_cmdtype(attr, APR_PROGRAM) != APR_SUCCESS) {
  +    if (apr_setprocattr_cmdtype(attr, APR_PROGRAM) != APR_SUCCESS) {
           fprintf(stderr, "Could not set cmd type attr\n");
           exit(-1);
       }
       fprintf(stdout, "OK.\n");
   
  -    args[0] = ap_pstrdup(context, "testproc");
  -    args[1] = ap_pstrdup(context, "-X");
  +    args[0] = apr_pstrdup(context, "testproc");
  +    args[1] = apr_pstrdup(context, "-X");
       args[2] = NULL;
       
       fprintf(stdout, "Creating a new process.......");
  -    if (ap_create_process(&newproc, "../testproc", args, NULL, attr, context) != APR_SUCCESS) {
  +    if (apr_create_process(&newproc, "../testproc", args, NULL, attr, context) != APR_SUCCESS) {
           fprintf(stderr, "Could not create the new process\n");
           exit(-1);
       }
  @@ -149,7 +149,7 @@
   
       length = 256;
       fprintf(stdout, "Writing the data to child.......");
  -    if (ap_write(testfile, teststr, &length) == APR_SUCCESS) {
  +    if (apr_write(testfile, teststr, &length) == APR_SUCCESS) {
           fprintf(stdout,"OK\n");
       }
       else fprintf(stderr, "Write failed.\n");
  @@ -160,8 +160,8 @@
   
       length = 256;
       fprintf(stdout, "Checking the data read from pipe to child.......");
  -    buf = ap_pcalloc(context, length);
  -    if (ap_read(testfile, buf, &length) == APR_SUCCESS) {
  +    buf = apr_pcalloc(context, length);
  +    if (apr_read(testfile, buf, &length) == APR_SUCCESS) {
           if (!strcmp(buf, teststr))
               fprintf(stdout,"OK\n");
           else fprintf(stderr, "Uh-Oh\n");
  @@ -169,14 +169,14 @@
       else fprintf(stderr, "Read failed.\n");
   
       fprintf(stdout, "Waiting for child to die.......");
  -    if (ap_wait_proc(&newproc, APR_WAIT) != APR_CHILD_DONE) {
  +    if (apr_wait_proc(&newproc, APR_WAIT) != APR_CHILD_DONE) {
           fprintf(stderr, "Wait for child failed\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
       fprintf(stdout, "Removing directory.......");
  -    if (ap_remove_dir("proctest", context) != APR_SUCCESS) {
  +    if (apr_remove_dir("proctest", context) != APR_SUCCESS) {
           fprintf(stderr, "Could not remove directory.\n");
           exit(-1);
       }
  
  
  
  1.5       +121 -121  apache-2.0/src/lib/apr/test/testsf.c
  
  Index: testsf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsf.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testsf.c	2000/07/18 02:30:28	1.4
  +++ testsf.c	2000/08/02 05:26:37	1.5
  @@ -90,80 +90,80 @@
   
   typedef enum {BLK, NONBLK, TIMEOUT} client_socket_mode_t;
   
  -static void apr_setup(ap_pool_t **p, ap_socket_t **sock)
  +static void apr_setup(apr_pool_t **p, apr_socket_t **sock)
   {
       char buf[120];
  -    ap_status_t rv;
  +    apr_status_t rv;
   
  -    rv = ap_initialize();
  +    rv = apr_initialize();
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_initialize()->%d/%s\n",
  +        fprintf(stderr, "apr_initialize()->%d/%s\n",
                   rv,
  -                ap_strerror(rv, buf, sizeof buf));
  +                apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
  -    rv = ap_create_pool(p, NULL);
  +    rv = apr_create_pool(p, NULL);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_create_pool()->%d/%s\n",
  +        fprintf(stderr, "apr_create_pool()->%d/%s\n",
                   rv,
  -                ap_strerror(rv, buf, sizeof buf));
  +                apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
       *sock = NULL;
  -    rv = ap_create_tcp_socket(sock, *p);
  +    rv = apr_create_tcp_socket(sock, *p);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_create_tcp_socket()->%d/%s\n",
  +        fprintf(stderr, "apr_create_tcp_socket()->%d/%s\n",
                   rv,
  -                ap_strerror(rv, buf, sizeof buf));
  +                apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   }
   
  -static void create_testfile(ap_pool_t *p, const char *fname)
  +static void create_testfile(apr_pool_t *p, const char *fname)
   {
  -    ap_file_t *f = NULL;
  -    ap_status_t rv;
  +    apr_file_t *f = NULL;
  +    apr_status_t rv;
       char buf[120];
       int i;
  -    ap_ssize_t nbytes;
  -    ap_finfo_t finfo;
  +    apr_ssize_t nbytes;
  +    apr_finfo_t finfo;
   
       printf("Creating a test file...\n");
  -    rv = ap_open(&f, fname, 
  +    rv = apr_open(&f, fname, 
                    APR_CREATE | APR_WRITE | APR_TRUNCATE | APR_BUFFERED,
                    APR_UREAD | APR_UWRITE, p);
       if (rv) {
  -        fprintf(stderr, "ap_open()->%d/%s\n",
  -                rv, ap_strerror(rv, buf, sizeof buf));
  +        fprintf(stderr, "apr_open()->%d/%s\n",
  +                rv, apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       
       buf[0] = FILE_DATA_CHAR;
       for (i = 0; i < FILE_LENGTH; i++) {
           nbytes = 1;
  -        rv = ap_write(f, buf, &nbytes);
  +        rv = apr_write(f, buf, &nbytes);
           if (rv) {
  -            fprintf(stderr, "ap_write()->%d/%s\n",
  -                    rv, ap_strerror(rv, buf, sizeof buf));
  +            fprintf(stderr, "apr_write()->%d/%s\n",
  +                    rv, apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
       }
   
  -    rv = ap_close(f);
  +    rv = apr_close(f);
       if (rv) {
  -        fprintf(stderr, "ap_close()->%d/%s\n",
  -                rv, ap_strerror(rv, buf, sizeof buf));
  +        fprintf(stderr, "apr_close()->%d/%s\n",
  +                rv, apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_stat(&finfo, fname, p);
  +    rv = apr_stat(&finfo, fname, p);
       if (rv) {
  -        fprintf(stderr, "ap_close()->%d/%s\n",
  -                rv, ap_strerror(rv, buf, sizeof buf));
  +        fprintf(stderr, "apr_close()->%d/%s\n",
  +                rv, apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  @@ -180,45 +180,45 @@
   
   static int client(client_socket_mode_t socket_mode)
   {
  -    ap_status_t rv, tmprv;
  -    ap_socket_t *sock;
  -    ap_pool_t *p;
  +    apr_status_t rv, tmprv;
  +    apr_socket_t *sock;
  +    apr_pool_t *p;
       char buf[120];
  -    ap_file_t *f = NULL;
  -    ap_size_t len, expected_len;
  -    ap_off_t current_file_offset;
  -    ap_hdtr_t hdtr;
  +    apr_file_t *f = NULL;
  +    apr_size_t len, expected_len;
  +    apr_off_t current_file_offset;
  +    apr_hdtr_t hdtr;
       struct iovec headers[3];
       struct iovec trailers[3];
  -    ap_ssize_t bytes_read;
  -    ap_pollfd_t *pfd;
  -    ap_int32_t nsocks;
  +    apr_ssize_t bytes_read;
  +    apr_pollfd_t *pfd;
  +    apr_int32_t nsocks;
       int i;
   
       apr_setup(&p, &sock);
       create_testfile(p, TESTFILE);
   
  -    rv = ap_open(&f, TESTFILE, APR_READ, 0, p);
  +    rv = apr_open(&f, TESTFILE, APR_READ, 0, p);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_open()->%d/%s\n",
  +        fprintf(stderr, "apr_open()->%d/%s\n",
                   rv,
  -                ap_strerror(rv, buf, sizeof buf));
  +                apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_set_remote_port(sock, TESTSF_PORT);
  +    rv = apr_set_remote_port(sock, TESTSF_PORT);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_set_remote_port()->%d/%s\n",
  +        fprintf(stderr, "apr_set_remote_port()->%d/%s\n",
                   rv,
  -                ap_strerror(rv, buf, sizeof buf));
  +                apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_connect(sock, "127.0.0.1");
  +    rv = apr_connect(sock, "127.0.0.1");
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_connect()->%d/%s\n", 
  +        fprintf(stderr, "apr_connect()->%d/%s\n", 
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  @@ -228,22 +228,22 @@
           break;
       case NONBLK:
           /* set it non-blocking */
  -        rv = ap_setsocketopt(sock, APR_SO_NONBLOCK, 1);
  +        rv = apr_setsocketopt(sock, APR_SO_NONBLOCK, 1);
           if (rv != APR_SUCCESS) {
  -            fprintf(stderr, "ap_setsocketopt(APR_SO_NONBLOCK)->%d/%s\n", 
  +            fprintf(stderr, "apr_setsocketopt(APR_SO_NONBLOCK)->%d/%s\n", 
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           break;
       case TIMEOUT:
           /* set a timeout */
  -        rv = ap_setsocketopt(sock, APR_SO_TIMEOUT, 
  +        rv = apr_setsocketopt(sock, APR_SO_TIMEOUT, 
                                100 * AP_USEC_PER_SEC);
           if (rv != APR_SUCCESS) {
  -            fprintf(stderr, "ap_setsocketopt(APR_SO_NONBLOCK)->%d/%s\n", 
  +            fprintf(stderr, "apr_setsocketopt(APR_SO_NONBLOCK)->%d/%s\n", 
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           break;
  @@ -287,7 +287,7 @@
           if (rv != APR_SUCCESS) {
               fprintf(stderr, "ap_sendfile()->%d/%s\n",
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           
  @@ -308,19 +308,19 @@
       }
       else {
           /* non-blocking... wooooooo */
  -        ap_size_t total_bytes_sent;
  +        apr_size_t total_bytes_sent;
   
           pfd = NULL;
  -        rv = ap_setup_poll(&pfd, 1, p);
  +        rv = apr_setup_poll(&pfd, 1, p);
           assert(!rv);
  -        rv = ap_add_poll_socket(pfd, sock, APR_POLLOUT);
  +        rv = apr_add_poll_socket(pfd, sock, APR_POLLOUT);
           assert(!rv);
   
           total_bytes_sent = 0;
           current_file_offset = 0;
           len = FILE_LENGTH;
           do {
  -            ap_size_t tmplen;
  +            apr_size_t tmplen;
   
               tmplen = len; /* bytes remaining to send from the file */
               printf("Calling ap_sendfile()...\n");
  @@ -340,9 +340,9 @@
               rv = ap_sendfile(sock, f, &hdtr, &current_file_offset, &tmplen, 0);
               printf("ap_sendfile()->%d, sent %ld bytes\n", rv, (long)tmplen);
               if (rv) {
  -                if (ap_canonical_error(rv) == APR_EAGAIN) {
  +                if (apr_canonical_error(rv) == APR_EAGAIN) {
                       nsocks = 1;
  -                    tmprv = ap_poll(pfd, &nsocks, -1);
  +                    tmprv = apr_poll(pfd, &nsocks, -1);
                       assert(!tmprv);
                       assert(nsocks == 1);
                       /* continue; */
  @@ -407,7 +407,7 @@
   
           } while (total_bytes_sent < expected_len &&
                    (rv == APR_SUCCESS || 
  -                  ap_canonical_error(rv) == APR_EAGAIN));
  +                  apr_canonical_error(rv) == APR_EAGAIN));
           if (total_bytes_sent != expected_len) {
               fprintf(stderr,
                       "client problem: sent %ld of %ld bytes\n",
  @@ -422,11 +422,11 @@
       }
       
       current_file_offset = 0;
  -    rv = ap_seek(f, APR_CUR, &current_file_offset);
  +    rv = apr_seek(f, APR_CUR, &current_file_offset);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_seek()->%d/%s\n",
  +        fprintf(stderr, "apr_seek()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  @@ -434,20 +434,20 @@
              "at offset %ld.\n",
              (long int)current_file_offset);
   
  -    rv = ap_shutdown(sock, APR_SHUTDOWN_WRITE);
  +    rv = apr_shutdown(sock, APR_SHUTDOWN_WRITE);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_shutdown()->%d/%s\n",
  +        fprintf(stderr, "apr_shutdown()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
       bytes_read = 1;
  -    rv = ap_recv(sock, buf, &bytes_read);
  +    rv = apr_recv(sock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != 0) {
  @@ -459,11 +459,11 @@
   
       printf("client: ap_sendfile() worked as expected!\n");
   
  -    rv = ap_remove_file(TESTFILE, p);
  +    rv = apr_remove_file(TESTFILE, p);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_remove_file()->%d/%s\n",
  +        fprintf(stderr, "apr_remove_file()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  @@ -472,55 +472,55 @@
   
   static int server(void)
   {
  -    ap_status_t rv;
  -    ap_socket_t *sock;
  -    ap_pool_t *p;
  +    apr_status_t rv;
  +    apr_socket_t *sock;
  +    apr_pool_t *p;
       char buf[120];
       int i;
  -    ap_socket_t *newsock = NULL;
  -    ap_ssize_t bytes_read;
  +    apr_socket_t *newsock = NULL;
  +    apr_ssize_t bytes_read;
   
       apr_setup(&p, &sock);
   
  -    rv = ap_set_local_port(sock, TESTSF_PORT);
  +    rv = apr_set_local_port(sock, TESTSF_PORT);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_set_local_port()->%d/%s\n",
  +        fprintf(stderr, "apr_set_local_port()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_setsocketopt(sock, APR_SO_REUSEADDR, 1);
  +    rv = apr_setsocketopt(sock, APR_SO_REUSEADDR, 1);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_setsocketopt()->%d/%s\n",
  +        fprintf(stderr, "apr_setsocketopt()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_bind(sock);
  +    rv = apr_bind(sock);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_bind()->%d/%s\n",
  +        fprintf(stderr, "apr_bind()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  -    rv = ap_listen(sock, 5);
  +    rv = apr_listen(sock, 5);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_listen()->%d/%s\n",
  +        fprintf(stderr, "apr_listen()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
       printf("Waiting for a client to connect...\n");
   
  -    rv = ap_accept(&newsock, sock, p);
  +    rv = apr_accept(&newsock, sock, p);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_accept()->%d/%s\n",
  +        fprintf(stderr, "apr_accept()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
   
  @@ -528,11 +528,11 @@
   
       assert(sizeof buf > strlen(HDR1));
       bytes_read = strlen(HDR1);
  -    rv = ap_recv(newsock, buf, &bytes_read);
  +    rv = apr_recv(newsock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != strlen(HDR1)) {
  @@ -548,11 +548,11 @@
           
       assert(sizeof buf > strlen(HDR2));
       bytes_read = strlen(HDR2);
  -    rv = ap_recv(newsock, buf, &bytes_read);
  +    rv = apr_recv(newsock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != strlen(HDR2)) {
  @@ -568,15 +568,15 @@
   
       for (i = 0; i < HDR3_LEN; i++) {
           bytes_read = 1;
  -        rv = ap_recv(newsock, buf, &bytes_read);
  +        rv = apr_recv(newsock, buf, &bytes_read);
           if (rv != APR_SUCCESS) {
  -            fprintf(stderr, "ap_recv()->%d/%s\n",
  +            fprintf(stderr, "apr_recv()->%d/%s\n",
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           if (bytes_read != 1) {
  -            fprintf(stderr, "ap_recv()->%ld bytes instead of 1\n",
  +            fprintf(stderr, "apr_recv()->%ld bytes instead of 1\n",
                       (long int)bytes_read);
               exit(1);
           }
  @@ -593,15 +593,15 @@
           
       for (i = 0; i < FILE_LENGTH; i++) {
           bytes_read = 1;
  -        rv = ap_recv(newsock, buf, &bytes_read);
  +        rv = apr_recv(newsock, buf, &bytes_read);
           if (rv != APR_SUCCESS) {
  -            fprintf(stderr, "ap_recv()->%d/%s\n",
  +            fprintf(stderr, "apr_recv()->%d/%s\n",
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           if (bytes_read != 1) {
  -            fprintf(stderr, "ap_recv()->%ld bytes instead of 1\n",
  +            fprintf(stderr, "apr_recv()->%ld bytes instead of 1\n",
                       (long int)bytes_read);
               exit(1);
           }
  @@ -618,11 +618,11 @@
           
       assert(sizeof buf > strlen(TRL1));
       bytes_read = strlen(TRL1);
  -    rv = ap_recv(newsock, buf, &bytes_read);
  +    rv = apr_recv(newsock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != strlen(TRL1)) {
  @@ -638,11 +638,11 @@
           
       assert(sizeof buf > strlen(TRL2));
       bytes_read = strlen(TRL2);
  -    rv = ap_recv(newsock, buf, &bytes_read);
  +    rv = apr_recv(newsock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != strlen(TRL2)) {
  @@ -658,15 +658,15 @@
   
       for (i = 0; i < TRL3_LEN; i++) {
           bytes_read = 1;
  -        rv = ap_recv(newsock, buf, &bytes_read);
  +        rv = apr_recv(newsock, buf, &bytes_read);
           if (rv != APR_SUCCESS) {
  -            fprintf(stderr, "ap_recv()->%d/%s\n",
  +            fprintf(stderr, "apr_recv()->%d/%s\n",
                       rv,
  -                    ap_strerror(rv, buf, sizeof buf));
  +                    apr_strerror(rv, buf, sizeof buf));
               exit(1);
           }
           if (bytes_read != 1) {
  -            fprintf(stderr, "ap_recv()->%ld bytes instead of 1\n",
  +            fprintf(stderr, "apr_recv()->%ld bytes instead of 1\n",
                       (long int)bytes_read);
               exit(1);
           }
  @@ -682,11 +682,11 @@
       }
           
       bytes_read = 1;
  -    rv = ap_recv(newsock, buf, &bytes_read);
  +    rv = apr_recv(newsock, buf, &bytes_read);
       if (rv != APR_SUCCESS) {
  -        fprintf(stderr, "ap_recv()->%d/%s\n",
  +        fprintf(stderr, "apr_recv()->%d/%s\n",
                   rv,
  -		ap_strerror(rv, buf, sizeof buf));
  +		apr_strerror(rv, buf, sizeof buf));
           exit(1);
       }
       if (bytes_read != 0) {
  
  
  
  1.11      +8 -8      apache-2.0/src/lib/apr/test/testshmem.c
  
  Index: testshmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testshmem.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- testshmem.c	2000/08/01 23:10:30	1.10
  +++ testshmem.c	2000/08/02 05:26:37	1.11
  @@ -70,7 +70,7 @@
       char msg[1024]; 
       int msgavail; 
   } mbox;
  -ap_pool_t *context;
  +apr_pool_t *context;
   mbox *boxes;
   
   void msgwait(int boxnum)
  @@ -87,27 +87,27 @@
   void msgput(int boxnum, char *msg)
   {
       fprintf(stdout, "Sending message to box %d\n", boxnum);
  -    ap_cpystrn(boxes[boxnum].msg, msg, strlen(msg));
  +    apr_cpystrn(boxes[boxnum].msg, msg, strlen(msg));
       boxes[boxnum].msgavail = 1;
   }
   
   int main()
   {
  -    ap_shmem_t *shm;
  +    apr_shmem_t *shm;
       pid_t pid;
       int size;
   
  -    ap_initialize();
  +    apr_initialize();
   
       fprintf(stdout, "Initializing the context......."); 
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "could not initialize\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Creating shared memory block......."); 
  -    if (ap_shm_init(&shm, 1048576, NULL, context) != APR_SUCCESS) { 
  +    if (apr_shm_init(&shm, 1048576, NULL, context) != APR_SUCCESS) { 
           fprintf(stderr, "Error allocating shared memory block\n");
           exit(-1);
       }
  @@ -115,7 +115,7 @@
   
       fprintf(stdout, "Allocating shared memory......."); 
       size = sizeof(mbox) * 2;
  -    boxes = ap_shm_calloc(shm, size);
  +    boxes = apr_shm_calloc(shm, size);
       if (boxes == NULL) { 
           fprintf(stderr, "Error creating message boxes.\n");
           exit(-1);
  @@ -126,7 +126,7 @@
       pid = fork();
       if (pid == 0) {
   sleep(1);
  -        if (ap_open_shmem(shm) == APR_SUCCESS) {
  +        if (apr_open_shmem(shm) == APR_SUCCESS) {
               msgwait(1);
               msgput(0, "Msg received\n");
           } else {
  
  
  
  1.11      +22 -22    apache-2.0/src/lib/apr/test/testsock.c
  
  Index: testsock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsock.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- testsock.c	2000/08/01 23:10:30	1.10
  +++ testsock.c	2000/08/02 05:26:37	1.11
  @@ -65,26 +65,26 @@
   
   int main(int argc, char *argv[])
   {
  -    ap_pool_t *context;
  +    apr_pool_t *context;
   
  -    ap_procattr_t *attr1 = NULL;
  -    ap_procattr_t *attr2 = NULL;
  -    ap_proc_t proc1;
  -    ap_proc_t proc2;
  -    ap_status_t s1;
  -    ap_status_t s2;
  +    apr_procattr_t *attr1 = NULL;
  +    apr_procattr_t *attr2 = NULL;
  +    apr_proc_t proc1;
  +    apr_proc_t proc2;
  +    apr_status_t s1;
  +    apr_status_t s2;
       char *args[2];
   
       fprintf(stdout, "Initializing.........");
  -    if (ap_initialize() != APR_SUCCESS) {
  +    if (apr_initialize() != APR_SUCCESS) {
           fprintf(stderr, "Something went wrong\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
  -    atexit(ap_terminate);
  +    atexit(apr_terminate);
   
       fprintf(stdout, "Creating context.......");
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "Could not create context\n");
           exit(-1);
       }
  @@ -96,38 +96,38 @@
       fprintf(stdout, "server and client by yourself.\n");
   
       fprintf(stdout, "Creating children to run network tests.......\n");
  -    s1 = ap_createprocattr_init(&attr1, context);
  -    s2 = ap_createprocattr_init(&attr2, context);
  +    s1 = apr_createprocattr_init(&attr1, context);
  +    s2 = apr_createprocattr_init(&attr2, context);
   
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
           fprintf(stderr, "Problem creating proc attrs\n");
           exit(-1);
       }
   
  -    args[0] = ap_pstrdup(context, "server");
  +    args[0] = apr_pstrdup(context, "server");
       args[1] = NULL; 
  -    s1 = ap_create_process(&proc1, "./server", args, NULL, attr1, context);
  +    s1 = apr_create_process(&proc1, "./server", args, NULL, attr1, context);
   
  -    args[0] = ap_pstrdup(context, "client");
  -    s2 = ap_create_process(&proc2, "./client", args, NULL, attr2, context);
  +    args[0] = apr_pstrdup(context, "client");
  +    s2 = apr_create_process(&proc2, "./client", args, NULL, attr2, context);
   
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
           fprintf(stderr, "Problem spawning new process\n");
           exit(-1);
       }
   
  -    while ((s1 = ap_wait_proc(&proc1, APR_NOWAIT)) != APR_CHILD_DONE || 
  -           (s2 = ap_wait_proc(&proc2, APR_NOWAIT)) != APR_CHILD_DONE) {
  +    while ((s1 = apr_wait_proc(&proc1, APR_NOWAIT)) != APR_CHILD_DONE || 
  +           (s2 = apr_wait_proc(&proc2, APR_NOWAIT)) != APR_CHILD_DONE) {
           continue;
       }
   
       if (s1 == APR_SUCCESS) {
  -        ap_kill(&proc2, SIGTERM);
  -        ap_wait_proc(&proc2, APR_WAIT);
  +        apr_kill(&proc2, SIGTERM);
  +        apr_wait_proc(&proc2, APR_WAIT);
       }
       else {
  -        ap_kill(&proc1, SIGTERM);
  -        ap_wait_proc(&proc1, APR_WAIT);
  +        apr_kill(&proc1, SIGTERM);
  +        apr_wait_proc(&proc1, APR_WAIT);
       }
       fprintf(stdout, "Network test completed.\n");   
   
  
  
  
  1.12      +29 -29    apache-2.0/src/lib/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- testthread.c	2000/05/26 16:23:33	1.11
  +++ testthread.c	2000/08/02 05:26:37	1.12
  @@ -69,17 +69,17 @@
   void * APR_THREAD_FUNC thread_func4(void *data);
   
   
  -ap_lock_t *thread_lock;
  -ap_pool_t *context;
  +apr_lock_t *thread_lock;
  +apr_pool_t *context;
   int x = 0;
   
   void * APR_THREAD_FUNC thread_func1(void *data)
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(thread_lock);
  +        apr_lock(thread_lock);
           x++;
  -        ap_unlock(thread_lock);
  +        apr_unlock(thread_lock);
       }
       return NULL;
   } 
  @@ -88,9 +88,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(thread_lock);
  +        apr_lock(thread_lock);
           x++;
  -        ap_unlock(thread_lock);
  +        apr_unlock(thread_lock);
       }
       return NULL;
   } 
  @@ -99,9 +99,9 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(thread_lock);
  +        apr_lock(thread_lock);
           x++;
  -        ap_unlock(thread_lock);
  +        apr_unlock(thread_lock);
       }
       return NULL;
   } 
  @@ -110,35 +110,35 @@
   {
       int i;
       for (i = 0; i < 10000; i++) {
  -        ap_lock(thread_lock);
  +        apr_lock(thread_lock);
           x++;
  -        ap_unlock(thread_lock);
  +        apr_unlock(thread_lock);
       }
       return NULL;
   } 
   
   int main()
   {
  -    ap_thread_t *t1;
  -    ap_thread_t *t2;
  -    ap_thread_t *t3;
  -    ap_thread_t *t4;
  -    ap_status_t s1;
  -    ap_status_t s2;
  -    ap_status_t s3;
  -    ap_status_t s4;
  +    apr_thread_t *t1;
  +    apr_thread_t *t2;
  +    apr_thread_t *t3;
  +    apr_thread_t *t4;
  +    apr_status_t s1;
  +    apr_status_t s2;
  +    apr_status_t s3;
  +    apr_status_t s4;
   
  -    ap_initialize();
  +    apr_initialize();
   
       fprintf(stdout, "Initializing the context......."); 
  -    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
  +    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
           fprintf(stderr, "could not initialize\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Initializing the lock......."); 
  -    s1 = ap_create_lock(&thread_lock, APR_MUTEX, APR_INTRAPROCESS, "lock.file", context); 
  +    s1 = apr_create_lock(&thread_lock, APR_MUTEX, APR_INTRAPROCESS, "lock.file", context); 
       if (s1 != APR_SUCCESS) {
           fprintf(stderr, "Could not create lock\n");
           exit(-1);
  @@ -146,10 +146,10 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Starting all the threads......."); 
  -    s1 = ap_create_thread(&t1, NULL, thread_func1, NULL, context);
  -    s2 = ap_create_thread(&t2, NULL, thread_func2, NULL, context);
  -    s3 = ap_create_thread(&t3, NULL, thread_func3, NULL, context);
  -    s4 = ap_create_thread(&t4, NULL, thread_func4, NULL, context);
  +    s1 = apr_create_thread(&t1, NULL, thread_func1, NULL, context);
  +    s2 = apr_create_thread(&t2, NULL, thread_func2, NULL, context);
  +    s3 = apr_create_thread(&t3, NULL, thread_func3, NULL, context);
  +    s4 = apr_create_thread(&t4, NULL, thread_func4, NULL, context);
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS || 
           s3 != APR_SUCCESS || s4 != APR_SUCCESS) {
           fprintf(stderr, "Error starting thread\n");
  @@ -158,10 +158,10 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Waiting for threads to exit.......");
  -    ap_thread_join(&s1, t1);
  -    ap_thread_join(&s2, t2);
  -    ap_thread_join(&s3, t3);
  -    ap_thread_join(&s4, t4);
  +    apr_thread_join(&s1, t1);
  +    apr_thread_join(&s2, t2);
  +    apr_thread_join(&s3, t3);
  +    apr_thread_join(&s4, t4);
       fprintf (stdout, "OK\n");   
   
       fprintf(stdout, "Checking if locks worked......."); 
  
  
  
  1.9       +10 -10    apache-2.0/src/lib/apr/test/testtime.c
  
  Index: testtime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testtime.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- testtime.c	2000/06/03 15:59:38	1.8
  +++ testtime.c	2000/08/02 05:26:37	1.9
  @@ -63,32 +63,32 @@
   
   int main()
   {
  -    ap_time_t now;
  +    apr_time_t now;
       ap_exploded_time_t xt;
  -    ap_time_t imp;
  +    apr_time_t imp;
   
       fprintf(stdout, "Testing Time functions.\n");
   
  -    fprintf(stdout, "\tap_now.......");
  -    now = ap_now();
  +    fprintf(stdout, "\tapr_now.......");
  +    now = apr_now();
       fprintf(stdout, "OK\n");
   
  -    fprintf(stdout, "\tap_explode_localtime.......");
  -    if (ap_explode_localtime(&xt, now) != APR_SUCCESS) {
  +    fprintf(stdout, "\tapr_explode_localtime.......");
  +    if (apr_explode_localtime(&xt, now) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't explode the time\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
       
  -    fprintf(stdout, "\tap_explode_gmt.......");
  -    if (ap_explode_gmt(&xt, now) != APR_SUCCESS) {
  +    fprintf(stdout, "\tapr_explode_gmt.......");
  +    if (apr_explode_gmt(&xt, now) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't explode the time\n");
           exit(-1);
       }
       fprintf(stdout, "OK\n");
   
  -    fprintf(stdout, "\tap_implode_time........");
  -    if (ap_implode_time(&imp, &xt) != APR_SUCCESS) {
  +    fprintf(stdout, "\tapr_implode_time........");
  +    if (apr_implode_time(&imp, &xt) != APR_SUCCESS) {
           fprintf(stderr, "Couldn't implode the time\n");
           exit(-1);
       }
  
  
  
  1.29      +53 -53    apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- proc.c	2000/06/20 19:36:36	1.28
  +++ proc.c	2000/08/02 05:26:39	1.29
  @@ -60,10 +60,10 @@
   	int err;
   };
   
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_procattr_t *)ap_palloc(cont, 
  -              sizeof(ap_procattr_t));
  +    (*new) = (apr_procattr_t *)apr_palloc(cont, 
  +              sizeof(apr_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -81,12 +81,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  -                                 ap_int32_t out, ap_int32_t err)
  +apr_status_t apr_setprocattr_io(apr_procattr_t *attr, apr_int32_t in, 
  +                                 apr_int32_t out, apr_int32_t err)
   {
  -    ap_status_t status;
  +    apr_status_t status;
       if (in != 0) {
  -        if ((status = ap_create_pipe(&attr->child_in, &attr->parent_in, 
  +        if ((status = apr_create_pipe(&attr->child_in, &attr->parent_in, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -94,18 +94,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
           }
       } 
       if (out) {
  -        if ((status = ap_create_pipe(&attr->parent_out, &attr->child_out, 
  +        if ((status = apr_create_pipe(&attr->parent_out, &attr->child_out, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -113,18 +113,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
           }
       } 
       if (err) {
  -        if ((status = ap_create_pipe(&attr->parent_err, &attr->child_err, 
  +        if ((status = apr_create_pipe(&attr->parent_err, &attr->child_err, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -132,20 +132,20 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
           }
       } 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, 
  +apr_status_t apr_setprocattr_dir(apr_procattr_t *attr, 
                                    const char *dir) 
   {
       char * cwd;
  @@ -154,10 +154,10 @@
           getcwd(cwd, PATH_MAX);
           strncat(cwd,"/\0",2);
           strcat(cwd,dir);
  -        attr->currdir = (char *)ap_pstrdup(attr->cntxt, cwd);
  +        attr->currdir = (char *)apr_pstrdup(attr->cntxt, cwd);
           free(cwd);
       } else {
  -        attr->currdir = (char *)ap_pstrdup(attr->cntxt, dir);
  +        attr->currdir = (char *)apr_pstrdup(attr->cntxt, dir);
       }
       if (attr->currdir) {
           return APR_SUCCESS;
  @@ -165,20 +165,20 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr,
  -                                     ap_cmdtype_e cmd) 
  +apr_status_t apr_setprocattr_cmdtype(apr_procattr_t *attr,
  +                                     apr_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) 
  +apr_status_t apr_setprocattr_detach(apr_procattr_t *attr, apr_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(ap_proc_t *proc, ap_pool_t *cont)
  +apr_status_t apr_fork(apr_proc_t *proc, apr_pool_t *cont)
   {
       int pid;
       
  @@ -200,9 +200,9 @@
   }
   
   
  -ap_status_t ap_create_process(ap_proc_t *new, const char *progname, 
  +apr_status_t apr_create_process(apr_proc_t *new, const char *progname, 
                                 char *const args[], char **env, 
  -                              ap_procattr_t *attr, ap_pool_t *cont)
  +                              apr_procattr_t *attr, apr_pool_t *cont)
   {
       int i=0,nargs=0;
       char **newargs = NULL;
  @@ -210,7 +210,7 @@
       struct send_pipe *sp;        
   	char * dir = NULL;
   	    
  -	sp = (struct send_pipe *)ap_palloc(cont, sizeof(struct send_pipe));
  +	sp = (struct send_pipe *)apr_palloc(cont, sizeof(struct send_pipe));
   
       new->in = attr->parent_in;
       new->err = attr->parent_err;
  @@ -257,13 +257,13 @@
       resume_thread(newproc);
   
       if (attr->child_in) {
  -        ap_close(attr->child_in);
  +        apr_close(attr->child_in);
       }
       if (attr->child_out) {
  -        ap_close(attr->child_out);
  +        apr_close(attr->child_out);
       }
       if (attr->child_err) {
  -        ap_close(attr->child_err);
  +        apr_close(attr->child_err);
       }
   
       send_data(newproc, 0, (void*)sp, sizeof(struct send_pipe));
  @@ -277,8 +277,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_wait_all_procs(ap_proc_t *proc, ap_wait_t *status,
  -                              ap_wait_how_e waithow, ap_pool_t *p)
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +                              apr_wait_how_e waithow, apr_pool_t *p)
   {
       int waitpid_options = WUNTRACED;
   
  @@ -295,8 +295,8 @@
       return errno;
   } 
   
  -ap_status_t ap_wait_proc(ap_proc_t *proc, 
  -                           ap_wait_how_e wait)
  +apr_status_t apr_wait_proc(apr_proc_t *proc, 
  +                           apr_wait_how_e wait)
   {
       status_t exitval;
       thread_info tinfo;
  @@ -320,47 +320,47 @@
       return APR_CHILD_NOTDONE;
   } 
   
  -ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
  -                                   ap_file_t *parent_in)
  +apr_status_t apr_setprocattr_childin(apr_procattr_t *attr, apr_file_t *child_in,
  +                                   apr_file_t *parent_in)
   {
       if (attr->child_in == NULL && attr->parent_in == NULL)
  -        ap_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
  +        apr_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
   
       if (child_in != NULL)
  -        ap_dupfile(&attr->child_in, child_in, attr->cntxt);
  +        apr_dupfile(&attr->child_in, child_in, attr->cntxt);
   
       if (parent_in != NULL)
  -        ap_dupfile(&attr->parent_in, parent_in, attr->cntxt);
  +        apr_dupfile(&attr->parent_in, parent_in, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out,
  -                                    ap_file_t *parent_out)
  +apr_status_t apr_setprocattr_childout(apr_procattr_t *attr, apr_file_t *child_out,
  +                                    apr_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  -        ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
  +        apr_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
   
       if (child_out != NULL)
  -        ap_dupfile(&attr->child_out, child_out, attr->cntxt);
  +        apr_dupfile(&attr->child_out, child_out, attr->cntxt);
   
       if (parent_out != NULL)
  -        ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
  +        apr_dupfile(&attr->parent_out, parent_out, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err,
  -                                   ap_file_t *parent_err)
  +apr_status_t apr_setprocattr_childerr(apr_procattr_t *attr, apr_file_t *child_err,
  +                                   apr_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  -        ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
  +        apr_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
   
       if (child_err != NULL)
  -        ap_dupfile(&attr->child_err, child_err, attr->cntxt);
  +        apr_dupfile(&attr->child_err, child_err, attr->cntxt);
   
       if (parent_err != NULL)
  -        ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
  +        apr_dupfile(&attr->parent_err, parent_err, attr->cntxt);
   
       return APR_SUCCESS;
   }
  
  
  
  1.12      +17 -17    apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- thread.c	2000/06/17 11:11:40	1.11
  +++ thread.c	2000/08/02 05:26:39	1.12
  @@ -54,11 +54,11 @@
   
   #include "threadproc.h"
   
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_threadattr_t *)ap_palloc(cont, 
  -              sizeof(ap_threadattr_t));
  -    (*new)->attr = (int32)ap_palloc(cont, 
  +    (*new) = (apr_threadattr_t *)apr_palloc(cont, 
  +              sizeof(apr_threadattr_t));
  +    (*new)->attr = (int32)apr_palloc(cont, 
                       sizeof(int32));
   
       if ((*new) == NULL) {
  @@ -71,7 +71,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
  +apr_status_t apr_setthreadattr_detach(apr_threadattr_t *attr, apr_int32_t on)
   {
   	if (on == 1){
   		attr->detached = 1;
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr)
  +apr_status_t apr_getthreadattr_detach(apr_threadattr_t *attr)
   {
   	if (attr->detached == 1){
   		return APR_DETACH;
  @@ -89,19 +89,19 @@
   	return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr,
  -                             ap_thread_start_t func, void *data,
  -                             ap_pool_t *cont)
  +apr_status_t apr_create_thread(apr_thread_t **new, apr_threadattr_t *attr,
  +                             apr_thread_start_t func, void *data,
  +                             apr_pool_t *cont)
   {
       int32 temp;
  -    ap_status_t stat;
  +    apr_status_t stat;
       
  -    (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  +    (*new) = (apr_thread_t *)apr_palloc(cont, sizeof(apr_thread_t));
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
   
  -	(*new)->td = (thread_id) ap_palloc(cont, sizeof(thread_id));
  +	(*new)->td = (thread_id) apr_palloc(cont, sizeof(thread_id));
       if ((*new)->td == (thread_id)NULL) {
           return APR_ENOMEM;
       }
  @@ -114,7 +114,7 @@
   	else
   	    temp = B_NORMAL_PRIORITY;
   
  -    stat = ap_create_pool(&(*new)->cntxt, cont);
  +    stat = apr_create_pool(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  @@ -129,14 +129,14 @@
       } 
   }
   
  -ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
  +apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
   {
  -    ap_destroy_pool(thd->cntxt);
  +    apr_destroy_pool(thd->cntxt);
   	exit_thread ((status_t)retval);
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
  +apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
   {
       if (wait_for_thread(thd->td,(void *)&retval) == B_NO_ERROR) {
           return APR_SUCCESS;
  @@ -146,7 +146,7 @@
       }
   }
   
  -ap_status_t ap_thread_detach(ap_thread_t *thd)
  +apr_status_t apr_thread_detach(apr_thread_t *thd)
   {
   	if (suspend_thread(thd->td) == B_NO_ERROR){
           return APR_SUCCESS;
  
  
  
  1.11      +6 -6      apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- threadpriv.c	2000/06/17 11:11:40	1.10
  +++ threadpriv.c	2000/08/02 05:26:39	1.11
  @@ -58,10 +58,10 @@
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
   static sem_id lock;
   
  -ap_status_t ap_create_thread_private(ap_threadkey_t **key,
  -                                void (*dest)(void *), ap_pool_t *cont)
  +apr_status_t apr_create_thread_private(apr_threadkey_t **key,
  +                                void (*dest)(void *), apr_pool_t *cont)
   {
  -    (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
  +    (*key) = (apr_threadkey_t *)apr_palloc(cont, sizeof(apr_threadkey_t));
       if ((*key) == NULL) {
           return APR_ENOMEM;
       }
  @@ -82,7 +82,7 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
  +apr_status_t apr_get_thread_private(void **new, apr_threadkey_t *key)
   {
   	thread_id tid;
   	int i, index=0;
  @@ -114,7 +114,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key)
  +apr_status_t apr_set_thread_private(void *priv, apr_threadkey_t *key)
   {
   	thread_id tid;
   	int i,index = 0, ret;
  @@ -169,7 +169,7 @@
   	return APR_ENOMEM;
   }
   
  -ap_status_t ap_delete_thread_private(ap_threadkey_t *key)
  +apr_status_t apr_delete_thread_private(apr_threadkey_t *key)
   {
   	if (key->key < BEOS_MAX_DATAKEYS){
   		acquire_sem(key_table[key->key].lock);
  
  
  
  1.14      +16 -16    apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- threadproc.h	2000/06/26 13:18:57	1.13
  +++ threadproc.h	2000/08/02 05:26:39	1.14
  @@ -78,20 +78,20 @@
   
   #define BEOS_MAX_DATAKEYS	128
   
  -struct ap_thread_t {
  -    ap_pool_t *cntxt;
  +struct apr_thread_t {
  +    apr_pool_t *cntxt;
       thread_id td;
   };
   
  -struct ap_threadattr_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadattr_t {
  +    apr_pool_t *cntxt;
       int32 attr;
       int detached;
       int joinable;
   };
   
  -struct ap_threadkey_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadkey_t {
  +    apr_pool_t *cntxt;
   	int32  key;
   };
   
  @@ -109,17 +109,17 @@
   	void (* destructor) (void *);
   };
   
  -struct ap_procattr_t {
  -    ap_pool_t *cntxt;
  -    ap_file_t *parent_in;
  -    ap_file_t *child_in;
  -    ap_file_t *parent_out;
  -    ap_file_t *child_out;
  -    ap_file_t *parent_err;
  -    ap_file_t *child_err;
  +struct apr_procattr_t {
  +    apr_pool_t *cntxt;
  +    apr_file_t *parent_in;
  +    apr_file_t *child_in;
  +    apr_file_t *parent_out;
  +    apr_file_t *child_out;
  +    apr_file_t *parent_err;
  +    apr_file_t *child_err;
       char *currdir;
  -    ap_int32_t cmdtype;
  -    ap_int32_t detached;
  +    apr_int32_t cmdtype;
  +    apr_int32_t detached;
   };
   
   #endif  /* ! THREAD_PROC_H */
  
  
  
  1.28      +67 -67    apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- proc.c	2000/07/14 14:23:38	1.27
  +++ proc.c	2000/08/02 05:26:40	1.28
  @@ -71,10 +71,10 @@
   #include <stdlib.h>
   #include <os2.h>
   
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_procattr_t *)ap_palloc(cont, 
  -              sizeof(ap_procattr_t));
  +    (*new) = (apr_procattr_t *)apr_palloc(cont, 
  +              sizeof(apr_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -92,12 +92,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  -                                 ap_int32_t out, ap_int32_t err)
  +apr_status_t apr_setprocattr_io(apr_procattr_t *attr, apr_int32_t in, 
  +                                 apr_int32_t out, apr_int32_t err)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if (in) {
  -        if ((stat = ap_create_pipe(&attr->child_in, &attr->parent_in,
  +        if ((stat = apr_create_pipe(&attr->child_in, &attr->parent_in,
                                      attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
  @@ -105,18 +105,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
           }
       } 
       if (out) {
  -        if ((stat = ap_create_pipe(&attr->parent_out, &attr->child_out,
  +        if ((stat = apr_create_pipe(&attr->parent_out, &attr->child_out,
                                      attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
  @@ -124,18 +124,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
           }
       } 
       if (err) {
  -        if ((stat = ap_create_pipe(&attr->parent_err, &attr->child_err,
  +        if ((stat = apr_create_pipe(&attr->parent_err, &attr->child_err,
                                      attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
  @@ -143,90 +143,90 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
           }
       } 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
  -                                   ap_file_t *parent_in)
  +apr_status_t apr_setprocattr_childin(apr_procattr_t *attr, apr_file_t *child_in,
  +                                   apr_file_t *parent_in)
   {
       if (attr->child_in == NULL && attr->parent_in == NULL)
  -        ap_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
  +        apr_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
   
       if (child_in != NULL)
  -        ap_dupfile(&attr->child_in, child_in, attr->cntxt);
  +        apr_dupfile(&attr->child_in, child_in, attr->cntxt);
   
       if (parent_in != NULL)
  -        ap_dupfile(&attr->parent_in, parent_in, attr->cntxt);
  +        apr_dupfile(&attr->parent_in, parent_in, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out,
  -                                    ap_file_t *parent_out)
  +apr_status_t apr_setprocattr_childout(apr_procattr_t *attr, apr_file_t *child_out,
  +                                    apr_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  -        ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
  +        apr_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
   
       if (child_out != NULL)
  -        ap_dupfile(&attr->child_out, child_out, attr->cntxt);
  +        apr_dupfile(&attr->child_out, child_out, attr->cntxt);
   
       if (parent_out != NULL)
  -        ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
  +        apr_dupfile(&attr->parent_out, parent_out, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err,
  -                                   ap_file_t *parent_err)
  +apr_status_t apr_setprocattr_childerr(apr_procattr_t *attr, apr_file_t *child_err,
  +                                   apr_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  -        ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
  +        apr_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
   
       if (child_err != NULL)
  -        ap_dupfile(&attr->child_err, child_err, attr->cntxt);
  +        apr_dupfile(&attr->child_err, child_err, attr->cntxt);
   
       if (parent_err != NULL)
  -        ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
  +        apr_dupfile(&attr->parent_err, parent_err, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir)
  +apr_status_t apr_setprocattr_dir(apr_procattr_t *attr, const char *dir)
   {
  -    attr->currdir = ap_pstrdup(attr->cntxt, dir);
  +    attr->currdir = apr_pstrdup(attr->cntxt, dir);
       if (attr->currdir) {
           return APR_SUCCESS;
       }
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr,
  -                                     ap_cmdtype_e cmd) 
  +apr_status_t apr_setprocattr_cmdtype(apr_procattr_t *attr,
  +                                     apr_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) 
  +apr_status_t apr_setprocattr_detach(apr_procattr_t *attr, apr_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(ap_proc_t *proc, ap_pool_t *cont)
  +apr_status_t apr_fork(apr_proc_t *proc, apr_pool_t *cont)
   {
       int pid;
       
  @@ -252,7 +252,7 @@
   /* quotes in the string are doubled up.
    * Used to escape quotes in args passed to OS/2's cmd.exe
    */
  -static char *double_quotes(ap_pool_t *cntxt, char *str)
  +static char *double_quotes(apr_pool_t *cntxt, char *str)
   {
       int num_quotes = 0;
       int len = 0;
  @@ -262,7 +262,7 @@
           num_quotes += str[len++] == '\"';
       }
       
  -    quote_doubled_str = ap_palloc(cntxt, len + num_quotes + 1);
  +    quote_doubled_str = apr_palloc(cntxt, len + num_quotes + 1);
       dest = quote_doubled_str;
       
       while (*str) {
  @@ -277,12 +277,12 @@
   
   
   
  -ap_status_t ap_create_process(ap_proc_t *proc, const char *progname,
  +apr_status_t apr_create_process(apr_proc_t *proc, const char *progname,
                                 char *const args[], char **env,
  -                              ap_procattr_t *attr, ap_pool_t *cont)
  +                              apr_procattr_t *attr, apr_pool_t *cont)
   {
       int i, arg, numargs, cmdlen;
  -    ap_status_t status;
  +    apr_status_t status;
       char **newargs;
       char savedir[300];
       HFILE save_in, save_out, save_err, dup;
  @@ -290,7 +290,7 @@
       char *extension, *newprogname, *extra_arg = NULL, *cmdline, *cmdline_pos;
       char interpreter[1024];
       char error_object[260];
  -    ap_file_t *progfile;
  +    apr_file_t *progfile;
       int env_len, e;
       char *env_block, *env_block_pos;
       RESULTCODES rescodes;
  @@ -325,7 +325,7 @@
           DosSetFHState(attr->parent_err->filedes, OPEN_FLAGS_NOINHERIT);
       }
   
  -    ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
  +    apr_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
   
       if (attr->currdir != NULL) {
           _getcwd2(savedir, sizeof(savedir));
  @@ -347,14 +347,14 @@
           strcpy(interpreter, "#!" SHELL_PATH);
           extra_arg = "/C";
       } else if (stricmp(extension, ".exe") != 0) {
  -        status = ap_open(&progfile, progname, APR_READ|APR_BUFFERED, 0, cont);
  +        status = apr_open(&progfile, progname, APR_READ|APR_BUFFERED, 0, cont);
   
  -        if (status != APR_SUCCESS && ap_canonical_error(status) == APR_ENOENT) {
  -            progname = ap_pstrcat(cont, progname, ".exe", NULL);
  +        if (status != APR_SUCCESS && apr_canonical_error(status) == APR_ENOENT) {
  +            progname = apr_pstrcat(cont, progname, ".exe", NULL);
           }
   
           if (status == APR_SUCCESS) {
  -            status = ap_fgets(interpreter, sizeof(interpreter), progfile);
  +            status = apr_fgets(interpreter, sizeof(interpreter), progfile);
   
               if (status == APR_SUCCESS) {
                   if (interpreter[0] == '#' && interpreter[1] == '!') {
  @@ -375,7 +375,7 @@
                   }
               }
           }
  -        ap_close(progfile);
  +        apr_close(progfile);
       }
   
       i = 0;
  @@ -384,7 +384,7 @@
           i++;
       }
   
  -    newargs = (char **)ap_palloc(cont, sizeof (char *) * (i + 4));
  +    newargs = (char **)apr_palloc(cont, sizeof (char *) * (i + 4));
       numargs = 0;
   
       if (interpreter[0])
  @@ -392,7 +392,7 @@
       if (extra_arg)
           newargs[numargs++] = "/c";
   
  -    newargs[numargs++] = newprogname = ap_pstrdup(cont, progname);
  +    newargs[numargs++] = newprogname = apr_pstrdup(cont, progname);
       arg = 1;
   
       while (args && args[arg]) {
  @@ -410,14 +410,14 @@
       for (i=0; i<numargs; i++)
           cmdlen += strlen(newargs[i]) + 3;
   
  -    cmdline = ap_pstrndup(cont, newargs[0], cmdlen + 2);
  +    cmdline = apr_pstrndup(cont, newargs[0], cmdlen + 2);
       cmdline_pos = cmdline + strlen(cmdline);
   
       for (i=1; i<numargs; i++) {
           char *a = newargs[i];
   
           if (strpbrk(a, "&|<>\" "))
  -            a = ap_pstrcat(cont, "\"", double_quotes(cont, a), "\"", NULL);
  +            a = apr_pstrcat(cont, "\"", double_quotes(cont, a), "\"", NULL);
   
           *(cmdline_pos++) = ' ';
           strcpy(cmdline_pos, a);
  @@ -437,7 +437,7 @@
           for (env_len=1, e=0; env[e]; e++)
               env_len += strlen(env[e]) + 1;
   
  -        env_block = ap_palloc(cont, env_len);
  +        env_block = apr_palloc(cont, env_len);
           env_block_pos = env_block;
   
           for (e=0; env[e]; e++) {
  @@ -460,21 +460,21 @@
       }
   
       if (attr->child_in) {
  -        ap_close(attr->child_in);
  +        apr_close(attr->child_in);
           dup = STDIN_FILENO;
           DosDupHandle(save_in, &dup);
           DosClose(save_in);
       }
       
       if (attr->child_out) {
  -        ap_close(attr->child_out);
  +        apr_close(attr->child_out);
           dup = STDOUT_FILENO;
           DosDupHandle(save_out, &dup);
           DosClose(save_out);
       }
       
       if (attr->child_err) {
  -        ap_close(attr->child_err);
  +        apr_close(attr->child_err);
           dup = STDERR_FILENO;
           DosDupHandle(save_err, &dup);
           DosClose(save_err);
  @@ -491,8 +491,8 @@
   
   
   
  -ap_status_t ap_wait_all_procs(ap_proc_t *proc, ap_wait_t *status,
  -                              ap_wait_how_e waithow, ap_pool_t *p)
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +                              apr_wait_how_e waithow, apr_pool_t *p)
   {
       RESULTCODES codes;
       ULONG rc;
  @@ -519,8 +519,8 @@
   
   
   
  -ap_status_t ap_wait_proc(ap_proc_t *proc,
  -                           ap_wait_how_e wait)
  +apr_status_t apr_wait_proc(apr_proc_t *proc,
  +                           apr_wait_how_e wait)
   {
       RESULTCODES codes;
       ULONG rc;
  @@ -542,7 +542,7 @@
   
   
   
  -ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
  +apr_status_t ap_get_os_proc(apr_os_proc_t *theproc, apr_proc_t *proc)
   {
       if (proc == NULL) {
           return APR_ENOPROC;
  
  
  
  1.7       +2 -2      apache-2.0/src/lib/apr/threadproc/os2/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/signals.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- signals.c	2000/04/08 06:58:43	1.6
  +++ signals.c	2000/08/02 05:26:40	1.7
  @@ -63,12 +63,12 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_kill(ap_proc_t *proc, int signal)
  +apr_status_t apr_kill(apr_proc_t *proc, int signal)
   {
   /* SIGTERM's don't work too well in OS/2 (only affects other EMX programs).
      CGIs may not be, esp. REXX scripts, so use a native call instead */
      
  -    ap_status_t rc;
  +    apr_status_t rc;
       
       if ( signal == SIGTERM ) {
           rc = APR_OS2_STATUS(DosSendSignalException(proc->pid, XCPT_SIGNAL_BREAK));
  
  
  
  1.13      +17 -17    apache-2.0/src/lib/apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- thread.c	2000/04/20 14:43:46	1.12
  +++ thread.c	2000/08/02 05:26:41	1.13
  @@ -62,9 +62,9 @@
   #include <stdlib.h>
   #include <os2.h>
   
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_threadattr_t *)ap_palloc(cont, sizeof(ap_threadattr_t));
  +    (*new) = (apr_threadattr_t *)apr_palloc(cont, sizeof(apr_threadattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -77,7 +77,7 @@
   
   
   
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
  +apr_status_t apr_setthreadattr_detach(apr_threadattr_t *attr, apr_int32_t on)
   {
       attr->attr |= APR_THREADATTR_DETACHED;
       return APR_SUCCESS;
  @@ -85,7 +85,7 @@
   
   
   
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr)
  +apr_status_t apr_getthreadattr_detach(apr_threadattr_t *attr)
   {
       return (attr->attr & APR_THREADATTR_DETACHED) ? APR_DETACH : APR_NOTDETACH;
   }
  @@ -94,20 +94,20 @@
   
   static void ap_thread_begin(void *arg)
   {
  -  ap_thread_t *thread = (ap_thread_t *)arg;
  +  apr_thread_t *thread = (apr_thread_t *)arg;
     thread->rv = thread->func(thread->data);
   }
   
   
   
  -ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  -                             ap_thread_start_t func, void *data, 
  -                             ap_pool_t *cont)
  +apr_status_t apr_create_thread(apr_thread_t **new, apr_threadattr_t *attr, 
  +                             apr_thread_start_t func, void *data, 
  +                             apr_pool_t *cont)
   {
  -    ap_status_t stat;
  -    ap_thread_t *thread;
  +    apr_status_t stat;
  +    apr_thread_t *thread;
    
  -    thread = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  +    thread = (apr_thread_t *)apr_palloc(cont, sizeof(apr_thread_t));
       *new = thread;
   
       if (thread == NULL) {
  @@ -118,14 +118,14 @@
       thread->attr = attr;
       thread->func = func;
       thread->data = data;
  -    stat = ap_create_pool(&thread->cntxt, cont);
  +    stat = apr_create_pool(&thread->cntxt, cont);
       
       if (stat != APR_SUCCESS) {
           return stat;
       }
   
       if (attr == NULL) {
  -        stat = ap_create_threadattr(&thread->attr, thread->cntxt);
  +        stat = apr_create_threadattr(&thread->attr, thread->cntxt);
           
           if (stat != APR_SUCCESS) {
               return stat;
  @@ -146,7 +146,7 @@
   
   
   
  -ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
  +apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
   {
       thd->rv = retval;
       _endthread();
  @@ -155,7 +155,7 @@
   
   
   
  -ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
  +apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
   {
       ULONG rc;
       TID waittid = thd->tid;
  @@ -168,13 +168,13 @@
       if (rc == ERROR_INVALID_THREADID)
           rc = 0; /* Thread had already terminated */
   
  -    *retval = (ap_status_t)thd->rv;
  +    *retval = (apr_status_t)thd->rv;
       return APR_OS2_STATUS(rc);
   }
   
   
   
  -ap_status_t ap_thread_detach(ap_thread_t *thd)
  +apr_status_t apr_thread_detach(apr_thread_t *thd)
   {
       thd->attr->attr |= APR_THREADATTR_DETACHED;
       return APR_SUCCESS;
  
  
  
  1.10      +6 -6      apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- threadpriv.c	2000/04/14 15:58:49	1.9
  +++ threadpriv.c	2000/08/02 05:26:41	1.10
  @@ -59,10 +59,10 @@
   #include "apr_lib.h"
   #include "fileio.h"
   
  -ap_status_t ap_create_thread_private(ap_threadkey_t **key,
  -                                     void (*dest)(void *), ap_pool_t *cont)
  +apr_status_t apr_create_thread_private(apr_threadkey_t **key,
  +                                     void (*dest)(void *), apr_pool_t *cont)
   {
  -    (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
  +    (*key) = (apr_threadkey_t *)apr_palloc(cont, sizeof(apr_threadkey_t));
   
       if ((*key) == NULL) {
           return APR_ENOMEM;
  @@ -72,19 +72,19 @@
       return APR_OS2_STATUS(DosAllocThreadLocalMemory(1, &((*key)->key)));
   }
   
  -ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
  +apr_status_t apr_get_thread_private(void **new, apr_threadkey_t *key)
   {
       (*new) = (void *)*(key->key);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key)
  +apr_status_t apr_set_thread_private(void *priv, apr_threadkey_t *key)
   {
       *(key->key) = (ULONG)priv;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_delete_thread_private(ap_threadkey_t *key)
  +apr_status_t apr_delete_thread_private(apr_threadkey_t *key)
   {
       return APR_OS2_STATUS(DosFreeThreadLocalMemory(key->key));
   }
  
  
  
  1.8       +18 -18    apache-2.0/src/lib/apr/threadproc/os2/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadproc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- threadproc.h	2000/05/25 03:05:27	1.7
  +++ threadproc.h	2000/08/02 05:26:41	1.8
  @@ -63,36 +63,36 @@
   #define SHELL_PATH "cmd.exe"
   #define APR_THREAD_STACKSIZE 65536
   
  -struct ap_threadattr_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadattr_t {
  +    apr_pool_t *cntxt;
       unsigned long attr;
   };
   
  -struct ap_thread_t {
  -    ap_pool_t *cntxt;
  -    struct ap_threadattr_t *attr;
  +struct apr_thread_t {
  +    apr_pool_t *cntxt;
  +    struct apr_threadattr_t *attr;
       unsigned long tid;
  -    ap_thread_start_t func;
  +    apr_thread_start_t func;
       void *data;
       void *rv;
   };
   
  -struct ap_threadkey_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadkey_t {
  +    apr_pool_t *cntxt;
       unsigned long *key;
   };
   
  -struct ap_procattr_t {
  -    ap_pool_t *cntxt;
  -    ap_file_t *parent_in;
  -    ap_file_t *child_in;
  -    ap_file_t *parent_out;
  -    ap_file_t *child_out;
  -    ap_file_t *parent_err;
  -    ap_file_t *child_err;
  +struct apr_procattr_t {
  +    apr_pool_t *cntxt;
  +    apr_file_t *parent_in;
  +    apr_file_t *child_in;
  +    apr_file_t *parent_out;
  +    apr_file_t *child_out;
  +    apr_file_t *parent_err;
  +    apr_file_t *child_err;
       char *currdir;
  -    ap_int32_t cmdtype;
  -    ap_int32_t detached;
  +    apr_int32_t cmdtype;
  +    apr_int32_t detached;
   };
   
   typedef void (*os2_thread_start_t)(void *);
  
  
  
  1.35      +63 -63    apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- proc.c	2000/07/29 12:52:09	1.34
  +++ proc.c	2000/08/02 05:26:41	1.35
  @@ -56,9 +56,9 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_procattr_t *)ap_pcalloc(cont, sizeof(ap_procattr_t));
  +    (*new) = (apr_procattr_t *)apr_pcalloc(cont, sizeof(apr_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -68,12 +68,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  -                                 ap_int32_t out, ap_int32_t err)
  +apr_status_t apr_setprocattr_io(apr_procattr_t *attr, apr_int32_t in, 
  +                                 apr_int32_t out, apr_int32_t err)
   {
  -    ap_status_t status;
  +    apr_status_t status;
       if (in != 0) {
  -        if ((status = ap_create_pipe(&attr->child_in, &attr->parent_in, 
  +        if ((status = apr_create_pipe(&attr->child_in, &attr->parent_in, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -81,18 +81,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_in, 0);
  -            ap_set_pipe_timeout(attr->parent_in, 0);
  +            apr_set_pipe_timeout(attr->child_in, 0);
  +            apr_set_pipe_timeout(attr->parent_in, 0);
           }
       } 
       if (out) {
  -        if ((status = ap_create_pipe(&attr->parent_out, &attr->child_out, 
  +        if ((status = apr_create_pipe(&attr->parent_out, &attr->child_out, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -100,18 +100,18 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_out, 0);
  -            ap_set_pipe_timeout(attr->parent_out, 0);
  +            apr_set_pipe_timeout(attr->child_out, 0);
  +            apr_set_pipe_timeout(attr->parent_out, 0);
           }
       } 
       if (err) {
  -        if ((status = ap_create_pipe(&attr->parent_err, &attr->child_err, 
  +        if ((status = apr_create_pipe(&attr->parent_err, &attr->child_err, 
                                      attr->cntxt)) != APR_SUCCESS) {
               return status;
           }
  @@ -119,92 +119,92 @@
           case APR_FULL_BLOCK:
               break;
           case APR_PARENT_BLOCK:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
               break;
           case APR_CHILD_BLOCK:
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
               break;
           default:
  -            ap_set_pipe_timeout(attr->child_err, 0);
  -            ap_set_pipe_timeout(attr->parent_err, 0);
  +            apr_set_pipe_timeout(attr->child_err, 0);
  +            apr_set_pipe_timeout(attr->parent_err, 0);
           }
       } 
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
  -                                   ap_file_t *parent_in)
  +apr_status_t apr_setprocattr_childin(apr_procattr_t *attr, apr_file_t *child_in,
  +                                   apr_file_t *parent_in)
   {
       if (attr->child_in == NULL && attr->parent_in == NULL)
  -        ap_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
  +        apr_create_pipe(&attr->child_in, &attr->parent_in, attr->cntxt);
   
       if (child_in != NULL)
  -        ap_dupfile(&attr->child_in, child_in, attr->cntxt);
  +        apr_dupfile(&attr->child_in, child_in, attr->cntxt);
   
       if (parent_in != NULL)
  -        ap_dupfile(&attr->parent_in, parent_in, attr->cntxt);
  +        apr_dupfile(&attr->parent_in, parent_in, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out,
  -                                    ap_file_t *parent_out)
  +apr_status_t apr_setprocattr_childout(apr_procattr_t *attr, apr_file_t *child_out,
  +                                    apr_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  -        ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
  +        apr_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
   
       if (child_out != NULL)
  -        ap_dupfile(&attr->child_out, child_out, attr->cntxt);
  +        apr_dupfile(&attr->child_out, child_out, attr->cntxt);
   
       if (parent_out != NULL)
  -        ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
  +        apr_dupfile(&attr->parent_out, parent_out, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err,
  -                                   ap_file_t *parent_err)
  +apr_status_t apr_setprocattr_childerr(apr_procattr_t *attr, apr_file_t *child_err,
  +                                   apr_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  -        ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
  +        apr_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
   
       if (child_err != NULL)
  -        ap_dupfile(&attr->child_err, child_err, attr->cntxt);
  +        apr_dupfile(&attr->child_err, child_err, attr->cntxt);
   
       if (parent_err != NULL)
  -        ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
  +        apr_dupfile(&attr->parent_err, parent_err, attr->cntxt);
   
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, 
  +apr_status_t apr_setprocattr_dir(apr_procattr_t *attr, 
                                  const char *dir) 
   {
  -    attr->currdir = ap_pstrdup(attr->cntxt, dir);
  +    attr->currdir = apr_pstrdup(attr->cntxt, dir);
       if (attr->currdir) {
           return APR_SUCCESS;
       }
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr,
  -                                     ap_cmdtype_e cmd) 
  +apr_status_t apr_setprocattr_cmdtype(apr_procattr_t *attr,
  +                                     apr_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) 
  +apr_status_t apr_setprocattr_detach(apr_procattr_t *attr, apr_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(ap_proc_t *proc, ap_pool_t *cont)
  +apr_status_t apr_fork(apr_proc_t *proc, apr_pool_t *cont)
   {
       int pid;
       
  @@ -227,7 +227,7 @@
   
   #if APR_HAVE_STRUCT_RLIMIT
   #if defined(RLIMIT_CPU) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM)
  -static ap_status_t limit_proc(ap_procattr_t *attr)
  +static apr_status_t limit_proc(apr_procattr_t *attr)
   {
   #ifdef RLIMIT_CPU
       if (attr->limit_cpu != NULL) {
  @@ -267,9 +267,9 @@
   #endif
   #endif
   
  -ap_status_t ap_create_process(ap_proc_t *new, const char *progname, 
  +apr_status_t apr_create_process(apr_proc_t *new, const char *progname, 
                                 char *const args[], char **env,
  -                              ap_procattr_t *attr, ap_pool_t *cont)
  +                              apr_procattr_t *attr, apr_pool_t *cont)
   {
       int i;
       typedef const char *my_stupid_string;
  @@ -285,22 +285,22 @@
           int status;
           /* child process */
           if (attr->child_in) {
  -            ap_close(attr->parent_in);
  +            apr_close(attr->parent_in);
               dup2(attr->child_in->filedes, STDIN_FILENO);
  -            ap_close(attr->child_in);
  +            apr_close(attr->child_in);
           }
           if (attr->child_out) {
  -            ap_close(attr->parent_out);
  +            apr_close(attr->parent_out);
               dup2(attr->child_out->filedes, STDOUT_FILENO);
  -            ap_close(attr->child_out);
  +            apr_close(attr->child_out);
           }
           if (attr->child_err) {
  -            ap_close(attr->parent_err);
  +            apr_close(attr->parent_err);
               dup2(attr->child_err->filedes, STDERR_FILENO);
  -            ap_close(attr->child_err);
  +            apr_close(attr->child_err);
           }
           
  -        ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
  +        apr_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
   
           if (attr->currdir != NULL) {
               if (chdir(attr->currdir) == -1) {
  @@ -308,7 +308,7 @@
               }
           }
   
  -        ap_cleanup_for_exec();
  +        apr_cleanup_for_exec();
   
   #if defined(RLIMIT_CPU) || defined(RLIMIT_NPROC) || defined(RLIMIT_AS) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM)
           if ((status = limit_proc(attr)) != APR_SUCCESS) {
  @@ -322,7 +322,7 @@
                   i++;
               }
               newargs =
  -               (my_stupid_string *) ap_palloc(cont, sizeof (char *) * (i + 3));
  +               (my_stupid_string *) apr_palloc(cont, sizeof (char *) * (i + 3));
               newargs[0] = SHELL_PATH;
               newargs[1] = "-c";
               i = 0;
  @@ -332,13 +332,13 @@
               }
               newargs[i + 3] = NULL;
               if (attr->detached) {
  -                ap_detach();
  +                apr_detach();
               }
               execve(SHELL_PATH, (char **) newargs, env);
           }
           else {
               if (attr->detached) {
  -                ap_detach();
  +                apr_detach();
               }
               execve(progname, args, env);
           }
  @@ -347,19 +347,19 @@
       }
       /* Parent process */
       if (attr->child_in) {
  -        ap_close(attr->child_in);
  +        apr_close(attr->child_in);
       }
       if (attr->child_out) {
  -        ap_close(attr->child_out);
  +        apr_close(attr->child_out);
       }
       if (attr->child_err) {
  -        ap_close(attr->child_err);
  +        apr_close(attr->child_err);
       }
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_wait_all_procs(ap_proc_t *proc, ap_wait_t *status,
  -                              ap_wait_how_e waithow, ap_pool_t *p)
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +                              apr_wait_how_e waithow, apr_pool_t *p)
   {
       int waitpid_options = WUNTRACED;
   
  @@ -376,8 +376,8 @@
       return errno;
   } 
   
  -ap_status_t ap_wait_proc(ap_proc_t *proc, 
  -                           ap_wait_how_e waithow)
  +apr_status_t apr_wait_proc(apr_proc_t *proc, 
  +                           apr_wait_how_e waithow)
   {
       pid_t status;
       if (!proc)
  @@ -400,7 +400,7 @@
       return errno;
   } 
   
  -ap_status_t ap_setprocattr_limit(ap_procattr_t *attr, ap_int32_t what, 
  +apr_status_t apr_setprocattr_limit(apr_procattr_t *attr, apr_int32_t what, 
                             struct rlimit *limit)
   {
       switch(what) {
  
  
  
  1.23      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- procsup.c	2000/06/20 19:16:11	1.22
  +++ procsup.c	2000/08/02 05:26:41	1.23
  @@ -54,7 +54,7 @@
   
   #include "threadproc.h"
   
  -ap_status_t ap_detach(void)
  +apr_status_t apr_detach(void)
   {
       int x;
       pid_t pgrp;
  
  
  
  1.12      +2 -2      apache-2.0/src/lib/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/signals.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- signals.c	2000/07/24 23:07:47	1.11
  +++ signals.c	2000/08/02 05:26:41	1.12
  @@ -63,7 +63,7 @@
   #include <signal.h>
   #endif
   
  -ap_status_t ap_kill(ap_proc_t *proc, int sig)
  +apr_status_t apr_kill(apr_proc_t *proc, int sig)
   {
       if (kill(proc->pid, sig) == -1) {
           return errno;
  @@ -77,7 +77,7 @@
    * from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
    * (the version that does not automatically restart system calls).
    */
  -Sigfunc *ap_signal(int signo, Sigfunc * func)
  +Sigfunc *apr_signal(int signo, Sigfunc * func)
   {
       struct sigaction act, oact;
   
  
  
  
  1.29      +30 -30    apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- thread.c	2000/07/31 15:39:01	1.28
  +++ thread.c	2000/08/02 05:26:42	1.29
  @@ -59,12 +59,12 @@
   #if APR_HAS_THREADS
   
   #if APR_HAVE_PTHREAD_H
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
     
  -    (*new) = (ap_threadattr_t *)ap_pcalloc(cont, sizeof(ap_threadattr_t));
  -    (*new)->attr = (pthread_attr_t *)ap_pcalloc(cont, sizeof(pthread_attr_t));
  +    (*new) = (apr_threadattr_t *)apr_pcalloc(cont, sizeof(apr_threadattr_t));
  +    (*new)->attr = (pthread_attr_t *)apr_pcalloc(cont, sizeof(pthread_attr_t));
   
       if ((*new) == NULL || (*new)->attr == NULL) {
           return APR_ENOMEM;
  @@ -82,9 +82,9 @@
       return stat;
   }
   
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
  +apr_status_t apr_setthreadattr_detach(apr_threadattr_t *attr, apr_int32_t on)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   #ifdef PTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR
       int arg = on;
   
  @@ -102,7 +102,7 @@
       }
   }
   
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr)
  +apr_status_t apr_getthreadattr_detach(apr_threadattr_t *attr)
   {
       int state;
   
  @@ -116,20 +116,20 @@
       return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  -                             ap_thread_start_t func, void *data, 
  -                             ap_pool_t *cont)
  +apr_status_t apr_create_thread(apr_thread_t **new, apr_threadattr_t *attr, 
  +                             apr_thread_start_t func, void *data, 
  +                             apr_pool_t *cont)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       pthread_attr_t *temp;
    
  -    (*new) = (ap_thread_t *)ap_pcalloc(cont, sizeof(ap_thread_t));
  +    (*new) = (apr_thread_t *)apr_pcalloc(cont, sizeof(apr_thread_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
   
  -    (*new)->td = (pthread_t *)ap_pcalloc(cont, sizeof(pthread_t));
  +    (*new)->td = (pthread_t *)apr_pcalloc(cont, sizeof(pthread_t));
   
       if ((*new)->td == NULL) {
           return APR_ENOMEM;
  @@ -142,7 +142,7 @@
       else
           temp = NULL;
       
  -    stat = ap_create_pool(&(*new)->cntxt, cont);
  +    stat = apr_create_pool(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  @@ -158,16 +158,16 @@
       } 
   }
   
  -ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
  +apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
   {
  -    ap_destroy_pool(thd->cntxt);
  +    apr_destroy_pool(thd->cntxt);
       pthread_exit(retval);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
  +apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if ((stat = pthread_join(*thd->td,(void *)&retval)) == 0) {
           return APR_SUCCESS;
  @@ -180,9 +180,9 @@
       }
   }
   
  -ap_status_t ap_thread_detach(ap_thread_t *thd)
  +apr_status_t apr_thread_detach(apr_thread_t *thd)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
   #ifdef PTHREAD_DETACH_ARG1_ADDR
       if ((stat = pthread_detach(thd->td)) == 0) {
  @@ -199,32 +199,32 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread)
  +apr_status_t apr_get_threaddata(void **data, const char *key, apr_thread_t *thread)
   {
  -    return ap_get_userdata(data, key, thread->cntxt);
  +    return apr_get_userdata(data, key, thread->cntxt);
   }
   
  -ap_status_t ap_set_threaddata(void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *),
  -                              ap_thread_t *thread)
  +apr_status_t apr_set_threaddata(void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *),
  +                              apr_thread_t *thread)
   {
  -    return ap_set_userdata(data, key, cleanup, thread->cntxt);
  +    return apr_set_userdata(data, key, cleanup, thread->cntxt);
   }
   
  -ap_status_t ap_get_os_thread(ap_os_thread_t **thethd, ap_thread_t *thd)
  +apr_status_t apr_get_os_thread(apr_os_thread_t **thethd, apr_thread_t *thd)
   {
       *thethd = thd->td;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, 
  -                             ap_pool_t *cont)
  +apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, 
  +                             apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*thd) == NULL) {
  -        (*thd) = (ap_thread_t *)ap_pcalloc(cont, sizeof(ap_thread_t));
  +        (*thd) = (apr_thread_t *)apr_pcalloc(cont, sizeof(apr_thread_t));
           (*thd)->cntxt = cont;
       }
       (*thd)->td = thethd;
  
  
  
  1.25      +20 -20    apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- threadpriv.c	2000/07/10 23:37:44	1.24
  +++ threadpriv.c	2000/08/02 05:26:42	1.25
  @@ -59,11 +59,11 @@
   #if APR_HAS_THREADS
   
   #if APR_HAVE_PTHREAD_H
  -ap_status_t ap_create_thread_private(ap_threadkey_t **key, 
  -                                     void (*dest)(void *), ap_pool_t *cont)
  +apr_status_t apr_create_thread_private(apr_threadkey_t **key, 
  +                                     void (*dest)(void *), apr_pool_t *cont)
   {
  -    ap_status_t stat;
  -    (*key) = (ap_threadkey_t *)ap_pcalloc(cont, sizeof(ap_threadkey_t));
  +    apr_status_t stat;
  +    (*key) = (apr_threadkey_t *)apr_pcalloc(cont, sizeof(apr_threadkey_t));
   
       if ((*key) == NULL) {
           return APR_ENOMEM;
  @@ -77,7 +77,7 @@
       return stat;
   }
   
  -ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
  +apr_status_t apr_get_thread_private(void **new, apr_threadkey_t *key)
   {
   #ifdef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS
       if (pthread_getspecific(key->key,new))
  @@ -88,9 +88,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key)
  +apr_status_t apr_set_thread_private(void *priv, apr_threadkey_t *key)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = pthread_setspecific(key->key, priv)) == 0) {
           return APR_SUCCESS;
       }
  @@ -99,42 +99,42 @@
       }
   }
   
  -ap_status_t ap_delete_thread_private(ap_threadkey_t *key)
  +apr_status_t apr_delete_thread_private(apr_threadkey_t *key)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       if ((stat = pthread_key_delete(key->key)) == 0) {
           return APR_SUCCESS; 
       }
       return stat;
   }
   
  -ap_status_t ap_get_threadkeydata(void **data, const char *key,
  -                                 ap_threadkey_t *threadkey)
  +apr_status_t apr_get_threadkeydata(void **data, const char *key,
  +                                 apr_threadkey_t *threadkey)
   {
  -    return ap_get_userdata(data, key, threadkey->cntxt);
  +    return apr_get_userdata(data, key, threadkey->cntxt);
   }
   
  -ap_status_t ap_set_threadkeydata(void *data, const char *key,
  -                                 ap_status_t (*cleanup) (void *),
  -                                 ap_threadkey_t *threadkey)
  +apr_status_t apr_set_threadkeydata(void *data, const char *key,
  +                                 apr_status_t (*cleanup) (void *),
  +                                 apr_threadkey_t *threadkey)
   {
  -    return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
  +    return apr_set_userdata(data, key, cleanup, threadkey->cntxt);
   }
   
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key)
  +apr_status_t apr_get_os_threadkey(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
   {
       *thekey = key->key;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, 
  -                                ap_os_threadkey_t *thekey, ap_pool_t *cont)
  +apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, 
  +                                apr_os_threadkey_t *thekey, apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*key) == NULL) {
  -        (*key) = (ap_threadkey_t *)ap_pcalloc(cont, sizeof(ap_threadkey_t));
  +        (*key) = (apr_threadkey_t *)apr_pcalloc(cont, sizeof(apr_threadkey_t));
           (*key)->cntxt = cont;
       }
       (*key)->key = *thekey;
  
  
  
  1.15      +16 -16    apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- threadproc.h	2000/06/22 00:36:07	1.14
  +++ threadproc.h	2000/08/02 05:26:42	1.15
  @@ -86,33 +86,33 @@
   #define SHELL_PATH "/bin/sh"
   
   #if APR_HAS_THREADS
  -struct ap_thread_t {
  -    ap_pool_t *cntxt;
  +struct apr_thread_t {
  +    apr_pool_t *cntxt;
       pthread_t *td;
   };
   
  -struct ap_threadattr_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadattr_t {
  +    apr_pool_t *cntxt;
       pthread_attr_t *attr;
   };
   
  -struct ap_threadkey_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadkey_t {
  +    apr_pool_t *cntxt;
       pthread_key_t key;
   };
   #endif
   
  -struct ap_procattr_t {
  -    ap_pool_t *cntxt;
  -    ap_file_t *parent_in;
  -    ap_file_t *child_in;
  -    ap_file_t *parent_out;
  -    ap_file_t *child_out;
  -    ap_file_t *parent_err;
  -    ap_file_t *child_err;
  +struct apr_procattr_t {
  +    apr_pool_t *cntxt;
  +    apr_file_t *parent_in;
  +    apr_file_t *child_in;
  +    apr_file_t *parent_out;
  +    apr_file_t *child_out;
  +    apr_file_t *parent_err;
  +    apr_file_t *child_err;
       char *currdir;
  -    ap_int32_t cmdtype;
  -    ap_int32_t detached;
  +    apr_int32_t cmdtype;
  +    apr_int32_t detached;
   #ifdef RLIMIT_CPU
       struct rlimit *limit_cpu;
   #endif
  
  
  
  1.35      +46 -46    apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- proc.c	2000/07/25 00:42:14	1.34
  +++ proc.c	2000/08/02 05:26:43	1.35
  @@ -65,9 +65,9 @@
   #include <string.h>
   #include <process.h>
   
  -ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_createprocattr_init(apr_procattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_procattr_t *)ap_palloc(cont, sizeof(ap_procattr_t));
  +    (*new) = (apr_procattr_t *)apr_palloc(cont, sizeof(apr_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -88,10 +88,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  -                              ap_int32_t out, ap_int32_t err)
  +apr_status_t apr_setprocattr_io(apr_procattr_t *attr, apr_int32_t in, 
  +                              apr_int32_t out, apr_int32_t err)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
       BOOLEAN bAsyncRead, bAsyncWrite;
       if (in) {
           switch (in) {
  @@ -165,39 +165,39 @@
       return APR_SUCCESS;
   }
   #if 0
  -ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
  -                                   ap_file_t *parent_in)
  +apr_status_t apr_setprocattr_childin(apr_procattr_t *attr, apr_file_t *child_in,
  +                                   apr_file_t *parent_in)
   {
   }
  -ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out,
  -                                    ap_file_t *parent_out)
  +apr_status_t apr_setprocattr_childout(apr_procattr_t *attr, apr_file_t *child_out,
  +                                    apr_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  -        ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
  +        apr_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
   
       if (child_out != NULL)
  -        ap_dupfile(&attr->child_out, child_out, attr->cntxt);
  +        apr_dupfile(&attr->child_out, child_out, attr->cntxt);
   
       if (parent_out != NULL)
  -        ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
  +        apr_dupfile(&attr->parent_out, parent_out, attr->cntxt);
   
       return APR_SUCCESS;
   }
  -ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err,
  -                                   ap_file_t *parent_err)
  +apr_status_t apr_setprocattr_childerr(apr_procattr_t *attr, apr_file_t *child_err,
  +                                   apr_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  -        ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
  +        apr_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
   
       if (child_err != NULL)
  -        ap_dupfile(&attr->child_err, child_err, attr->cntxt);
  +        apr_dupfile(&attr->child_err, child_err, attr->cntxt);
   
       if (parent_err != NULL)
  -        ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
  +        apr_dupfile(&attr->parent_err, parent_err, attr->cntxt);
       return APR_SUCCESS;
   }
   #endif
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, 
  +apr_status_t apr_setprocattr_dir(apr_procattr_t *attr, 
                                  const char *dir) 
   {
       char path[MAX_PATH];
  @@ -209,10 +209,10 @@
           if (length == 0 || length + strlen(dir) + 1 >= MAX_PATH)
               return APR_ENOMEM;
   
  -        attr->currdir = ap_pstrcat(attr->cntxt, path, "\\", dir, NULL);
  +        attr->currdir = apr_pstrcat(attr->cntxt, path, "\\", dir, NULL);
       }
       else {
  -        attr->currdir = ap_pstrdup(attr->cntxt, dir);
  +        attr->currdir = apr_pstrdup(attr->cntxt, dir);
       }
   
       if (attr->currdir) {
  @@ -221,22 +221,22 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr,
  -                                     ap_cmdtype_e cmd) 
  +apr_status_t apr_setprocattr_cmdtype(apr_procattr_t *attr,
  +                                     apr_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t det) 
  +apr_status_t apr_setprocattr_detach(apr_procattr_t *attr, apr_int32_t det) 
   {
       attr->detached = det;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_process(ap_proc_t *new, const char *progname, 
  +apr_status_t apr_create_process(apr_proc_t *new, const char *progname, 
                                 char *const args[], char **env, 
  -                              ap_procattr_t *attr, ap_pool_t *cont)
  +                              apr_procattr_t *attr, apr_pool_t *cont)
   {
       int i, iEnvBlockLen;
       char *cmdline;
  @@ -245,7 +245,7 @@
       char ppid[20];
       char *envstr;
       char *pEnvBlock, *pNext;
  -    ap_status_t rv;
  +    apr_status_t rv;
       PROCESS_INFORMATION pi;
   
       new->in = attr->parent_in;
  @@ -282,18 +282,18 @@
           }
   
           if (*ptr == '\\' || *++ptr == ':') {
  -            cmdline = ap_pstrdup(cont, progname);
  +            cmdline = apr_pstrdup(cont, progname);
           }
           else if (attr->currdir == NULL) {
  -            cmdline = ap_pstrdup(cont, progname);
  +            cmdline = apr_pstrdup(cont, progname);
           }
           else {
               char lastchar = attr->currdir[strlen(attr->currdir)-1];
               if ( lastchar == '\\' || lastchar == '/') {
  -                cmdline = ap_pstrcat(cont, attr->currdir, progname, NULL);
  +                cmdline = apr_pstrcat(cont, attr->currdir, progname, NULL);
               }
               else {
  -                cmdline = ap_pstrcat(cont, attr->currdir, "\\", progname, NULL);
  +                cmdline = apr_pstrcat(cont, attr->currdir, "\\", progname, NULL);
               }
           }
       }
  @@ -301,13 +301,13 @@
           char * shell_cmd = getenv("COMSPEC");
           if (!shell_cmd)
               shell_cmd = SHELL_PATH;
  -        shell_cmd = ap_pstrdup(cont, shell_cmd);
  -        cmdline = ap_pstrcat(cont, shell_cmd, " /C ", progname, NULL);
  +        shell_cmd = apr_pstrdup(cont, shell_cmd);
  +        cmdline = apr_pstrcat(cont, shell_cmd, " /C ", progname, NULL);
       }
   
       i = 1;
       while (args && args[i]) {
  -        cmdline = ap_pstrcat(cont, cmdline, " ", args[i], NULL);
  +        cmdline = apr_pstrcat(cont, cmdline, " ", args[i], NULL);
           i++;
       }
       /*
  @@ -335,16 +335,16 @@
                                                   0, FALSE, DUPLICATE_SAME_ACCESS))) {
           rv = GetLastError();
           if (attr->child_in) {
  -            ap_close(attr->child_in);
  -            ap_close(attr->parent_in);
  +            apr_close(attr->child_in);
  +            apr_close(attr->parent_in);
           }
           if (attr->child_out) {
  -            ap_close(attr->child_out);
  -            ap_close(attr->parent_out);
  +            apr_close(attr->child_out);
  +            apr_close(attr->parent_out);
           }
           if (attr->child_err) {
  -            ap_close(attr->child_err);
  -            ap_close(attr->parent_err);
  +            apr_close(attr->child_err);
  +            apr_close(attr->parent_err);
           }
           return rv;
       }
  @@ -365,7 +365,7 @@
   
       _itoa(_getpid(), ppid, 10);
       if (env) {
  -        envstr = ap_pstrcat(cont, "parentpid=", ppid, NULL);
  +        envstr = apr_pstrcat(cont, "parentpid=", ppid, NULL);
           /*
            * Win32's CreateProcess call requires that the environment
            * be passed in an environment block, a null terminated block of
  @@ -378,7 +378,7 @@
               i++;
           }
     
  -        pEnvBlock = (char *)ap_pcalloc(cont, iEnvBlockLen + strlen(envstr));
  +        pEnvBlock = (char *)apr_pcalloc(cont, iEnvBlockLen + strlen(envstr));
       
           i = 0;
           pNext = pEnvBlock;
  @@ -401,7 +401,7 @@
                         &attr->si, &pi)) {
   
           // TODO: THIS IS BADNESS
  -        // The completion of the ap_proc_t type leaves us ill equiped to track both 
  +        // The completion of the apr_proc_t type leaves us ill equiped to track both 
           // the pid (Process ID) and handle to the process, which are entirely
           // different things and each useful in their own rights.
           //
  @@ -410,13 +410,13 @@
           new->pid = (pid_t) pi.hProcess;
   
           if (attr->child_in) {
  -            ap_close(attr->child_in);
  +            apr_close(attr->child_in);
           }
           if (attr->child_out) {
  -            ap_close(attr->child_out);
  +            apr_close(attr->child_out);
           }
           if (attr->child_err) {
  -            ap_close(attr->child_err);
  +            apr_close(attr->child_err);
           }
           CloseHandle(pi.hThread);
   
  @@ -426,7 +426,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e wait)
  +apr_status_t apr_wait_proc(apr_proc_t *proc, apr_wait_how_e wait)
   {
       DWORD stat;
       if (!proc)
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/threadproc/win32/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/signals.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- signals.c	2000/05/24 23:44:48	1.6
  +++ signals.c	2000/08/02 05:26:43	1.7
  @@ -64,7 +64,7 @@
   #endif
   
   /* Windows only really support killing process, but that will do for now. */
  -ap_status_t ap_kill(ap_proc_t *proc, int signal)
  +apr_status_t apr_kill(apr_proc_t *proc, int signal)
   {
       if (TerminateProcess(proc->pid, signal) == 0) {
           return GetLastError();
  
  
  
  1.23      +26 -26    apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- thread.c	2000/07/10 23:35:31	1.22
  +++ thread.c	2000/08/02 05:26:43	1.23
  @@ -61,10 +61,10 @@
   #include <process.h>
   
   
  -ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
  +apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
   {
  -    (*new) = (ap_threadattr_t *)ap_palloc(cont, 
  -              sizeof(ap_threadattr_t));
  +    (*new) = (apr_threadattr_t *)apr_palloc(cont, 
  +              sizeof(apr_threadattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -74,28 +74,28 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
  +apr_status_t apr_setthreadattr_detach(apr_threadattr_t *attr, apr_int32_t on)
   {
       attr->detach = on;
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr)
  +apr_status_t apr_getthreadattr_detach(apr_threadattr_t *attr)
   {
       if (attr->detach == 1)
           return APR_DETACH;
       return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  -                             ap_thread_start_t func, void *data, 
  -                             ap_pool_t *cont)
  +apr_status_t apr_create_thread(apr_thread_t **new, apr_threadattr_t *attr, 
  +                             apr_thread_start_t func, void *data, 
  +                             apr_pool_t *cont)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   	unsigned temp;
       int lasterror;
    
  -    (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  +    (*new) = (apr_thread_t *)apr_palloc(cont, sizeof(apr_thread_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -103,7 +103,7 @@
   
       (*new)->cntxt = cont;
       
  -    stat = ap_create_pool(&(*new)->cntxt, cont);
  +    stat = apr_create_pool(&(*new)->cntxt, cont);
       if (stat != APR_SUCCESS) {
           return stat;
       }
  @@ -124,16 +124,16 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
  +apr_status_t apr_thread_exit(apr_thread_t *thd, apr_status_t *retval)
   {
  -    ap_destroy_pool(thd->cntxt);
  +    apr_destroy_pool(thd->cntxt);
       _endthreadex(*retval);
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
  +apr_status_t apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
   {
  -    ap_status_t stat;
  +    apr_status_t stat;
   
       if ((stat = WaitForSingleObject(thd->td, INFINITE)) == WAIT_OBJECT_0) {
           if (GetExitCodeThread(thd->td, retval) == 0) {
  @@ -146,7 +146,7 @@
       }
   }
   
  -ap_status_t ap_thread_detach(ap_thread_t *thd)
  +apr_status_t apr_thread_detach(apr_thread_t *thd)
   {
       if (CloseHandle(thd->td)) {
           return APR_SUCCESS;
  @@ -156,19 +156,19 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(void **data, const char *key, ap_thread_t *thread)
  +apr_status_t apr_get_threaddata(void **data, const char *key, apr_thread_t *thread)
   {
  -    return ap_get_userdata(data, key, thread->cntxt);
  +    return apr_get_userdata(data, key, thread->cntxt);
   }
   
  -ap_status_t ap_set_threaddata(void *data, const char *key,
  -                              ap_status_t (*cleanup) (void *),
  -                              ap_thread_t *thread)
  +apr_status_t apr_set_threaddata(void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *),
  +                              apr_thread_t *thread)
   {
  -    return ap_set_userdata(data, key, cleanup, thread->cntxt);
  +    return apr_set_userdata(data, key, cleanup, thread->cntxt);
   }
   
  -ap_status_t ap_get_os_thread(ap_os_thread_t **thethd, ap_thread_t *thd)
  +apr_status_t apr_get_os_thread(apr_os_thread_t **thethd, apr_thread_t *thd)
   {
       if (thd == NULL) {
           return APR_ENOTHREAD;
  @@ -177,14 +177,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, 
  -                             ap_pool_t *cont)
  +apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, 
  +                             apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*thd) == NULL) {
  -        (*thd) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t));
  +        (*thd) = (apr_thread_t *)apr_palloc(cont, sizeof(apr_thread_t));
           (*thd)->cntxt = cont;
       }
       (*thd)->td = thethd;
  
  
  
  1.19      +16 -16    apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- threadpriv.c	2000/07/10 23:37:44	1.18
  +++ threadpriv.c	2000/08/02 05:26:43	1.19
  @@ -59,8 +59,8 @@
   #include "apr_errno.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_thread_private(ap_threadkey_t **key,
  -                                     void (*dest)(void *), ap_pool_t *cont)
  +apr_status_t apr_create_thread_private(apr_threadkey_t **key,
  +                                     void (*dest)(void *), apr_pool_t *cont)
   {
       if (((*key)->key = TlsAlloc()) != 0xFFFFFFFF) {
   	return APR_SUCCESS;
  @@ -68,7 +68,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key)
  +apr_status_t apr_get_thread_private(void **new, apr_threadkey_t *key)
   {
       if ((*new) = TlsGetValue(key->key)) {
           return APR_SUCCESS;
  @@ -76,7 +76,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key)
  +apr_status_t apr_set_thread_private(void *priv, apr_threadkey_t *key)
   {
       if (TlsSetValue(key->key, priv)) {
           return APR_SUCCESS;
  @@ -84,7 +84,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_delete_thread_private(ap_threadkey_t *key)
  +apr_status_t apr_delete_thread_private(apr_threadkey_t *key)
   {
       if (TlsFree(key->key)) {
           return APR_SUCCESS; 
  @@ -92,33 +92,33 @@
       return GetLastError();
   }
   
  -ap_status_t ap_get_threadkeydata(void **data, const char *key,
  -                                 ap_threadkey_t *threadkey)
  +apr_status_t apr_get_threadkeydata(void **data, const char *key,
  +                                 apr_threadkey_t *threadkey)
   {
  -    return ap_get_userdata(data, key, threadkey->cntxt);
  +    return apr_get_userdata(data, key, threadkey->cntxt);
   }
   
  -ap_status_t ap_set_threadkeydata(void *data, const char *key,
  -                                 ap_status_t (*cleanup) (void *), 
  -                                 ap_threadkey_t *threadkey)
  +apr_status_t apr_set_threadkeydata(void *data, const char *key,
  +                                 apr_status_t (*cleanup) (void *), 
  +                                 apr_threadkey_t *threadkey)
   {
  -    return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
  +    return apr_set_userdata(data, key, cleanup, threadkey->cntxt);
   }
   
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key)
  +apr_status_t apr_get_os_threadkey(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
   {
       *thekey = key->key;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, 
  -                                ap_os_threadkey_t *thekey, ap_pool_t *cont)
  +apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, 
  +                                apr_os_threadkey_t *thekey, apr_pool_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOPOOL;
       }
       if ((*key) == NULL) {
  -        (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t));
  +        (*key) = (apr_threadkey_t *)apr_palloc(cont, sizeof(apr_threadkey_t));
           (*key)->cntxt = cont;
       }
       (*key)->key = *thekey;
  
  
  
  1.12      +19 -19    apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- threadproc.h	2000/05/24 23:44:50	1.11
  +++ threadproc.h	2000/08/02 05:26:43	1.12
  @@ -61,35 +61,35 @@
   
   #define SHELL_PATH "cmd.exe"
   
  -struct ap_thread_t {
  -    ap_pool_t *cntxt;
  +struct apr_thread_t {
  +    apr_pool_t *cntxt;
       HANDLE td;
  -    ap_int32_t cancel;
  -    ap_int32_t cancel_how;
  +    apr_int32_t cancel;
  +    apr_int32_t cancel_how;
   };
   
  -struct ap_threadattr_t {
  -    ap_pool_t *cntxt;
  -    ap_int32_t detach;
  +struct apr_threadattr_t {
  +    apr_pool_t *cntxt;
  +    apr_int32_t detach;
   };
   
  -struct ap_threadkey_t {
  -    ap_pool_t *cntxt;
  +struct apr_threadkey_t {
  +    apr_pool_t *cntxt;
       DWORD key;
   };
   
  -struct ap_procattr_t {
  -    ap_pool_t *cntxt;
  +struct apr_procattr_t {
  +    apr_pool_t *cntxt;
       STARTUPINFO si;
  -    ap_file_t *parent_in;
  -    ap_file_t *child_in;
  -    ap_file_t *parent_out;
  -    ap_file_t *child_out;
  -    ap_file_t *parent_err;
  -    ap_file_t *child_err;
  +    apr_file_t *parent_in;
  +    apr_file_t *child_in;
  +    apr_file_t *parent_out;
  +    apr_file_t *child_out;
  +    apr_file_t *parent_err;
  +    apr_file_t *child_err;
       char *currdir;
  -    ap_int32_t cmdtype;
  -    ap_int32_t detached;
  +    apr_int32_t cmdtype;
  +    apr_int32_t detached;
   };
   
   #endif  /* ! THREAD_PROC_H */
  
  
  
  1.31      +14 -14    apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- time.c	2000/06/17 11:32:38	1.30
  +++ time.c	2000/08/02 05:26:44	1.31
  @@ -76,14 +76,14 @@
   /* End System Headers */
   
   
  -ap_status_t ap_ansi_time_to_ap_time(ap_time_t *result, time_t input)
  +apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input)
   {
  -    *result = (ap_time_t)input * AP_USEC_PER_SEC;
  +    *result = (apr_time_t)input * AP_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
   
  -ap_time_t ap_now(void)
  +apr_time_t apr_now(void)
   {
       struct timeval tv;
       gettimeofday(&tv, NULL);
  @@ -105,7 +105,7 @@
   }
   
   
  -ap_status_t ap_explode_gmt(ap_exploded_time_t *result, ap_time_t input)
  +apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input)
   {
       time_t t = input / AP_USEC_PER_SEC;
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
  @@ -124,7 +124,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_explode_localtime(ap_exploded_time_t *result, ap_time_t input)
  +apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input)
   {
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
       time_t t = input / AP_USEC_PER_SEC;
  @@ -181,7 +181,7 @@
   }
   
   
  -ap_status_t ap_implode_time(ap_time_t *t, ap_exploded_time_t *xt)
  +apr_status_t apr_implode_time(apr_time_t *t, ap_exploded_time_t *xt)
   {
       int year;
       time_t days;
  @@ -215,14 +215,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **ostime, ap_time_t *aprtime)
  +apr_status_t apr_get_os_imp_time(apr_os_imp_time_t **ostime, apr_time_t *aprtime)
   {
       (*ostime)->tv_usec = *aprtime % AP_USEC_PER_SEC;
       (*ostime)->tv_sec = *aprtime / AP_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **ostime, ap_exploded_time_t *aprtime)
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprtime)
   {
       (*ostime)->tm_sec  = aprtime->tm_sec;
       (*ostime)->tm_min  = aprtime->tm_min;
  @@ -236,15 +236,15 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime,
  -                               ap_pool_t *cont)
  +apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime,
  +                               apr_pool_t *cont)
   {
       *aprtime = (*ostime)->tv_sec * AP_USEC_PER_SEC + (*ostime)->tv_usec;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime,
  -                               ap_os_exp_time_t **ostime, ap_pool_t *cont)
  +apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime,
  +                               apr_os_exp_time_t **ostime, apr_pool_t *cont)
   {
       aprtime->tm_sec = (*ostime)->tm_sec;
       aprtime->tm_min = (*ostime)->tm_min;
  @@ -258,7 +258,7 @@
       return APR_SUCCESS;
   }
   
  -void ap_sleep(ap_interval_time_t t)
  +void apr_sleep(apr_interval_time_t t)
   {
   #ifdef OS2
       DosSleep(t/1000);
  @@ -271,7 +271,7 @@
   }
   
   #ifdef OS2
  -ap_status_t ap_os2_time_to_ap_time(ap_time_t *result, FDATE os2date, FTIME os2time)
  +apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time)
   {
     struct tm tmpdate;
   
  
  
  
  1.17      +5 -5      apache-2.0/src/lib/apr/time/unix/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- timestr.c	2000/06/07 23:56:15	1.16
  +++ timestr.c	2000/08/02 05:26:44	1.17
  @@ -77,13 +77,13 @@
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
   
  -ap_status_t ap_rfc822_date(char *date_str, ap_time_t t)
  +apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
   {
       ap_exploded_time_t xt;
       const char *s;
       int real_year;
   
  -    ap_explode_gmt(&xt, t);
  +    apr_explode_gmt(&xt, t);
   
       /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
       /*           12345678901234567890123456789  */
  @@ -125,7 +125,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_ctime(char *date_str, ap_time_t t)
  +apr_status_t apr_ctime(char *date_str, apr_time_t t)
   {
       ap_exploded_time_t xt;
       const char *s;
  @@ -134,7 +134,7 @@
       /* example: "Wed Jun 30 21:49:08 1993" */
       /*           123456789012345678901234  */
   
  -    ap_explode_localtime(&xt, t);
  +    apr_explode_localtime(&xt, t);
       s = &ap_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -167,7 +167,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max, 
  +apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
                           const char *format, ap_exploded_time_t *xt)
   {
       struct tm tm;
  
  
  
  1.10      +22 -22    apache-2.0/src/lib/apr/time/win32/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/access.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- access.c	2000/07/08 11:01:57	1.9
  +++ access.c	2000/08/02 05:26:45	1.10
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -ap_status_t ap_get_curtime(struct atime_t *time, ap_time_t *rv)
  +apr_status_t ap_get_curtime(struct atime_t *time, apr_time_t *rv)
   {
       if (time) {
           (*rv) = time->currtime;
  @@ -66,7 +66,7 @@
       return APR_ENOTIME;    
   }
   
  -ap_status_t ap_get_sec(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_sec(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wSecond;
  @@ -75,7 +75,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_min(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_min(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wMinute;
  @@ -84,7 +84,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_hour(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_hour(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wHour;
  @@ -93,7 +93,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_mday(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_mday(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wDay;
  @@ -102,7 +102,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_mon(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_mon(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wMonth;
  @@ -111,7 +111,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_year(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_year(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wYear;
  @@ -120,7 +120,7 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_get_wday(struct atime_t *time, ap_int32_t *rv)
  +apr_status_t ap_get_wday(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wDayOfWeek;
  @@ -129,13 +129,13 @@
       return APR_ENOTIME;
   }
   
  -ap_status_t ap_set_sec(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_sec(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -145,13 +145,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_min(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_min(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -161,13 +161,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_hour(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_hour(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -177,13 +177,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_mday(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_mday(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -193,13 +193,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_mon(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_mon(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -209,13 +209,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_year(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_year(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  @@ -225,13 +225,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_wday(struct atime_t *time, ap_int32_t value)
  +apr_status_t ap_set_wday(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
       }
       if (time->explodedtime == NULL) {
  -        time->explodedtime = (SYSTEMTIME *)ap_pcalloc(time->cntxt, 
  +        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
                                 sizeof(SYSTEMTIME));
       }
       if (time->explodedtime == NULL) {
  
  
  
  1.9       +4 -4      apache-2.0/src/lib/apr/time/win32/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/atime.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- atime.h	2000/04/22 06:16:50	1.8
  +++ atime.h	2000/08/02 05:26:45	1.9
  @@ -60,13 +60,13 @@
   #include <time.h>
   
   struct atime_t {
  -    ap_pool_t *cntxt;
  -    ap_time_t currtime;
  +    apr_pool_t *cntxt;
  +    apr_time_t currtime;
       SYSTEMTIME *explodedtime;
   };
       
  -void FileTimeToAprTime(ap_time_t *atime, FILETIME *ft);
  -void AprTimeToFileTime(LPFILETIME pft, ap_time_t t);
  +void FileTimeToAprTime(apr_time_t *atime, FILETIME *ft);
  +void AprTimeToFileTime(LPFILETIME pft, apr_time_t t);
   
   #endif  /* ! ATIME_H */
   
  
  
  
  1.12      +15 -15    apache-2.0/src/lib/apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/time.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- time.c	2000/06/16 15:09:43	1.11
  +++ time.c	2000/08/02 05:26:45	1.12
  @@ -67,7 +67,7 @@
    */
   #define AP_DELTA_EPOCH_IN_USEC   11644473600000000;
   
  -void FileTimeToAprTime(ap_time_t *result, FILETIME *input)
  +void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
   {
       /* Convert FILETIME one 64 bit number so we can work with it. */
       *result = input->dwHighDateTime;
  @@ -77,7 +77,7 @@
       *result -= AP_DELTA_EPOCH_IN_USEC;  /* Convert from Windows epoch to Unix epoch */
       return;
   }
  -void AprTimeToFileTime(LPFILETIME pft, ap_time_t t)
  +void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
   {
       LONGLONG ll;
       t += AP_DELTA_EPOCH_IN_USEC;
  @@ -123,14 +123,14 @@
       return;
   }
   
  -ap_status_t ap_ansi_time_to_ap_time(ap_time_t *result, time_t input)
  +apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input)
   {
  -    *result = (ap_time_t) input * AP_USEC_PER_SEC;
  +    *result = (apr_time_t) input * AP_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
   /* Return micro-seconds since the Unix epoch (jan. 1, 1970) UTC */
  -ap_time_t ap_now(void)
  +apr_time_t apr_now(void)
   {
       LONGLONG aprtime = 0;
       FILETIME time;
  @@ -139,7 +139,7 @@
       return aprtime; 
   }
   
  -ap_status_t ap_explode_gmt(ap_exploded_time_t *result, ap_time_t input)
  +apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input)
   {
       FILETIME ft;
       SYSTEMTIME st;
  @@ -149,7 +149,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_explode_localtime(ap_exploded_time_t *result, ap_time_t input)
  +apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input)
   {
       SYSTEMTIME st;
       FILETIME ft, localft;
  @@ -161,7 +161,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_implode_time(ap_time_t *t, ap_exploded_time_t *xt)
  +apr_status_t apr_implode_time(apr_time_t *t, ap_exploded_time_t *xt)
   {
       int year;
       time_t days;
  @@ -195,14 +195,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **ostime, ap_time_t *aprtime)
  +apr_status_t apr_get_os_imp_time(apr_os_imp_time_t **ostime, apr_time_t *aprtime)
   {
  -    /* TODO: Consider not passing in pointer to ap_time_t (e.g., call by value) */
  +    /* TODO: Consider not passing in pointer to apr_time_t (e.g., call by value) */
       AprTimeToFileTime(*ostime, *aprtime);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **ostime, ap_exploded_time_t *aprexptime)
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprexptime)
   {
       (*ostime)->wYear = aprexptime->tm_year + 1900;
       (*ostime)->wMonth = aprexptime->tm_mon + 1;
  @@ -215,15 +215,15 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime,
  -                               ap_pool_t *cont)
  +apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime,
  +                               apr_pool_t *cont)
   {
       FileTimeToAprTime(aprtime, *ostime);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime,
  -                               ap_os_exp_time_t **ostime, ap_pool_t *cont)
  +apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime,
  +                               apr_os_exp_time_t **ostime, apr_pool_t *cont)
   {
       SystemTimeToAprExpTime(aprtime, *ostime);
       return APR_SUCCESS;
  
  
  
  1.9       +5 -5      apache-2.0/src/lib/apr/time/win32/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/timestr.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- timestr.c	2000/05/28 02:47:10	1.8
  +++ timestr.c	2000/08/02 05:26:45	1.9
  @@ -64,13 +64,13 @@
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
   
  -ap_status_t ap_rfc822_date(char *date_str, ap_time_t t)
  +apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
   {
       ap_exploded_time_t xt;
       const char *s;
       int real_year;
   
  -    ap_explode_gmt(&xt, t);
  +    apr_explode_gmt(&xt, t);
   
       /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
       /*           12345678901234567890123456789  */
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_ctime(char *date_str, ap_time_t t)
  +apr_status_t apr_ctime(char *date_str, apr_time_t t)
   {
       ap_exploded_time_t xt;
       const char *s;
  @@ -121,7 +121,7 @@
       /* example: "Wed Jun 30 21:49:08 1993" */
       /*           123456789012345678901234  */
   
  -    ap_explode_localtime(&xt, t);
  +    apr_explode_localtime(&xt, t);
       s = &ap_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -154,7 +154,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max, 
  +apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
                           const char *format, ap_exploded_time_t *xt)
   {
       struct tm tm;
  
  
  
  1.6       +48 -48    apache-2.0/src/lib/sdbm/sdbm.c
  
  Index: sdbm.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbm.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sdbm.c	2000/07/15 02:07:21	1.5
  +++ sdbm.c	2000/08/02 05:26:45	1.6
  @@ -74,10 +74,10 @@
    * forward
    */
   static int getdbit (SDBM *, long);
  -static ap_status_t setdbit(SDBM *, long);
  -static ap_status_t getpage(SDBM *db, long);
  +static apr_status_t setdbit(SDBM *, long);
  +static apr_status_t getpage(SDBM *db, long);
   static sdbm_datum getnext(SDBM *db);
  -static ap_status_t makroom(SDBM *, long, int);
  +static apr_status_t makroom(SDBM *, long, int);
   
   /*
    * useful macros
  @@ -92,8 +92,8 @@
   #define sdbm_dirfno(db)	((db)->dirf)
   #define sdbm_pagfno(db)	((db)->pagf)
   
  -#define OFF_PAG(off)	(ap_off_t) (off) * PBLKSIZ
  -#define OFF_DIR(off)	(ap_off_t) (off) * DBLKSIZ
  +#define OFF_PAG(off)	(apr_off_t) (off) * PBLKSIZ
  +#define OFF_DIR(off)	(apr_off_t) (off) * DBLKSIZ
   
   static long masks[] = {
   	000000000000, 000000000001, 000000000003, 000000000007,
  @@ -108,23 +108,23 @@
   
   sdbm_datum sdbm_nullitem = {NULL, 0};
   
  -ap_status_t
  -sdbm_open(SDBM **db, const char *file, ap_int32_t flags, ap_fileperms_t perms, ap_pool_t *p)
  +apr_status_t
  +sdbm_open(SDBM **db, const char *file, apr_int32_t flags, apr_fileperms_t perms, apr_pool_t *p)
   {
  -    char *dirname = ap_pstrcat(p, file, SDBM_DIRFEXT, NULL);
  -    char *pagname = ap_pstrcat(p, file, SDBM_PAGFEXT, NULL);
  +    char *dirname = apr_pstrcat(p, file, SDBM_DIRFEXT, NULL);
  +    char *pagname = apr_pstrcat(p, file, SDBM_PAGFEXT, NULL);
       
       return sdbm_prep(db, dirname, pagname, flags, perms, p);
   }
   
  -ap_status_t
  +apr_status_t
   sdbm_prep(SDBM **db, const char *dirname, const char *pagname, 
  -	  ap_int32_t flags, ap_fileperms_t perms, ap_pool_t *p)
  +	  apr_int32_t flags, apr_fileperms_t perms, apr_pool_t *p)
   {
  -	struct ap_finfo_t finfo;
  -	ap_status_t status;
  +	struct apr_finfo_t finfo;
  +	apr_status_t status;
   
  -	*db = (SDBM *) ap_pcalloc(p, sizeof(SDBM));
  +	*db = (SDBM *) apr_pcalloc(p, sizeof(SDBM));
   	
   /*
    * adjust user flags so that WRONLY becomes RDWR, 
  @@ -142,15 +142,15 @@
    * If we fail anywhere, undo everything, return NULL.
    */
   
  -	if ((status = ap_open(&(*db)->pagf, pagname, flags, perms, p))
  +	if ((status = apr_open(&(*db)->pagf, pagname, flags, perms, p))
   	    == APR_SUCCESS) {
   	    if ((status = sdbm_lock(*db)) == APR_SUCCESS) {
  -		if ((status = ap_open(&(*db)->dirf, dirname, flags, perms, p))
  +		if ((status = apr_open(&(*db)->dirf, dirname, flags, perms, p))
   		    == APR_SUCCESS) {
   /*
    * need the dirfile size to establish max bit number.
    */
  -			if ((status = ap_getfileinfo(&finfo, (*db)->dirf))
  +			if ((status = apr_getfileinfo(&finfo, (*db)->dirf))
   			    == APR_SUCCESS) {
   /*
    * zero size: either a fresh database, or one with a single,
  @@ -160,17 +160,17 @@
   				(*db)->pagbno = -1;
   				(*db)->maxbno = finfo.size * BYTESIZ;
   
  -				/* (ap_pcalloc will zero the buffers) */
  +				/* (apr_pcalloc will zero the buffers) */
   			/*
   			 * success
   			 */
   				return APR_SUCCESS;
   			}
  -			(void) ap_close((*db)->dirf);
  +			(void) apr_close((*db)->dirf);
   		}
   		(void) sdbm_unlock(*db);
   	    }
  -	    (void) ap_close((*db)->pagf);
  +	    (void) apr_close((*db)->pagf);
   	}
   	
   	*db = NULL;
  @@ -180,9 +180,9 @@
   void
   sdbm_close(SDBM *db)
   {
  -    (void) ap_close(db->dirf);
  +    (void) apr_close(db->dirf);
       (void) sdbm_unlock(db);
  -    (void) ap_close(db->pagf);
  +    (void) apr_close(db->pagf);
   }
   
   sdbm_datum
  @@ -198,13 +198,13 @@
   	return sdbm_nullitem;
   }
   
  -static ap_status_t write_page(SDBM *db, const char *buf, long pagno)
  +static apr_status_t write_page(SDBM *db, const char *buf, long pagno)
   {
  -    ap_status_t status;
  -    ap_off_t off = OFF_PAG(pagno);
  +    apr_status_t status;
  +    apr_off_t off = OFF_PAG(pagno);
       
  -    if ((status = ap_seek(db->pagf, APR_SET, &off)) != APR_SUCCESS ||
  -	(status = ap_full_write(db->pagf, buf, PBLKSIZ, NULL)) != APR_SUCCESS) {
  +    if ((status = apr_seek(db->pagf, APR_SET, &off)) != APR_SUCCESS ||
  +	(status = apr_full_write(db->pagf, buf, PBLKSIZ, NULL)) != APR_SUCCESS) {
   	ioerr(db);
   	return status;
       }
  @@ -212,10 +212,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t
  +apr_status_t
   sdbm_delete(SDBM *db, const sdbm_datum key)
   {
  -	ap_status_t status;
  +	apr_status_t status;
   
   	if (db == NULL || bad(key))
   		return APR_EINVAL;
  @@ -239,11 +239,11 @@
   	return APR_EACCES;
   }
   
  -ap_status_t sdbm_store(SDBM *db, sdbm_datum key, sdbm_datum val, int flags)
  +apr_status_t sdbm_store(SDBM *db, sdbm_datum key, sdbm_datum val, int flags)
   {
   	int need;
   	register long hash;
  -	ap_status_t status;
  +	apr_status_t status;
   
   	if (db == NULL || bad(key))
   		return APR_EINVAL;
  @@ -299,7 +299,7 @@
    * this routine will attempt to make room for SPLTMAX times before
    * giving up.
    */
  -static ap_status_t
  +static apr_status_t
   makroom(SDBM *db, long hash, int need)
   {
   	long newp;
  @@ -307,7 +307,7 @@
   	char *pag = db->pagbuf;
   	char *new = twin;
   	register int smax = SPLTMAX;
  -	ap_status_t status;
  +	apr_status_t status;
   
   	do {
   /*
  @@ -377,13 +377,13 @@
    * 'off' is given relative to the start of the file.
    * If EOF is returned while reading, this is taken as success.
    */
  -static ap_status_t read_from(ap_file_t *f, void *buf, 
  -			     ap_off_t off, ap_size_t len)
  +static apr_status_t read_from(apr_file_t *f, void *buf, 
  +			     apr_off_t off, apr_size_t len)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   
  -    if ((status = ap_seek(f, APR_SET, &off)) != APR_SUCCESS ||
  -	((status = ap_full_read(f, buf, len, NULL)) != APR_SUCCESS)) {
  +    if ((status = apr_seek(f, APR_SET, &off)) != APR_SUCCESS ||
  +	((status = apr_full_read(f, buf, len, NULL)) != APR_SUCCESS)) {
   	/* if EOF is reached, pretend we read all zero's */
   	if (status == APR_EOF) {
   	    memset(buf, 0, len);
  @@ -426,13 +426,13 @@
   /*
    * all important binary tree traversal
    */
  -static ap_status_t
  +static apr_status_t
   getpage(SDBM *db, long hash)
   {
   	register int hbit;
   	register long dbit;
   	register long pagb;
  -	ap_status_t status;
  +	apr_status_t status;
   
   	dbit = 0;
   	hbit = 0;
  @@ -493,13 +493,13 @@
   	return db->dirbuf[c % DBLKSIZ] & (1 << dbit % BYTESIZ);
   }
   
  -static ap_status_t
  +static apr_status_t
   setdbit(SDBM *db, long dbit)
   {
   	register long c;
   	register long dirb;
  -	ap_status_t status;
  -	ap_off_t off;
  +	apr_status_t status;
  +	apr_off_t off;
   
   	c = dbit / BYTESIZ;
   	dirb = c / DBLKSIZ;
  @@ -520,8 +520,8 @@
   		db->maxbno += DBLKSIZ * BYTESIZ;
   
   	off = OFF_DIR(dirb);
  -	if (((status = ap_seek(db->dirf, APR_SET, &off)) != APR_SUCCESS)
  -	    || (status = ap_full_write(db->dirf, db->dirbuf, DBLKSIZ,
  +	if (((status = apr_seek(db->dirf, APR_SET, &off)) != APR_SUCCESS)
  +	    || (status = apr_full_write(db->dirf, db->dirbuf, DBLKSIZ,
                                          NULL)) != APR_SUCCESS) {
   	    return status;
           }
  @@ -550,14 +550,14 @@
    */
   		db->keyptr = 0;
   		if (db->pagbno != db->blkptr++) {
  -		    ap_off_t off = OFF_PAG(db->blkptr);
  -		    if (ap_seek(db->pagf, APR_SET, &off) != APR_SUCCESS)
  +		    apr_off_t off = OFF_PAG(db->blkptr);
  +		    if (apr_seek(db->pagf, APR_SET, &off) != APR_SUCCESS)
   			break;
   		}
   
   		db->pagbno = db->blkptr;
   		/* ### EOF acceptable here too? */
  -		if (ap_full_read(db->pagf, db->pagbuf, PBLKSIZ, NULL) != APR_SUCCESS)
  +		if (apr_full_read(db->pagf, db->pagbuf, PBLKSIZ, NULL) != APR_SUCCESS)
   			break;
   		if (!chkpage(db->pagbuf))
   			break;
  
  
  
  1.3       +6 -6      apache-2.0/src/lib/sdbm/sdbm.h
  
  Index: sdbm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbm.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sdbm.h	2000/07/13 10:11:23	1.2
  +++ sdbm.h	2000/08/02 05:26:46	1.3
  @@ -62,7 +62,7 @@
   #ifndef SDBM_H
   #define SDBM_H
   
  -#include "apr_file_io.h"   /* for ap_fileperms_t */
  +#include "apr_file_io.h"   /* for apr_fileperms_t */
   
   typedef struct SDBM SDBM;
   
  @@ -87,13 +87,13 @@
   /* Flags to sdbm_open */
   #define SDBM_RDONLY	0x1	       /* data base open read-only */
   
  -ap_status_t sdbm_open(SDBM **db, const char *filename, 
  -		      int flags, ap_fileperms_t perms, ap_pool_t *p);
  +apr_status_t sdbm_open(SDBM **db, const char *filename, 
  +		      int flags, apr_fileperms_t perms, apr_pool_t *p);
   
   void sdbm_close(SDBM *db); /* ### should return value? */
   
   sdbm_datum sdbm_fetch(SDBM *db, sdbm_datum key);
  -ap_status_t sdbm_delete(SDBM *db, const sdbm_datum key);
  +apr_status_t sdbm_delete(SDBM *db, const sdbm_datum key);
   
   /* * flags to sdbm_store */
   #define SDBM_INSERT	0
  @@ -105,8 +105,8 @@
   /*
    * other
    */
  -ap_status_t sdbm_prep(SDBM **db, const char *dirname, const char *pagname,
  -		      int flags, ap_fileperms_t perms, ap_pool_t *pool);
  +apr_status_t sdbm_prep(SDBM **db, const char *dirname, const char *pagname,
  +		      int flags, apr_fileperms_t perms, apr_pool_t *pool);
   
   long sdbm_hash(const char *str, int len);
   
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/sdbm/sdbm_lock.c
  
  Index: sdbm_lock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbm_lock.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sdbm_lock.c	2000/07/13 10:11:23	1.4
  +++ sdbm_lock.c	2000/08/02 05:26:46	1.5
  @@ -63,20 +63,20 @@
   #include "sdbm.h"
   #include "sdbm_private.h"
   
  -static ap_lock_t *sdbm_lock_object = NULL;
  +static apr_lock_t *sdbm_lock_object = NULL;
   
   
  -static ap_status_t create_lock(SDBM *db)
  +static apr_status_t create_lock(SDBM *db)
   {
       /* ### this should be specific to the file... */
  -    return ap_create_lock(&sdbm_lock_object, APR_MUTEX, APR_LOCKALL,
  +    return apr_create_lock(&sdbm_lock_object, APR_MUTEX, APR_LOCKALL,
                             NULL, NULL);
   }
   
   /* NOTE: this function blocks until it acquires the lock */
  -ap_status_t sdbm_lock(SDBM *db)
  +apr_status_t sdbm_lock(SDBM *db)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   
       if (sdbm_lock_object == NULL) {
           if ((status = create_lock(db)) != APR_SUCCESS) {
  @@ -85,13 +85,13 @@
       }
   
       /* ### incorrect locking semantics. need some APR work first */
  -/*    return ap_lock(sdbm_lock_object); */
  +/*    return apr_lock(sdbm_lock_object); */
       return APR_SUCCESS;
   }
   
  -ap_status_t sdbm_unlock(SDBM *db)
  +apr_status_t sdbm_unlock(SDBM *db)
   {
  -    ap_status_t status;
  +    apr_status_t status;
   
       if (sdbm_lock_object == NULL) {
           if ((status = create_lock(db)) != APR_SUCCESS) {
  @@ -100,6 +100,6 @@
       }
   
       /* ### incorrect locking semantics. need some APR work first */
  -/*    return ap_unlock(sdbm_lock_object); */
  +/*    return apr_unlock(sdbm_lock_object); */
       return APR_SUCCESS;
   }
  
  
  
  1.2       +6 -6      apache-2.0/src/lib/sdbm/sdbm_private.h
  
  Index: sdbm_private.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbm_private.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sdbm_private.h	2000/07/13 10:12:07	1.1
  +++ sdbm_private.h	2000/08/02 05:26:46	1.2
  @@ -61,7 +61,7 @@
   #ifndef SDBM_PRIVATE_H
   #define SDBM_PRIVATE_H
   
  -#include "apr_errno.h" /* for ap_status_t */
  +#include "apr_errno.h" /* for apr_status_t */
   
   /* increase the block/page size and what can be inserted */
   
  @@ -77,9 +77,9 @@
   #define SPLTMAX	10			/* maximum allowed splits */
   					/* for a single insertion */
   struct SDBM {
  -    ap_file_t *dirf;		       /* directory file descriptor */
  -    ap_file_t *pagf;		       /* page file descriptor */
  -    ap_int32_t flags;		       /* status/error flags, see below */
  +    apr_file_t *dirf;		       /* directory file descriptor */
  +    apr_file_t *pagf;		       /* page file descriptor */
  +    apr_int32_t flags;		       /* status/error flags, see below */
       long maxbno;		       /* size of dirfile in bits */
       long curbit;		       /* current bit number */
       long hmask;			       /* current hash mask */
  @@ -92,7 +92,7 @@
       char dirbuf[DBLKSIZ];	       /* directory file block buffer */
   };
   
  -ap_status_t sdbm_lock(SDBM *db);
  -ap_status_t sdbm_unlock(SDBM *db);
  +apr_status_t sdbm_lock(SDBM *db);
  +apr_status_t sdbm_unlock(SDBM *db);
   
   #endif /* SDBM_PRIVATE_H */
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/sdbm/sdbm_tune.h
  
  Index: sdbm_tune.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/sdbm/sdbm_tune.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sdbm_tune.h	2000/07/13 10:11:23	1.3
  +++ sdbm_tune.h	2000/08/02 05:26:46	1.4
  @@ -82,7 +82,7 @@
   #define debug(x)
   #endif
   
  -ap_status_t sdbm_fd_lock(int fd, int readonly);
  -ap_status_t sdbm_fd_unlock(int fd);
  +apr_status_t sdbm_fd_lock(int fd, int readonly);
  +apr_status_t sdbm_fd_unlock(int fd);
   
   #endif /* SDBM_TUNE_H */
  
  
  
  1.56      +101 -101  apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- buff.c	2000/07/13 16:26:41	1.55
  +++ buff.c	2000/08/02 05:26:47	1.56
  @@ -124,10 +124,10 @@
    */
   
   #ifdef APACHE_XLATE
  -static ap_status_t ap_bwrite_xlate(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                   ap_ssize_t *bytes_written);
  -static ap_status_t ap_bread_xlate(BUFF *fb, void *buf, ap_size_t nbyte,
  -                                  ap_ssize_t *bytes_read);
  +static apr_status_t ap_bwrite_xlate(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                   apr_ssize_t *bytes_written);
  +static apr_status_t ap_bread_xlate(BUFF *fb, void *buf, apr_size_t nbyte,
  +                                  apr_ssize_t *bytes_read);
   
   static const b_read_ops binary_read_ops = {ap_bread_core};
   static const b_read_ops xlate_read_ops  = {ap_bread_xlate};
  @@ -155,17 +155,17 @@
   /*
    * Create a new buffered stream
    */
  -API_EXPORT(BUFF *) ap_bcreate(ap_pool_t *p, int flags)
  +API_EXPORT(BUFF *) ap_bcreate(apr_pool_t *p, int flags)
   {
       BUFF *fb;
   
  -    fb = ap_palloc(p, sizeof(BUFF));
  +    fb = apr_palloc(p, sizeof(BUFF));
       fb->pool = p;
       fb->bufsiz = DEFAULT_BUFSIZE;
       fb->flags = flags & B_RDWR;
   
       if (flags & B_RD)
  -	fb->inbase = ap_palloc(p, fb->bufsiz);
  +	fb->inbase = apr_palloc(p, fb->bufsiz);
       else
   	fb->inbase = NULL;
   
  @@ -173,7 +173,7 @@
        * buffer... and possibly the beginning of a new chunk
        */
       if (flags & B_WR)
  -	fb->outbase = ap_palloc(p, fb->bufsiz + 2 + CHUNK_HEADER_SIZE + 1);
  +	fb->outbase = apr_palloc(p, fb->bufsiz + 2 + CHUNK_HEADER_SIZE + 1);
       else
   	fb->outbase = NULL;
   
  @@ -199,7 +199,7 @@
       return fb;
   }
   
  -static ap_status_t bcleanup(void *v)
  +static apr_status_t bcleanup(void *v)
   {
       BUFF *fb = v;
   
  @@ -218,15 +218,15 @@
   API_EXPORT(void) ap_bpush_iol(BUFF *fb, ap_iol *iol)
   {
       fb->iol = iol;
  -    ap_register_cleanup(fb->pool, fb, bcleanup, bcleanup);
  +    apr_register_cleanup(fb->pool, fb, bcleanup, bcleanup);
   }
   API_EXPORT(void) ap_bpop_iol(ap_iol **iol, BUFF *fb)
   {
       *iol = fb->iol;
  -    ap_kill_cleanup(fb->pool, fb, bcleanup);
  +    apr_kill_cleanup(fb->pool, fb, bcleanup);
   }
   
  -API_EXPORT(ap_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval)
  +API_EXPORT(apr_status_t) ap_bsetopt(BUFF *fb, int optname, const void *optval)
   {
       switch (optname) {
       case BO_BYTECT:
  @@ -244,7 +244,7 @@
   
   #ifdef APACHE_XLATE
       case BO_WXLATE:
  -        fb->write_xlate = (ap_xlate_t *)*(const ap_xlate_t **)optval;
  +        fb->write_xlate = (apr_xlate_t *)*(const apr_xlate_t **)optval;
           if (fb->write_xlate) {
               ap_xlate_get_sb(fb->write_xlate, &fb->write_xlate_sb);
               fb->b_write_ops = xlate_write_ops;
  @@ -255,7 +255,7 @@
           return APR_SUCCESS;
           
       case BO_RXLATE:
  -        fb->read_xlate = (ap_xlate_t *)*(const ap_xlate_t **)optval;
  +        fb->read_xlate = (apr_xlate_t *)*(const apr_xlate_t **)optval;
           if (fb->read_xlate) {
               fb->b_read_ops = xlate_read_ops;
           }
  @@ -269,7 +269,7 @@
       return APR_EINVAL;
   }
   
  -API_EXPORT(ap_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval)
  +API_EXPORT(apr_status_t) ap_bgetopt(BUFF *fb, int optname, void *optval)
   {
       long int bs;
   
  @@ -287,11 +287,11 @@
           
   #ifdef APACHE_XLATE
       case BO_WXLATE:
  -        *(ap_xlate_t **)optval = fb->write_xlate;
  +        *(apr_xlate_t **)optval = fb->write_xlate;
           return APR_SUCCESS;
           
       case BO_RXLATE:
  -        *(ap_xlate_t **)optval = fb->read_xlate;
  +        *(apr_xlate_t **)optval = fb->read_xlate;
           return APR_SUCCESS;
   #endif /*APACHE_XLATE*/
       }
  @@ -326,7 +326,7 @@
       unsigned char *strp;
       int chunk_size;
   #ifdef CHARSET_EBCDIC
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_size_t inbytes_left, outbytes_left;
   #endif
   
       chunk_size = fb->outcnt - fb->outchunk - CHUNK_HEADER_SIZE + extra;
  @@ -345,12 +345,12 @@
       }
   
       /* we know this will fit because of space we saved in start_chunk() */
  -    i = ap_snprintf((char *) &fb->outbase[fb->outchunk], CHUNK_HEADER_SIZE,
  +    i = apr_snprintf((char *) &fb->outbase[fb->outchunk], CHUNK_HEADER_SIZE,
                   "%x", chunk_size);
   
       /* we may have to tack some trailing spaces onto the number we just wrote
        * in case it was smaller than our estimated size.  We've also written
  -     * a \0 into the buffer with ap_snprintf so we might have to put a
  +     * a \0 into the buffer with apr_snprintf so we might have to put a
        * \r back in.
        */
       strp = &fb->outbase[fb->outchunk + i];
  @@ -410,8 +410,8 @@
   }
   
   /* read without blocking, if EAGAIN, then flush */
  -static ap_status_t saferead(BUFF *fb, void *buf, ap_size_t nbyte,
  -			ap_ssize_t *bytes_read)
  +static apr_status_t saferead(BUFF *fb, void *buf, apr_size_t nbyte,
  +			apr_ssize_t *bytes_read)
   {
       int rv;
       const int zero = 0;
  @@ -435,7 +435,7 @@
   
   API_EXPORT(void) ap_bhalfduplex(BUFF *fb)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       /* There is nothing to do if the there is something readable in the 
        * incoming buffer or there is nothing flushable in the output buffer.
  @@ -449,7 +449,7 @@
       /* we'll read the next packet if it's available */
       fb->inptr = fb->inbase;
       rv = saferead(fb, fb->inptr, fb->bufsiz, &fb->incnt);
  -    if (rv != APR_SUCCESS && ap_canonical_error(rv) != APR_EAGAIN) {
  +    if (rv != APR_SUCCESS && apr_canonical_error(rv) != APR_EAGAIN) {
   	fb->berrno = rv;
   	fb->saved_errno = rv;
   	doerror(fb, B_RD);
  @@ -457,10 +457,10 @@
   }
   
   /* a wrapper around iol_read which checks for errors and EOFs */
  -static ap_status_t read_with_errors(BUFF *fb, void *buf, ap_size_t nbyte,
  -                                    ap_ssize_t *bytes_read)
  +static apr_status_t read_with_errors(BUFF *fb, void *buf, apr_size_t nbyte,
  +                                    apr_ssize_t *bytes_read)
   {
  -    ap_status_t rv = APR_EINIT;
  +    apr_status_t rv = APR_EINIT;
    
       if (fb->flags & B_SAFEREAD && fb->outcnt) {
           rv = saferead(fb, buf, nbyte, bytes_read);
  @@ -476,7 +476,7 @@
       else if (rv != APR_SUCCESS) {
   	fb->berrno = rv;
   	fb->saved_errno = rv;
  -	if (ap_canonical_error(rv) != APR_EAGAIN) {
  +	if (apr_canonical_error(rv) != APR_EAGAIN) {
   	    doerror(fb, B_RD);
   	}
       }
  @@ -485,11 +485,11 @@
   
   
   #ifdef APACHE_XLATE
  -static ap_status_t ap_bread_xlate(BUFF *fb, void *buf, ap_size_t nbyte,
  -                                  ap_ssize_t *bytes_read)
  +static apr_status_t ap_bread_xlate(BUFF *fb, void *buf, apr_size_t nbyte,
  +                                  apr_ssize_t *bytes_read)
   {
  -    ap_status_t rv;
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_status_t rv;
  +    apr_size_t inbytes_left, outbytes_left;
       
       rv = ap_bread_core(fb, buf, nbyte, bytes_read);
       if (rv == APR_SUCCESS && *bytes_read) {
  @@ -514,12 +514,12 @@
    * Read up to nbyte bytes into buf.
    * If fewer than nbyte bytes are currently available, then return those.
    */
  -API_EXPORT(ap_status_t) ap_bread_core(BUFF *fb, void *buf, ap_size_t nbyte,
  -                                      ap_ssize_t *bytes_read)
  +API_EXPORT(apr_status_t) ap_bread_core(BUFF *fb, void *buf, apr_size_t nbyte,
  +                                      apr_ssize_t *bytes_read)
   {
       int nrd;
  -    ap_ssize_t i;
  -    ap_status_t rv;
  +    apr_ssize_t i;
  +    apr_status_t rv;
   
       if (fb->flags & B_RDERR) {
           *bytes_read = 0;
  @@ -615,8 +615,8 @@
   API_EXPORT(int) ap_bgets(char *buff, int n, BUFF *fb)
   {
       int ch, ct;
  -    ap_ssize_t i;
  -    ap_status_t rv;
  +    apr_ssize_t i;
  +    apr_status_t rv;
   
   /* Can't do bgets on an unbuffered stream */
       if (!(fb->flags & B_RD)) {
  @@ -709,8 +709,8 @@
   API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb)
   {
       char ss[1];
  -    ap_ssize_t bytes_written;
  -    ap_status_t rv;
  +    apr_ssize_t bytes_written;
  +    apr_status_t rv;
   
       ss[0] = c;
       rv = ap_bwrite(fb, ss, 1, &bytes_written);
  @@ -726,8 +726,8 @@
    */
   API_EXPORT(int) ap_bfilbuf(BUFF *fb)
   {
  -    ap_status_t rv;
  -    ap_ssize_t i;
  +    apr_status_t rv;
  +    apr_ssize_t i;
       char buf[1];
   
       rv = ap_bread(fb, buf, 1, &i);
  @@ -742,16 +742,16 @@
   /* A wrapper for writev which deals with error conditions and
    * bytes_sent.
    */
  -static ap_status_t writev_with_errors(BUFF *fb, const struct iovec *vec,
  -                                      int nvec, ap_ssize_t *bytes_written)
  +static apr_status_t writev_with_errors(BUFF *fb, const struct iovec *vec,
  +                                      int nvec, apr_ssize_t *bytes_written)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       rv = iol_writev(fb->iol, vec, nvec, bytes_written);
       fb->bytes_sent += *bytes_written;
       if (rv != APR_SUCCESS) {
           /* ### set berrno? */
   	fb->saved_errno = rv;
  -	if (ap_canonical_error(rv) != APR_EAGAIN) {
  +	if (apr_canonical_error(rv) != APR_EAGAIN) {
   	    doerror(fb, B_WR);
   	}
       }
  @@ -759,12 +759,12 @@
   }
   
   
  -static ap_status_t writev_it_all(BUFF *fb, struct iovec *vec, int nvec,
  -                                 ap_ssize_t *bytes_written)
  +static apr_status_t writev_it_all(BUFF *fb, struct iovec *vec, int nvec,
  +                                 apr_ssize_t *bytes_written)
   {
       int i;
  -    ap_status_t rv;
  -    ap_ssize_t n;
  +    apr_status_t rv;
  +    apr_ssize_t n;
   
       i = 0;
       *bytes_written = 0;
  @@ -800,12 +800,12 @@
      bytes_written is the number of bytes written from buf, it
      doesn't include any bytes potentially written from fb->outbase.
   */
  -static ap_status_t large_write(BUFF *fb, const char *buf, ap_size_t nbyte,
  -                               ap_ssize_t *bytes_written)
  +static apr_status_t large_write(BUFF *fb, const char *buf, apr_size_t nbyte,
  +                               apr_ssize_t *bytes_written)
   {
       struct iovec vec[2];
       int nvec;
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       ap_assert(nbyte > 0);
       if (fb->outcnt) {
  @@ -865,11 +865,11 @@
   
       -djg
   */
  -static ap_status_t large_write_chunk(BUFF *fb, const char *buf, ap_size_t nbyte,
  -                                     ap_ssize_t *bytes_written)
  +static apr_status_t large_write_chunk(BUFF *fb, const char *buf, apr_size_t nbyte,
  +                                     apr_ssize_t *bytes_written)
   {
  -    ap_status_t rv;
  -    ap_ssize_t total, n, amt;
  +    apr_status_t rv;
  +    apr_ssize_t total, n, amt;
   
       ap_assert(nbyte > 0);
       total = 0;
  @@ -925,17 +925,17 @@
   /* A wrapper for write which deals with error conditions and
    * bytes_sent.
    */
  -static ap_status_t write_with_errors(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                     ap_ssize_t *bytes_written)
  +static apr_status_t write_with_errors(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                     apr_ssize_t *bytes_written)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       rv = iol_write(fb->iol, buf, nbyte, bytes_written);
       fb->bytes_sent += *bytes_written;
       if (rv != APR_SUCCESS) {
           /* ### set berrno? */
   	fb->saved_errno = rv;
  -	if (ap_canonical_error(rv) != APR_EAGAIN) {
  +	if (apr_canonical_error(rv) != APR_EAGAIN) {
   	    doerror(fb, B_WR);
   	}
       }
  @@ -943,10 +943,10 @@
   }
   
   
  -static ap_status_t bflush_core(BUFF *fb, ap_ssize_t *bytes_written)
  +static apr_status_t bflush_core(BUFF *fb, apr_ssize_t *bytes_written)
   {
  -    ap_status_t rv;
  -    ap_ssize_t n;
  +    apr_status_t rv;
  +    apr_ssize_t n;
   
       if (fb->flags & B_CHUNK) {
   	end_chunk(fb, 0);
  @@ -978,13 +978,13 @@
    * we'll check that the buffer for the temporary character (fb->partial_write)
    * is large enough;
    */
  -static ap_status_t bwrite_xlate_partial(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                        ap_ssize_t *bytes_written)
  +static apr_status_t bwrite_xlate_partial(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                        apr_ssize_t *bytes_written)
   {
  -    ap_size_t inbytes_left, outbytes_left;
  -    ap_status_t rv = APR_SUCCESS;
  +    apr_size_t inbytes_left, outbytes_left;
  +    apr_status_t rv = APR_SUCCESS;
       const char *in = (const char *)buf;
  -    ap_ssize_t written;
  +    apr_ssize_t written;
       
       *bytes_written = 0;
       do {
  @@ -1012,13 +1012,13 @@
       return rv;
   }
   
  -static ap_status_t ap_bwrite_xlate(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                   ap_ssize_t *bytes_written)
  +static apr_status_t ap_bwrite_xlate(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                   apr_ssize_t *bytes_written)
   {
  -    ap_size_t inbytes_left, outbytes_left, to_write;
  -    ap_status_t rv;
  +    apr_size_t inbytes_left, outbytes_left, to_write;
  +    apr_status_t rv;
       int o;
  -    ap_ssize_t written;
  +    apr_ssize_t written;
       
       if (nbyte == 0) {
           *bytes_written = 0;
  @@ -1099,13 +1099,13 @@
    * It is worth noting that if an error occurs, the buffer is in an unknown
    * state.
    */
  -API_EXPORT(ap_status_t) ap_bwrite_core(BUFF *fb, const void *buf, ap_size_t nbyte,
  -                                  ap_ssize_t *bytes_written)
  +API_EXPORT(apr_status_t) ap_bwrite_core(BUFF *fb, const void *buf, apr_size_t nbyte,
  +                                  apr_ssize_t *bytes_written)
   {
       int amt;
       int total;
  -    ap_ssize_t n;
  -    ap_status_t rv;
  +    apr_ssize_t n;
  +    apr_status_t rv;
   
       if (fb->flags & (B_WRERR | B_EOUT)) {
           *bytes_written = 0;
  @@ -1161,9 +1161,9 @@
   /*
    * Flushes the buffered stream.
    */
  -API_EXPORT(ap_status_t) ap_bflush(BUFF *fb)
  +API_EXPORT(apr_status_t) ap_bflush(BUFF *fb)
   {
  -    ap_ssize_t n;       /* Placeholder; not ever used */
  +    apr_ssize_t n;       /* Placeholder; not ever used */
   
       if ((fb->flags & (B_EOUT | B_WR)) != B_WR) {
           fb->berrno = APR_EINVAL;
  @@ -1175,9 +1175,9 @@
       return bflush_core(fb, &n);
   }
   
  -API_EXPORT(ap_status_t) ap_bshutdown(BUFF *fb, int how)
  +API_EXPORT(apr_status_t) ap_bshutdown(BUFF *fb, int how)
   {
  -    ap_status_t status;
  +    apr_status_t status;
       
       if (how >= 1) {
           ap_bsetflag(fb, B_EOUT, 1);
  @@ -1194,15 +1194,15 @@
    * Sets the EOF flag to indicate no futher data can be read,
    * and the EOUT flag to indicate no further data can be written.
    */
  -API_EXPORT(ap_status_t) ap_bclose(BUFF *fb)
  +API_EXPORT(apr_status_t) ap_bclose(BUFF *fb)
   {
  -    ap_status_t rc1, rc2;
  +    apr_status_t rc1, rc2;
   
       if (fb->flags & B_WR)
   	rc1 = ap_bflush(fb);
       else
   	rc1 = APR_SUCCESS;
  -    ap_kill_cleanup(fb->pool, fb, bcleanup);
  +    apr_kill_cleanup(fb->pool, fb, bcleanup);
       rc2 = iol_close(fb->iol);
   
   #ifdef APACHE_XLATE
  @@ -1228,9 +1228,9 @@
    */
   API_EXPORT(int) ap_bputs(const char *x, BUFF *fb)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       int j = strlen(x);
  -    ap_ssize_t i;
  +    apr_ssize_t i;
       rv = ap_bwrite(fb, x, j, &i);
       if (i != j) {
           fb->berrno = rv;
  @@ -1246,7 +1246,7 @@
   API_EXPORT(int) ap_vbputstrs(BUFF *fb, va_list va)
   {
       int j, k;
  -    ap_ssize_t i;
  +    apr_ssize_t i;
       const char *x;
       int rv;
   
  @@ -1281,7 +1281,7 @@
   }
   
   API_EXPORT(void) ap_bonerror(BUFF *fb,
  -                             void (*error) (BUFF *, int, void *, ap_status_t),
  +                             void (*error) (BUFF *, int, void *, apr_status_t),
                                void *data)
   {
       fb->error = error;
  @@ -1289,23 +1289,23 @@
   }
   
   struct bprintf_data {
  -    ap_vformatter_buff_t vbuff;
  +    apr_vformatter_buff_t vbuff;
       BUFF *fb;
   };
   
  -API_EXPORT(ap_status_t) ap_berror(BUFF *fb)
  +API_EXPORT(apr_status_t) ap_berror(BUFF *fb)
   {
       return fb->berrno;
   }
   
  -static int bprintf_flush(ap_vformatter_buff_t *vbuff)
  +static int bprintf_flush(apr_vformatter_buff_t *vbuff)
   {
       struct bprintf_data *b = (struct bprintf_data *)vbuff;
       BUFF *fb = b->fb;
   
   #ifdef APACHE_XLATE
  -    ap_size_t inbytes_left, outbytes_left;
  -    ap_status_t rv;
  +    apr_size_t inbytes_left, outbytes_left;
  +    apr_status_t rv;
       
       /* Characters were pushed into the buffer without conversion. Do it now */
       if (fb->write_xlate) {
  @@ -1352,13 +1352,13 @@
       b.vbuff.curpos = (char *)&fb->outbase[fb->outcnt];
       b.vbuff.endpos = (char *)&fb->outbase[fb->bufsiz];
       b.fb = fb;
  -    res = ap_vformatter(bprintf_flush, &b.vbuff, fmt, ap);
  +    res = apr_vformatter(bprintf_flush, &b.vbuff, fmt, ap);
       if (res != -1) {
   #ifdef APACHE_XLATE
   	/* Characters were pushed into the buffer without conversion. Do it now */
   	if (fb->write_xlate) {
  -            ap_size_t inbytes_left, outbytes_left;
  -            ap_status_t rv;
  +            apr_size_t inbytes_left, outbytes_left;
  +            apr_status_t rv;
   
               inbytes_left = outbytes_left =
                   b.vbuff.curpos - (char *)&fb->outbase[fb->outcnt];
  @@ -1373,13 +1373,13 @@
       return res;
   }
   
  -API_EXPORT(BUFF *) ap_bopenf(ap_pool_t *a, const char *name, int flg, int mode)
  +API_EXPORT(BUFF *) ap_bopenf(apr_pool_t *a, const char *name, int flg, int mode)
   {
       ap_iol *iol;
       BUFF *fb;
  -    ap_status_t rv;
  -    ap_file_t *file = NULL;
  -    rv = ap_open(&file, name, flg, 0, a);
  +    apr_status_t rv;
  +    apr_file_t *file = NULL;
  +    rv = apr_open(&file, name, flg, 0, a);
       if ((rv != APR_SUCCESS) || (file == NULL)) {
           return NULL;
       }
  
  
  
  1.4       +1 -1      apache-2.0/src/main/gen_uri_delims.c
  
  Index: gen_uri_delims.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_uri_delims.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_uri_delims.c	2000/03/31 08:44:19	1.3
  +++ gen_uri_delims.c	2000/08/02 05:26:47	1.4
  @@ -58,7 +58,7 @@
   
   #include <stdio.h>
   
  -/* generate a ap_table_t of 256 values, where certain characters are
  +/* generate a apr_table_t of 256 values, where certain characters are
    * marked "interesting"... for the uri parsing process.
    */
   
  
  
  
  1.72      +86 -86    apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- http_config.c	2000/07/25 01:06:26	1.71
  +++ http_config.c	2000/08/02 05:26:47	1.72
  @@ -96,9 +96,9 @@
   
   API_VAR_EXPORT const char *ap_server_root;
   
  -API_VAR_EXPORT ap_array_header_t *ap_server_pre_read_config;
  -API_VAR_EXPORT ap_array_header_t *ap_server_post_read_config;
  -API_VAR_EXPORT ap_array_header_t *ap_server_config_defines;
  +API_VAR_EXPORT apr_array_header_t *ap_server_pre_read_config;
  +API_VAR_EXPORT apr_array_header_t *ap_server_post_read_config;
  +API_VAR_EXPORT apr_array_header_t *ap_server_config_defines;
   
   AP_HOOK_STRUCT(
   	    AP_HOOK_LINK(header_parser)
  @@ -111,16 +111,16 @@
   AP_IMPLEMENT_HOOK_RUN_ALL(int,header_parser,
                             (request_rec *r),(r),OK,DECLINED)
   AP_IMPLEMENT_HOOK_VOID(pre_config,
  -		       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp),
  +		       (apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp),
                          (pconf,plog,ptemp))
   AP_IMPLEMENT_HOOK_VOID(post_config,
  -		       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp,
  +		       (apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp,
                           server_rec *s),(pconf,plog,ptemp,s))
   AP_IMPLEMENT_HOOK_VOID(open_logs,
  -		       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, 
  +		       (apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, 
                           server_rec *s),(pconf,plog,ptemp,s))
   AP_IMPLEMENT_HOOK_VOID(child_init,
  -                       (ap_pool_t *pchild, server_rec *s),(pchild,s))
  +                       (apr_pool_t *pchild, server_rec *s),(pchild,s))
   
   /****************************************************************
    *
  @@ -141,8 +141,8 @@
   API_VAR_EXPORT module **ap_loaded_modules=NULL;
   
   typedef int (*handler_func) (request_rec *);
  -typedef void *(*dir_maker_func) (ap_pool_t *, char *);
  -typedef void *(*merger_func) (ap_pool_t *, void *, void *);
  +typedef void *(*dir_maker_func) (apr_pool_t *, char *);
  +typedef void *(*merger_func) (apr_pool_t *, void *, void *);
   
   /* Dealing with config vectors.  These are associated with per-directory,
    * per-server, and per-request configuration, and have a void* pointer for
  @@ -171,16 +171,16 @@
   }
   #endif
   
  -static void *create_empty_config(ap_pool_t *p)
  +static void *create_empty_config(apr_pool_t *p)
   {
  -    void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) *
  +    void **conf_vector = (void **) apr_pcalloc(p, sizeof(void *) *
   				    (total_modules + DYNAMIC_MODULE_LIMIT));
       return (void *) conf_vector;
   }
   
  -static void *create_default_per_dir_config(ap_pool_t *p)
  +static void *create_default_per_dir_config(apr_pool_t *p)
   {
  -    void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
  +    void **conf_vector = (void **) apr_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
       module *modp;
   
       for (modp = top_module; modp; modp = modp->next) {
  @@ -194,9 +194,9 @@
   }
   
   void *
  -     ap_merge_per_dir_configs(ap_pool_t *p, void *base, void *new)
  +     ap_merge_per_dir_configs(apr_pool_t *p, void *base, void *new)
   {
  -    void **conf_vector = (void **) ap_palloc(p, sizeof(void *) * total_modules);
  +    void **conf_vector = (void **) apr_palloc(p, sizeof(void *) * total_modules);
       void **base_vector = (void **) base;
       void **new_vector = (void **) new;
       module *modp;
  @@ -214,9 +214,9 @@
       return (void *) conf_vector;
   }
   
  -static void *create_server_config(ap_pool_t *p, server_rec *s)
  +static void *create_server_config(apr_pool_t *p, server_rec *s)
   {
  -    void **conf_vector = (void **) ap_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
  +    void **conf_vector = (void **) apr_pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT));
       module *modp;
   
       for (modp = top_module; modp; modp = modp->next) {
  @@ -227,7 +227,7 @@
       return (void *) conf_vector;
   }
   
  -static void merge_server_configs(ap_pool_t *p, void *base, void *virt)
  +static void merge_server_configs(apr_pool_t *p, void *base, void *virt)
   {
       /* Can reuse the 'virt' vector for the spine of it, since we don't
        * have to deal with the moral equivalent of .htaccess files here...
  @@ -248,17 +248,17 @@
       }
   }
   
  -void *ap_create_request_config(ap_pool_t *p)
  +void *ap_create_request_config(apr_pool_t *p)
   {
       return create_empty_config(p);
   }
   
  -void *ap_create_conn_config(ap_pool_t *p)
  +void *ap_create_conn_config(apr_pool_t *p)
   {
       return create_empty_config(p);
   }
   
  -CORE_EXPORT(void *) ap_create_per_dir_config(ap_pool_t *p)
  +CORE_EXPORT(void *) ap_create_per_dir_config(apr_pool_t *p)
   {
       return create_empty_config(p);
   }
  @@ -277,7 +277,7 @@
   static fast_handler_rec *handlers;
   static fast_handler_rec *wildhandlers;
   
  -static void init_handlers(ap_pool_t *p)
  +static void init_handlers(apr_pool_t *p)
   {
       module *modp;
       int nhandlers = 0;
  @@ -297,8 +297,8 @@
               }
           }
       }
  -    ph = handlers = ap_palloc(p, sizeof(*ph)*(nhandlers + 1));
  -    pw = wildhandlers = ap_palloc(p, sizeof(*pw)*(nwildhandlers + 1));
  +    ph = handlers = apr_palloc(p, sizeof(*ph)*(nhandlers + 1));
  +    pw = wildhandlers = apr_palloc(p, sizeof(*pw)*(nwildhandlers + 1));
       for (modp = top_module; modp; modp = modp->next) {
   	if (!modp->handlers)
   	    continue;
  @@ -563,7 +563,7 @@
       /* 
        *  Initialise list of loaded modules
        */
  -    ap_loaded_modules = (module **)ap_palloc(process->pool,
  +    ap_loaded_modules = (module **)apr_palloc(process->pool,
           sizeof(module *)*(total_modules+DYNAMIC_MODULE_LIMIT+1));
       if (ap_loaded_modules == NULL) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  @@ -649,7 +649,7 @@
       const char *errmsg;
   
       if ((parms->override & cmd->req_override) == 0)
  -	return ap_pstrcat(parms->pool, cmd->name, " not allowed here", NULL);
  +	return apr_pstrcat(parms->pool, cmd->name, " not allowed here", NULL);
   
       parms->info = cmd->cmd_data;
       parms->cmd = cmd;
  @@ -663,7 +663,7 @@
   
       case NO_ARGS:
   	if (*args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name, " takes no arguments",
  +	    return apr_pstrcat(parms->pool, cmd->name, " takes no arguments",
   			   NULL);
   
   	return cmd->AP_NO_ARGS(parms, mconfig);
  @@ -672,7 +672,7 @@
   	w = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name, " takes one argument",
  +	    return apr_pstrcat(parms->pool, cmd->name, " takes one argument",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
   	return cmd->AP_TAKE1(parms, mconfig, w);
  @@ -682,7 +682,7 @@
   	w2 = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || *w2 == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name, " takes two arguments",
  +	    return apr_pstrcat(parms->pool, cmd->name, " takes two arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
   	return cmd->AP_TAKE2(parms, mconfig, w, w2);
  @@ -693,7 +693,7 @@
   	w2 = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name, " takes 1-2 arguments",
  +	    return apr_pstrcat(parms->pool, cmd->name, " takes 1-2 arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
   	return cmd->AP_TAKE2(parms, mconfig, w, *w2 ? w2 : NULL);
  @@ -705,7 +705,7 @@
   	w3 = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || *w2 == '\0' || *w3 == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name, " takes three arguments",
  +	    return apr_pstrcat(parms->pool, cmd->name, " takes three arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
   	return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
  @@ -717,7 +717,7 @@
   	w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
   
   	if (*w == '\0' || *w2 == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name,
  +	    return apr_pstrcat(parms->pool, cmd->name,
   			    " takes two or three arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
  @@ -730,7 +730,7 @@
   	w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
   
   	if (*w == '\0' || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name,
  +	    return apr_pstrcat(parms->pool, cmd->name,
   			    " takes one, two or three arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
  @@ -743,7 +743,7 @@
   	w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
   
   	if (*w == '\0' || (w2 && *w2 && !w3) || *args != 0)
  -	    return ap_pstrcat(parms->pool, cmd->name,
  +	    return apr_pstrcat(parms->pool, cmd->name,
   			    " takes one or three arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
  @@ -764,7 +764,7 @@
   	w = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || *args == 0)
  -	    return ap_pstrcat(parms->pool, cmd->name,
  +	    return apr_pstrcat(parms->pool, cmd->name,
   			    " requires at least two arguments",
   			    cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
   
  @@ -781,14 +781,14 @@
   	w = ap_getword_conf(parms->pool, &args);
   
   	if (*w == '\0' || (strcasecmp(w, "on") && strcasecmp(w, "off")))
  -	    return ap_pstrcat(parms->pool, cmd->name, " must be On or Off",
  +	    return apr_pstrcat(parms->pool, cmd->name, " must be On or Off",
   			    NULL);
   
   	return cmd->AP_FLAG(parms, mconfig, strcasecmp(w, "off") != 0);
   
       default:
   
  -	return ap_pstrcat(parms->pool, cmd->name,
  +	return apr_pstrcat(parms->pool, cmd->name,
   		    " is improperly configured internally (server bug)",
   			NULL);
       }
  @@ -837,10 +837,10 @@
   }
   
   static const char *execute_now(char *cmd_line, const char *args, cmd_parms *parms, 
  -                         ap_pool_t *p, ap_pool_t *ptemp,
  +                         apr_pool_t *p, apr_pool_t *ptemp,
                            ap_directive_t **sub_tree, ap_directive_t *parent);
   
  -static const char * ap_build_config_sub(ap_pool_t *p, ap_pool_t *temp_pool,
  +static const char * ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool,
   					const char *l, cmd_parms *parms,
   					ap_directive_t **current,
   					ap_directive_t **curr_parent)
  @@ -867,11 +867,11 @@
   	return NULL;
       }
   
  -    newdir = ap_pcalloc(p, sizeof(ap_directive_t));
  +    newdir = apr_pcalloc(p, sizeof(ap_directive_t));
       newdir->filename = parms->config_file->name;
       newdir->line_num = parms->config_file->line_number;
       newdir->directive = cmd_name;
  -    newdir->args = ap_pstrdup(p, args);
  +    newdir->args = apr_pstrdup(p, args);
   
       if ((cmd = ap_find_command_in_modules(cmd_name, &mod)) != NULL) {
           if (cmd->req_override & EXEC_ON_READ) {
  @@ -909,7 +909,7 @@
           }
   	else if (*curr_parent == NULL) {
               parms->err_directive = newdir;
  -	    return ap_pstrcat(p, cmd_name,
  +	    return apr_pstrcat(p, cmd_name,
   			      " without matching <", cmd_name + 2,
   			      " section", NULL);
   	}
  @@ -917,13 +917,13 @@
   	    char *bracket = cmd_name + strlen(cmd_name) - 1;
   
   	    if (*bracket != '>') {
  -		return ap_pstrcat(p, cmd_name,
  +		return apr_pstrcat(p, cmd_name,
   				  "> directive missing closing '>'", NULL);
   	    }
   	    *bracket = '\0';
   	    if (strcasecmp(cmd_name + 2,
   			    (*curr_parent)->directive + 1) != 0) {
  -		return ap_pstrcat(p, "Expected </",
  +		return apr_pstrcat(p, "Expected </",
   				  (*curr_parent)->directive + 1, "> but saw ",
   				  cmd_name, ">", NULL);
   	    }
  @@ -941,7 +941,7 @@
       return NULL;
   }
   
  -const char * ap_build_cont_config(ap_pool_t *p, ap_pool_t *temp_pool,
  +const char * ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool,
   					cmd_parms *parms,
   					ap_directive_t **current,
   					ap_directive_t **curr_parent,
  @@ -952,7 +952,7 @@
       const char *retval;
       ap_directive_t *conftree = NULL;
   
  -    bracket = ap_pstrcat(p, orig_directive + 1, ">", NULL);
  +    bracket = apr_pstrcat(p, orig_directive + 1, ">", NULL);
       while(!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
           if ((strcasecmp(l + 2, bracket) == 0) &&
               (*curr_parent == NULL)) {
  @@ -983,7 +983,7 @@
   
   	if (!(cmd = ap_find_command_in_modules(current->directive, &mod))) {
               parms->err_directive = current;
  -            return ap_pstrcat(parms->pool, "Invalid command '", 
  +            return apr_pstrcat(parms->pool, "Invalid command '", 
   			      current->directive,
   			      "', perhaps mis-spelled or defined by a module "
   			      "not included in the server configuration",
  @@ -1043,7 +1043,7 @@
   
   
   API_EXPORT(const char *) ap_build_config(cmd_parms *parms,
  -					 ap_pool_t *p, ap_pool_t *temp_pool,
  +					 apr_pool_t *p, apr_pool_t *temp_pool,
   					 ap_directive_t **conftree)
   {
       ap_directive_t *current = *conftree;
  @@ -1075,7 +1075,7 @@
       if (curr_parent != NULL) {
   	errmsg = "";
   	while (curr_parent != NULL) {
  -	    errmsg = ap_psprintf(p, "%s%s%s:%u: %s> was not closed.",
  +	    errmsg = apr_psprintf(p, "%s%s%s:%u: %s> was not closed.",
   				 errmsg,
   				 *errmsg == '\0' ? "" : APR_EOL_STR,
   				 curr_parent->filename,
  @@ -1109,7 +1109,7 @@
   							 const char *arg_)
   {
       /* This one's pretty generic... */
  -    char *arg=ap_pstrdup(cmd->pool,arg_);
  +    char *arg=apr_pstrdup(cmd->pool,arg_);
   
       int offset = (int) (long) cmd->info;
       ap_str_tolower(arg);
  @@ -1137,7 +1137,7 @@
       char *p;
       int offset = (int) (long) cmd->info;
       if (ap_os_is_path_absolute(arg))
  -	p = ap_pstrdup(cmd->pool, arg);
  +	p = apr_pstrdup(cmd->pool, arg);
       else
   	p = ap_make_full_path(cmd->pool, ap_server_root, arg);
       *(char **) (struct_ptr + offset) = p;
  @@ -1152,7 +1152,7 @@
   static cmd_parms default_parms =
   {NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
   
  -API_EXPORT(const char *) ap_server_root_relative(ap_pool_t *p, const char *file)
  +API_EXPORT(const char *) ap_server_root_relative(apr_pool_t *p, const char *file)
   {
       if(ap_os_is_path_absolute(file))
   	return file;
  @@ -1176,7 +1176,7 @@
               if (cmd_name[1] == '/') {
                   cmd_name[strlen(cmd_name) - 1] = '\0';
                   if (strcasecmp(cmd_name + 2, directive + 1) != 0) {
  -                    return ap_pstrcat(cmd->pool, "Expected </",
  +                    return apr_pstrcat(cmd->pool, "Expected </",
                                         directive + 1, "> but saw ",
                                         cmd_name, ">", NULL);
                   }
  @@ -1191,14 +1191,14 @@
   }
   
   static const char *execute_now(char *cmd_line, const char *args, cmd_parms *parms, 
  -                         ap_pool_t *p, ap_pool_t *ptemp, 
  +                         apr_pool_t *p, apr_pool_t *ptemp, 
                            ap_directive_t **sub_tree, ap_directive_t *parent)
   {
       module *mod = top_module;
       const command_rec *cmd;
   
       if (!(cmd = ap_find_command_in_modules(cmd_line, &mod))) {
  -        return ap_pstrcat(parms->pool, "Invalid command '", 
  +        return apr_pstrcat(parms->pool, "Invalid command '", 
                             cmd_line,
                             "', perhaps mis-spelled or defined by a module "
                             "not included in the server configuration",
  @@ -1217,10 +1217,10 @@
   /* Structure to be passed to cfg_open_custom(): it contains an
    * index which is incremented from 0 to nelts on each call to
    * cfg_getline() (which in turn calls arr_elts_getstr())
  - * and an ap_array_header_t pointer for the string array.
  + * and an apr_array_header_t pointer for the string array.
    */
   typedef struct {
  -    ap_array_header_t *array;
  +    apr_array_header_t *array;
       int curr_idx;
   } arr_elts_param_t;
   
  @@ -1235,7 +1235,7 @@
           return NULL;
   
       /* return the line */
  -    ap_cpystrn(buf, ((char **) arr_param->array->elts)[arr_param->curr_idx - 1], bufsiz);
  +    apr_cpystrn(buf, ((char **) arr_param->array->elts)[arr_param->curr_idx - 1], bufsiz);
   
       return buf;
   }
  @@ -1249,9 +1249,9 @@
       return 0;
   }
   
  -static void process_command_config(server_rec *s, ap_array_header_t *arr, 
  -                              ap_directive_t **conftree, ap_pool_t *p,
  -			      ap_pool_t *ptemp)
  +static void process_command_config(server_rec *s, apr_array_header_t *arr, 
  +                              ap_directive_t **conftree, apr_pool_t *p,
  +			      apr_pool_t *ptemp)
   {
       const char *errmsg;
       cmd_parms parms;
  @@ -1282,11 +1282,11 @@
   }
   
   void ap_process_resource_config(server_rec *s, const char *fname, 
  -                                ap_directive_t **conftree, ap_pool_t *p, 
  -                                ap_pool_t *ptemp)
  +                                ap_directive_t **conftree, apr_pool_t *p, 
  +                                apr_pool_t *ptemp)
   {
       cmd_parms parms;
  -    ap_finfo_t finfo;
  +    apr_finfo_t finfo;
       const char *errmsg;
       configfile_t *cfp;
   
  @@ -1295,7 +1295,7 @@
       /* don't require conf/httpd.conf if we have a -C or -c switch */
       if((ap_server_pre_read_config->nelts || ap_server_post_read_config->nelts) &&
          !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {
  -	if (ap_stat(&finfo, fname, p) != APR_SUCCESS)     
  +	if (apr_stat(&finfo, fname, p) != APR_SUCCESS)     
   	    return;
       }
   
  @@ -1332,7 +1332,7 @@
   }
   
   API_EXPORT(void)ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
  -                                       ap_pool_t *p, ap_pool_t *ptemp)
  +                                       apr_pool_t *p, apr_pool_t *ptemp)
   {
       const char *errmsg;
       cmd_parms parms;
  @@ -1364,7 +1364,7 @@
       const struct htaccess_result *cache;
       struct htaccess_result *new;
       void *dc = NULL;
  -    ap_status_t status;
  +    apr_status_t status;
   
   /* firstly, search cache */
       for (cache = r->htaccess; cache != NULL; cache = cache->next)
  @@ -1379,7 +1379,7 @@
       parms.pool = r->pool;
       parms.temp_pool = r->pool;
       parms.server = r->server;
  -    parms.path = ap_pstrdup(r->pool, d);
  +    parms.path = apr_pstrdup(r->pool, d);
   
       /* loop through the access names and find the first one */
   
  @@ -1409,14 +1409,14 @@
               *result = dc;
               break;
           } else {
  -	    ap_status_t cerr = ap_canonical_error(status);
  +	    apr_status_t cerr = apr_canonical_error(status);
   
   	    if (cerr != APR_ENOENT && cerr != APR_ENOTDIR) {
   		ap_log_rerror(APLOG_MARK, APLOG_CRIT, status, r,
   			      "%s pcfg_openfile: unable to check htaccess file, "
   			      "ensure it is readable",
   			      filename);
  -		ap_table_setn(r->notes, "error-notes",
  +		apr_table_setn(r->notes, "error-notes",
   			      "Server unable to read htaccess file, denying "
   			      "access to be safe");
   		return HTTP_FORBIDDEN;
  @@ -1425,7 +1425,7 @@
       }
   
   /* cache it */
  -    new = ap_palloc(r->pool, sizeof(struct htaccess_result));
  +    new = apr_palloc(r->pool, sizeof(struct htaccess_result));
       new->dir = parms.path;
       new->override = override;
       new->htaccess = dc;
  @@ -1437,10 +1437,10 @@
   }
   
   
  -CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostname,
  +CORE_EXPORT(const char *) ap_init_virtual_host(apr_pool_t *p, const char *hostname,
   			      server_rec *main_server, server_rec **ps)
   {
  -    server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
  +    server_rec *s = (server_rec *) apr_pcalloc(p, sizeof(server_rec));
   
       /* TODO: this crap belongs in http_core */
       s->process = main_server->process;
  @@ -1458,8 +1458,8 @@
       s->next = NULL;
   
       s->is_virtual = 1;
  -    s->names = ap_make_array(p, 4, sizeof(char **));
  -    s->wild_names = ap_make_array(p, 4, sizeof(char **));
  +    s->names = apr_make_array(p, 4, sizeof(char **));
  +    s->wild_names = apr_make_array(p, 4, sizeof(char **));
   
       s->module_config = create_empty_config(p);
       s->lookup_defaults = ap_create_per_dir_config(p);
  @@ -1479,7 +1479,7 @@
   }
   
   
  -API_EXPORT(void) ap_fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server)
  +API_EXPORT(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
   {
       server_rec *virt;
   
  @@ -1518,17 +1518,17 @@
    * Getting *everything* configured... 
    */
   
  -static void init_config_globals(ap_pool_t *p)
  +static void init_config_globals(apr_pool_t *p)
   {
       /* Global virtual host hash bucket pointers.  Init to null. */
       ap_init_vhost_config(p);
   }
   
  -static server_rec *init_server_config(process_rec *process, ap_pool_t *p)
  +static server_rec *init_server_config(process_rec *process, apr_pool_t *p)
   {
  -    server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
  +    server_rec *s = (server_rec *) apr_pcalloc(p, sizeof(server_rec));
   
  -    ap_open_stderr(&s->error_log, p);
  +    apr_open_stderr(&s->error_log, p);
       s->process = process;
       s->port = 0;
       s->server_admin = DEFAULT_ADMIN;
  @@ -1543,7 +1543,7 @@
       s->keep_alive_max = DEFAULT_KEEPALIVE;
       s->keep_alive = 1;
       s->next = NULL;
  -    s->addrs = ap_pcalloc(p, sizeof(server_addr_rec));
  +    s->addrs = apr_pcalloc(p, sizeof(server_addr_rec));
       /* NOT virtual host; don't match any real network interface */
       s->addrs->host_addr.s_addr = htonl(INADDR_ANY);
       s->addrs->host_port = 0;	/* matches any port */
  @@ -1557,11 +1557,11 @@
   }
   
   
  -API_EXPORT(server_rec*) ap_read_config(process_rec *process, ap_pool_t *ptemp,
  +API_EXPORT(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp,
                                          const char *confname, 
                                          ap_directive_t **conftree)
   {
  -    ap_pool_t *p = process->pconf;
  +    apr_pool_t *p = process->pconf;
       server_rec *s = init_server_config(process, p);
   
       init_config_globals(p);
  @@ -1579,7 +1579,7 @@
       return s;
   }
   
  -void ap_single_module_configure(ap_pool_t *p, server_rec *s, module *m)
  +void ap_single_module_configure(apr_pool_t *p, server_rec *s, module *m)
   {
       if (m->create_server_config)
           ap_set_module_config(s->module_config, m,
  @@ -1598,13 +1598,13 @@
               (*m->rewrite_args) (process);
   }
   
  -API_EXPORT(void) ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
  +API_EXPORT(void) ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
   {
       ap_run_post_config(pconf,plog,ptemp,s); 
       init_handlers(pconf);
   }
   
  -void ap_child_init_hook(ap_pool_t *pchild, server_rec *s)
  +void ap_child_init_hook(apr_pool_t *pchild, server_rec *s)
   {
       /* TODO: uh this seems ugly, is there a better way? */
       /*ap_child_init_alloc();    PUT THIS BACK IN XXXXX */
  
  
  
  1.44      +15 -15    apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- http_connection.c	2000/07/21 19:50:46	1.43
  +++ http_connection.c	2000/08/02 05:26:47	1.44
  @@ -143,9 +143,9 @@
   void ap_lingering_close(conn_rec *c)
   {
       char dummybuf[512];
  -    ap_time_t start;
  -    ap_ssize_t nbytes;
  -    ap_status_t rc;
  +    apr_time_t start;
  +    apr_ssize_t nbytes;
  +    apr_status_t rc;
       int timeout;
   
   #ifdef NO_LINGCLOSE
  @@ -184,7 +184,7 @@
        * from peer) or we've exceeded our overall timeout.
        */
       
  -    start = ap_now();
  +    start = apr_now();
       timeout = MAX_SECS_TO_LINGER;
       for (;;) {
           ap_bsetopt(c->client, BO_TIMEOUT, &timeout);
  @@ -193,7 +193,7 @@
           if (rc != APR_SUCCESS || nbytes == 0) break;
   
           /* how much time has elapsed? */
  -        timeout = (int)((ap_now() - start) / AP_USEC_PER_SEC);
  +        timeout = (int)((apr_now() - start) / AP_USEC_PER_SEC);
           if (timeout >= MAX_SECS_TO_LINGER) break;
   
           /* figure out the new timeout */
  @@ -235,7 +235,7 @@
   	    break;
   
           ap_update_connection_status(c->id, "Status", "Keepalive");
  -	ap_destroy_pool(r->pool);
  +	apr_destroy_pool(r->pool);
   
   	if (ap_graceful_stop_signalled())
               break;
  @@ -249,28 +249,28 @@
      structure, but for now...
   */
   
  -conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  +conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, BUFF *inout,
   			    const struct sockaddr_in *remaddr,
   			    const struct sockaddr_in *saddr, long id)
   {
  -    conn_rec *conn = (conn_rec *) ap_pcalloc(p, sizeof(conn_rec));
  +    conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));
   
       /* Got a connection structure, so initialize what fields we can
        * (the rest are zeroed out by pcalloc).
        */
   
       conn->conn_config=ap_create_conn_config(p);
  -    conn->notes = ap_make_table(p, 5);
  +    conn->notes = apr_make_table(p, 5);
   
       conn->pool = p;
       conn->local_addr = *saddr;
  -    conn->local_ip = ap_pstrdup(conn->pool,
  +    conn->local_ip = apr_pstrdup(conn->pool,
   				inet_ntoa(conn->local_addr.sin_addr));
       conn->base_server = server;
       conn->client = inout;
   
       conn->remote_addr = *remaddr;
  -    conn->remote_ip = ap_pstrdup(conn->pool,
  +    conn->remote_ip = apr_pstrdup(conn->pool,
   			      inet_ntoa(conn->remote_addr.sin_addr));
       
       conn->id = id;
  @@ -280,12 +280,12 @@
   
   
   
  -conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  -                                ap_socket_t *conn_socket, long id)
  +conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, BUFF *inout,
  +                                apr_socket_t *conn_socket, long id)
   {
       struct sockaddr_in *sa_local, *sa_remote;
   
  -    ap_get_local_name(&sa_local, conn_socket);
  -    ap_get_remote_name(&sa_remote, conn_socket);
  +    apr_get_local_name(&sa_local, conn_socket);
  +    apr_get_remote_name(&sa_remote, conn_socket);
       return ap_new_connection(p, server, inout, sa_remote, sa_local, id);
   }
  
  
  
  1.94      +119 -119  apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- http_core.c	2000/07/29 19:50:08	1.93
  +++ http_core.c	2000/08/02 05:26:47	1.94
  @@ -129,21 +129,21 @@
    * the http_conf_globals.
    */
   
  -static void *create_core_dir_config(ap_pool_t *a, char *dir)
  +static void *create_core_dir_config(apr_pool_t *a, char *dir)
   {
       core_dir_config *conf;
   
  -    conf = (core_dir_config *)ap_pcalloc(a, sizeof(core_dir_config));
  +    conf = (core_dir_config *)apr_pcalloc(a, sizeof(core_dir_config));
       if (!dir || dir[strlen(dir) - 1] == '/') {
           conf->d = dir;
       }
       else if (strncmp(dir, "proxy:", 6) == 0) {
  -        conf->d = ap_pstrdup(a, dir);
  +        conf->d = apr_pstrdup(a, dir);
       }
       else {
  -        conf->d = ap_pstrcat(a, dir, "/", NULL);
  +        conf->d = apr_pstrcat(a, dir, "/", NULL);
       }
  -    conf->d_is_fnmatch = conf->d ? (ap_is_fnmatch(conf->d) != 0) : 0;
  +    conf->d_is_fnmatch = conf->d ? (apr_is_fnmatch(conf->d) != 0) : 0;
       conf->d_components = conf->d ? ap_count_dirs(conf->d) : 0;
   
       conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL;
  @@ -170,7 +170,7 @@
   
       conf->limit_req_body = 0;
       conf->limit_xml_body = AP_LIMIT_UNSET;
  -    conf->sec = ap_make_array(a, 2, sizeof(void *));
  +    conf->sec = apr_make_array(a, 2, sizeof(void *));
   #ifdef WIN32
       conf->script_interpreter_source = INTERPRETER_SOURCE_UNSET;
   #endif
  @@ -183,18 +183,18 @@
       return (void *)conf;
   }
   
  -static void *merge_core_dir_configs(ap_pool_t *a, void *basev, void *newv)
  +static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
   {
       core_dir_config *base = (core_dir_config *)basev;
       core_dir_config *new = (core_dir_config *)newv;
       core_dir_config *conf;
       int i;
     
  -    conf = (core_dir_config *)ap_palloc(a, sizeof(core_dir_config));
  +    conf = (core_dir_config *)apr_palloc(a, sizeof(core_dir_config));
       memcpy((char *)conf, (const char *)base, sizeof(core_dir_config));
       if (base->response_code_strings) {
   	conf->response_code_strings =
  -	    ap_palloc(a, sizeof(*conf->response_code_strings)
  +	    apr_palloc(a, sizeof(*conf->response_code_strings)
   		      * RESPONSE_CODES);
   	memcpy(conf->response_code_strings, base->response_code_strings,
   	       sizeof(*conf->response_code_strings) * RESPONSE_CODES);
  @@ -245,7 +245,7 @@
   
       if (new->response_code_strings) {
   	if (conf->response_code_strings == NULL) {
  -	    conf->response_code_strings = ap_palloc(a,
  +	    conf->response_code_strings = apr_palloc(a,
   		sizeof(*conf->response_code_strings) * RESPONSE_CODES);
   	    memcpy(conf->response_code_strings, new->response_code_strings,
   		   sizeof(*conf->response_code_strings) * RESPONSE_CODES);
  @@ -297,7 +297,7 @@
       else
           conf->limit_xml_body = base->limit_xml_body;
   
  -    conf->sec = ap_append_arrays(a, base->sec, new->sec);
  +    conf->sec = apr_append_arrays(a, base->sec, new->sec);
   
       if (new->satisfy != SATISFY_NOSPEC) {
           conf->satisfy = new->satisfy;
  @@ -324,30 +324,30 @@
       return (void*)conf;
   }
   
  -static void *create_core_server_config(ap_pool_t *a, server_rec *s)
  +static void *create_core_server_config(apr_pool_t *a, server_rec *s)
   {
       core_server_config *conf;
       int is_virtual = s->is_virtual;
     
  -    conf = (core_server_config *)ap_pcalloc(a, sizeof(core_server_config));
  +    conf = (core_server_config *)apr_pcalloc(a, sizeof(core_server_config));
   #ifdef GPROF
       conf->gprof_dir = NULL;
   #endif
       conf->access_name = is_virtual ? NULL : DEFAULT_ACCESS_FNAME;
       conf->ap_document_root = is_virtual ? NULL : DOCUMENT_LOCATION;
  -    conf->sec = ap_make_array(a, 40, sizeof(void *));
  -    conf->sec_url = ap_make_array(a, 40, sizeof(void *));
  +    conf->sec = apr_make_array(a, 40, sizeof(void *));
  +    conf->sec_url = apr_make_array(a, 40, sizeof(void *));
       
       return (void *)conf;
   }
   
  -static void *merge_core_server_configs(ap_pool_t *p, void *basev, void *virtv)
  +static void *merge_core_server_configs(apr_pool_t *p, void *basev, void *virtv)
   {
       core_server_config *base = (core_server_config *)basev;
       core_server_config *virt = (core_server_config *)virtv;
       core_server_config *conf;
   
  -    conf = (core_server_config *)ap_pcalloc(p, sizeof(core_server_config));
  +    conf = (core_server_config *)apr_pcalloc(p, sizeof(core_server_config));
       *conf = *virt;
       if (!conf->access_name) {
           conf->access_name = base->access_name;
  @@ -355,8 +355,8 @@
       if (!conf->ap_document_root) {
           conf->ap_document_root = base->ap_document_root;
       }
  -    conf->sec = ap_append_arrays(p, base->sec, virt->sec);
  -    conf->sec_url = ap_append_arrays(p, base->sec_url, virt->sec_url);
  +    conf->sec = apr_append_arrays(p, base->sec, virt->sec);
  +    conf->sec_url = apr_append_arrays(p, base->sec_url, virt->sec_url);
   
       return conf;
   }
  @@ -369,7 +369,7 @@
   {
       core_server_config *sconf = ap_get_module_config(s->module_config,
   						     &core_module);
  -    void **new_space = (void **)ap_push_array(sconf->sec);
  +    void **new_space = (void **)apr_push_array(sconf->sec);
       
       *new_space = dir_config;
   }
  @@ -378,14 +378,14 @@
   {
       core_server_config *sconf = ap_get_module_config(s->module_config,
   						     &core_module);
  -    void **new_space = (void **)ap_push_array(sconf->sec_url);
  +    void **new_space = (void **)apr_push_array(sconf->sec_url);
       
       *new_space = url_config;
   }
   
   CORE_EXPORT(void) ap_add_file_conf(core_dir_config *conf, void *url_config)
   {
  -    void **new_space = (void **)ap_push_array(conf->sec);
  +    void **new_space = (void **)apr_push_array(conf->sec);
       
       *new_space = url_config;
   }
  @@ -449,15 +449,15 @@
       return a->orig_index - b->orig_index;
   }
   
  -void ap_core_reorder_directories(ap_pool_t *p, server_rec *s)
  +void ap_core_reorder_directories(apr_pool_t *p, server_rec *s)
   {
       core_server_config *sconf;
  -    ap_array_header_t *sec;
  +    apr_array_header_t *sec;
       struct reorder_sort_rec *sortbin;
       int nelts;
       void **elts;
       int i;
  -    ap_pool_t *tmp;
  +    apr_pool_t *tmp;
   
       sconf = ap_get_module_config(s->module_config, &core_module);
       sec = sconf->sec;
  @@ -465,8 +465,8 @@
       elts = (void **)sec->elts;
   
       /* we have to allocate tmp space to do a stable sort */
  -    ap_create_pool(&tmp, p);
  -    sortbin = ap_palloc(tmp, sec->nelts * sizeof(*sortbin));
  +    apr_create_pool(&tmp, p);
  +    sortbin = apr_palloc(tmp, sec->nelts * sizeof(*sortbin));
       for (i = 0; i < nelts; ++i) {
   	sortbin[i].orig_index = i;
   	sortbin[i].elt = elts[i];
  @@ -479,7 +479,7 @@
         elts[i] = sortbin[i].elt;
       }
   
  -    ap_destroy_pool(tmp);
  +    apr_destroy_pool(tmp);
   }
   
   /*****************************************************************
  @@ -545,7 +545,7 @@
       return conf->ap_document_root;
   }
   
  -API_EXPORT(const ap_array_header_t *) ap_requires(request_rec *r)
  +API_EXPORT(const apr_array_header_t *) ap_requires(request_rec *r)
   {
       core_dir_config *conf;
   
  @@ -640,7 +640,7 @@
   	iaddr = &(conn->remote_addr.sin_addr);
   	hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), AF_INET);
   	if (hptr != NULL) {
  -	    conn->remote_host = ap_pstrdup(conn->pool, (void *)hptr->h_name);
  +	    conn->remote_host = apr_pstrdup(conn->pool, (void *)hptr->h_name);
   	    ap_str_tolower(conn->remote_host);
   	   
   	    if (hostname_lookups == HOSTNAME_LOOKUP_DOUBLE) {
  @@ -732,12 +732,12 @@
   	    hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr),
   				 AF_INET);
   	    if (hptr != NULL) {
  -	        conn->local_host = ap_pstrdup(conn->pool,
  +	        conn->local_host = apr_pstrdup(conn->pool,
   					      (void *)hptr->h_name);
   		ap_str_tolower(conn->local_host);
   	    }
   	    else {
  -	        conn->local_host = ap_pstrdup(conn->pool,
  +	        conn->local_host = apr_pstrdup(conn->pool,
   					      r->server->server_hostname);
   	    }
   	}
  @@ -764,16 +764,16 @@
       return port;
   }
   
  -API_EXPORT(char *) ap_construct_url(ap_pool_t *p, const char *uri,
  +API_EXPORT(char *) ap_construct_url(apr_pool_t *p, const char *uri,
   				    request_rec *r)
   {
       unsigned port = ap_get_server_port(r);
       const char *host = ap_get_server_name(r);
   
       if (ap_is_default_port(port, r)) {
  -	return ap_pstrcat(p, ap_http_method(r), "://", host, uri, NULL);
  +	return apr_pstrcat(p, ap_http_method(r), "://", host, uri, NULL);
       }
  -    return ap_psprintf(p, "%s://%s:%u%s", ap_http_method(r), host, port, uri);
  +    return apr_psprintf(p, "%s://%s:%u%s", ap_http_method(r), host, port, uri);
   }
   
   API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r)
  @@ -785,7 +785,7 @@
   }
   
   #ifdef WIN32
  -static DWORD get_win32_registry_default_value(ap_pool_t *p, HKEY hkey, 
  +static DWORD get_win32_registry_default_value(apr_pool_t *p, HKEY hkey, 
                                                 char* relativepath, char **value)
   {
       HKEY hkeyOpen;
  @@ -805,7 +805,7 @@
               result = ERROR_INVALID_PARAMETER;
           }
           else {
  -            *value = ap_palloc(p, size);
  +            *value = apr_palloc(p, size);
               /* Read value based on size query above */
               result = RegQueryValueEx(hkeyOpen, "", 0, &type, *value, &size);
           }
  @@ -820,7 +820,7 @@
           char *tmp = *value;
           size = ExpandEnvironmentStrings(tmp, *value, 0);
           if (size) {
  -            *value = ap_palloc(p, size);
  +            *value = apr_palloc(p, size);
               size = ExpandEnvironmentStrings(tmp, *value, size);
           }
       }
  @@ -829,7 +829,7 @@
       return result;
   }
   
  -static char* get_interpreter_from_win32_registry(ap_pool_t *p, const char* ext,
  +static char* get_interpreter_from_win32_registry(apr_pool_t *p, const char* ext,
                                                    char** arguments, int strict)
   {
       char execcgi_path[] = "SHELL\\EXECCGI\\COMMAND";
  @@ -981,7 +981,7 @@
       {
           char *comspec = getenv("COMSPEC");
           if (comspec) {
  -            *interpreter = ap_pstrcat(r->pool, "\"", comspec, "\" /c ", NULL);
  +            *interpreter = apr_pstrcat(r->pool, "\"", comspec, "\" /c ", NULL);
               return eFileTypeSCRIPT;
           }
           ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r->server,
  @@ -1048,7 +1048,7 @@
           buffer[i] = '\0';
           for (i = 2; buffer[i] == ' ' ; ++i)
               ;
  -        *interpreter = ap_pstrdup(r->pool, buffer + i ); 
  +        *interpreter = apr_pstrdup(r->pool, buffer + i ); 
       }
       else {
           /* Not a script, is it an executable? */
  @@ -1096,18 +1096,18 @@
       const ap_directive_t *found;
   
       if ((forbidden & NOT_IN_VIRTUALHOST) && cmd->server->is_virtual) {
  -	return ap_pstrcat(cmd->pool, cmd->cmd->name, gt,
  +	return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
   			  " cannot occur within <VirtualHost> section", NULL);
       }
   
       if ((forbidden & NOT_IN_LIMIT) && cmd->limited != -1) {
  -	return ap_pstrcat(cmd->pool, cmd->cmd->name, gt,
  +	return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
   			  " cannot occur within <Limit> section", NULL);
       }
   
       if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE
   	&& cmd->path != NULL) {
  -	return ap_pstrcat(cmd->pool, cmd->cmd->name, gt,
  +	return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
   			  " cannot occur within <Directory/Location/Files> "
   			  "section", NULL);
       }
  @@ -1121,7 +1121,7 @@
   	|| ((forbidden & NOT_IN_FILES)
   	    && ((found = find_parent(cmd->directive, "<Files"))
   		|| (found = find_parent(cmd->directive, "<FilesMatch"))))) {
  -	return ap_pstrcat(cmd->pool, cmd->cmd->name, gt,
  +	return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
   			  " cannot occur within ", found->directive,
   			  "> section", NULL);
       }
  @@ -1141,7 +1141,7 @@
           return err;
       }
   
  -    conf->access_name = ap_pstrdup(cmd->pool, arg);
  +    conf->access_name = apr_pstrdup(cmd->pool, arg);
       return NULL;
   }
   
  @@ -1157,7 +1157,7 @@
           return err;
       }
   
  -    conf->gprof_dir = ap_pstrdup(cmd->pool, arg);
  +    conf->gprof_dir = apr_pstrdup(cmd->pool, arg);
       return NULL;
   }
   #endif /*GPROF*/
  @@ -1221,7 +1221,7 @@
   
       if(conf->response_code_strings == NULL) {
           conf->response_code_strings = 
  -	    ap_pcalloc(r->pool,
  +	    apr_pcalloc(r->pool,
   		    sizeof(*conf->response_code_strings) * 
   		    RESPONSE_CODES);
       }
  @@ -1230,7 +1230,7 @@
   
       conf->response_code_strings[idx] = 
          ((ap_is_url(string) || (*string == '/')) && (*string != '"')) ? 
  -       ap_pstrdup(r->pool, string) : ap_pstrcat(r->pool, "\"", string, NULL);
  +       apr_pstrdup(r->pool, string) : apr_pstrcat(r->pool, "\"", string, NULL);
   }
   
   static const char *set_error_document(cmd_parms *cmd, void *conf_,
  @@ -1255,7 +1255,7 @@
           index_number = idx500;
       }
       else if ((index_number = ap_index_of_response(error_number)) == idx500) {
  -        return ap_pstrcat(cmd->pool, "Unsupported HTTP response code ",
  +        return apr_pstrcat(cmd->pool, "Unsupported HTTP response code ",
   			  errno_str, NULL);
       }
   
  @@ -1279,7 +1279,7 @@
       else { /* Store it... */
       	if (conf->response_code_strings == NULL) {
   	    conf->response_code_strings =
  -		ap_pcalloc(cmd->pool,
  +		apr_pcalloc(cmd->pool,
   			   sizeof(*conf->response_code_strings) * RESPONSE_CODES);
           }
   	/* hack. Prefix a " if it is a msg; as that is what
  @@ -1287,8 +1287,8 @@
   	 * a msg and a (local) path.
   	 */
           conf->response_code_strings[index_number] = (what == MSG) ?
  -		ap_pstrcat(cmd->pool, "\"",msg,NULL) :
  -		ap_pstrdup(cmd->pool, msg);
  +		apr_pstrcat(cmd->pool, "\"",msg,NULL) :
  +		apr_pstrdup(cmd->pool, msg);
       }   
   
       return NULL;
  @@ -1329,7 +1329,7 @@
   	    d->override = OR_ALL;
   	}
   	else {
  -	    return ap_pstrcat(cmd->pool, "Illegal override option ", w, NULL);
  +	    return apr_pstrcat(cmd->pool, "Illegal override option ", w, NULL);
   	}
   	d->override &= ~OR_UNSET;
       }
  @@ -1387,7 +1387,7 @@
   	    opt = OPT_ALL;
   	}
   	else {
  -	    return ap_pstrcat(cmd->pool, "Illegal option ", w, NULL);
  +	    return apr_pstrcat(cmd->pool, "Illegal option ", w, NULL);
   	}
   
   	/* we ensure the invariant (d->opts_add & d->opts_remove) == 0 */
  @@ -1431,10 +1431,10 @@
       core_dir_config *c=c_;
   
       if (!c->ap_requires) {
  -        c->ap_requires = ap_make_array(cmd->pool, 2, sizeof(require_line));
  +        c->ap_requires = apr_make_array(cmd->pool, 2, sizeof(require_line));
       }
  -    r = (require_line *)ap_push_array(c->ap_requires);
  -    r->requirement = ap_pstrdup(cmd->pool, arg);
  +    r = (require_line *)apr_push_array(c->ap_requires);
  +    r->requirement = apr_pstrdup(cmd->pool, arg);
       r->method_mask = cmd->limited;
       return NULL;
   }
  @@ -1460,7 +1460,7 @@
               return "TRACE cannot be controlled by <Limit>";
           }
           else if (methnum == M_INVALID) {
  -            return ap_pstrcat(cmd->pool, "unknown method \"", method,
  +            return apr_pstrcat(cmd->pool, "unknown method \"", method,
                                 "\" in <Limit", tog ? "Except>" : ">", NULL);
           }
           else {
  @@ -1495,7 +1495,7 @@
    */
   static char *unclosed_directive(cmd_parms *cmd)
   {
  -    return ap_pstrcat(cmd->pool, cmd->cmd->name,
  +    return apr_pstrcat(cmd->pool, cmd->cmd->name,
   		      "> directive missing closing '>'", NULL);
   }
   
  @@ -1520,7 +1520,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
   
       cmd->path = ap_getword_conf(cmd->pool, &arg);
       cmd->override = OR_ALL|ACCESS_CONF;
  @@ -1550,7 +1550,7 @@
       ap_add_per_dir_conf(cmd->server, new_dir_conf);
   
       if (*arg != '\0') {
  -	return ap_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
  +	return apr_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
   			  "> arguments not (yet) supported.", NULL);
       }
   
  @@ -1582,7 +1582,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
   
       cmd->path = ap_getword_conf(cmd->pool, &arg);
       cmd->override = OR_ALL|ACCESS_CONF;
  @@ -1603,14 +1603,14 @@
       if (errmsg != NULL)
   	return errmsg;
   
  -    conf->d = ap_pstrdup(cmd->pool, cmd->path);	/* No mangling, please */
  -    conf->d_is_fnmatch = ap_is_fnmatch(conf->d) != 0;
  +    conf->d = apr_pstrdup(cmd->pool, cmd->path);	/* No mangling, please */
  +    conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
       conf->r = r;
   
       ap_add_per_url_conf(cmd->server, new_url_conf);
       
       if (*arg != '\0') {
  -	return ap_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
  +	return apr_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
   			  "> arguments not (yet) supported.", NULL);
       }
   
  @@ -1642,7 +1642,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
   
       cmd->path = ap_getword_conf(cmd->pool, &arg);
       /* Only if not an .htaccess file */
  @@ -1671,13 +1671,13 @@
   	return errmsg;
   
       conf->d = cmd->path;
  -    conf->d_is_fnmatch = ap_is_fnmatch(conf->d) != 0;
  +    conf->d_is_fnmatch = apr_is_fnmatch(conf->d) != 0;
       conf->r = r;
   
       ap_add_file_conf(c, new_file_conf);
   
       if (*arg != '\0') {
  -	return ap_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
  +	return apr_pstrcat(cmd->pool, "Multiple ", thiscmd->name,
   			  "> arguments not (yet) supported.", NULL);
       }
   
  @@ -1697,7 +1697,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
   
       if (not) {
           arg++;
  @@ -1746,7 +1746,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
   
       if (arg[0] == '!') {
           not = 1;
  @@ -1778,7 +1778,7 @@
       server_rec *main_server = cmd->server, *s;
       const char *errmsg;
       const char *endp = ap_strrchr_c(arg, '>');
  -    ap_pool_t *p = cmd->pool;
  +    apr_pool_t *p = cmd->pool;
   
       const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
       if (err != NULL) {
  @@ -1789,7 +1789,7 @@
   	return unclosed_directive(cmd);
       }
   
  -    arg=ap_pstrndup(cmd->pool, arg, endp-arg);
  +    arg=apr_pstrndup(cmd->pool, arg, endp-arg);
       
       /* FIXME: There's another feature waiting to happen here -- since you
   	can now put multiple addresses/names on a single <VirtualHost>
  @@ -1830,10 +1830,10 @@
       while (*arg) {
   	char **item, *name = ap_getword_conf(cmd->pool, &arg);
   	if (ap_is_matchexp(name)) {
  -	    item = (char **)ap_push_array(cmd->server->wild_names);
  +	    item = (char **)apr_push_array(cmd->server->wild_names);
   	}
   	else {
  -	    item = (char **)ap_push_array(cmd->server->names);
  +	    item = (char **)apr_push_array(cmd->server->names);
   	}
   	*item = name;
       }
  @@ -1849,7 +1849,7 @@
       }
   
       if (!ap_add_named_module(arg)) {
  -	return ap_pstrcat(cmd->pool, "Cannot add module via name '", arg, 
  +	return apr_pstrcat(cmd->pool, "Cannot add module via name '", arg, 
   			  "': not in list of loaded modules", NULL);
       }
       *(ap_directive_t **)dummy = NULL;
  @@ -1896,7 +1896,7 @@
       }
       port = atoi(arg);
       if (port <= 0 || port >= 65536) { /* 65536 == 1<<16 */
  -	return ap_pstrcat(cmd->temp_pool, "The port number \"", arg, 
  +	return apr_pstrcat(cmd->temp_pool, "The port number \"", arg, 
   			  "\" is outside the appropriate range "
   			  "(i.e., 1..65535).", NULL);
       }
  @@ -2160,16 +2160,16 @@
   	return "";
       }
   
  -    ap_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
  +    apr_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
   
       if (conf->server_signature == srv_sig_withmail) {
  -	return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
  +	return apr_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
   			  " Server at <A HREF=\"mailto:",
   			  r->server->server_admin, "\">",
   			  ap_get_server_name(r), "</A> Port ", sport,
   			  "</ADDRESS>\n", NULL);
       }
  -    return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
  +    return apr_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
   		      " Server at ", ap_get_server_name(r), " Port ", sport,
   		      "</ADDRESS>\n", NULL);
   }
  @@ -2218,7 +2218,7 @@
   };
   static enum server_token_type ap_server_tokens = SrvTk_FULL;
   
  -static ap_status_t reset_version(void *dummy)
  +static apr_status_t reset_version(void *dummy)
   {
       version_locked = 0;
       ap_server_tokens = SrvTk_FULL;
  @@ -2231,7 +2231,7 @@
       return (server_version ? server_version : AP_SERVER_BASEVERSION);
   }
   
  -API_EXPORT(void) ap_add_version_component(ap_pool_t *pconf, const char *component)
  +API_EXPORT(void) ap_add_version_component(apr_pool_t *pconf, const char *component)
   {
       if (! version_locked) {
           /*
  @@ -2240,16 +2240,16 @@
            * we are adding the original SERVER_BASEVERSION string.
            */
           if (server_version == NULL) {
  -            ap_register_cleanup(pconf, NULL, reset_version,
  -                                ap_null_cleanup);
  -            server_version = ap_pstrdup(pconf, component);
  +            apr_register_cleanup(pconf, NULL, reset_version,
  +                                apr_null_cleanup);
  +            server_version = apr_pstrdup(pconf, component);
           }
           else {
               /*
                * Tack the given component identifier to the end of
                * the existing string.
                */
  -            server_version = ap_pstrcat(pconf, server_version, " ",
  +            server_version = apr_pstrcat(pconf, server_version, " ",
                                           component, NULL);
           }
       }
  @@ -2259,7 +2259,7 @@
    * This routine adds the real server base identity to the version string,
    * and then locks out changes until the next reconfig.
    */
  -static void ap_set_version(ap_pool_t *pconf)
  +static void ap_set_version(apr_pool_t *pconf)
   {
       if (ap_server_tokens == SrvTk_PRODUCT_ONLY) {
           ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT);
  @@ -2314,11 +2314,11 @@
       }
       lim = atoi(arg);
       if (lim < 0) {
  -        return ap_pstrcat(cmd->temp_pool, "LimitRequestLine \"", arg, 
  +        return apr_pstrcat(cmd->temp_pool, "LimitRequestLine \"", arg, 
                             "\" must be a non-negative integer", NULL);
       }
       if (lim > DEFAULT_LIMIT_REQUEST_LINE) {
  -        return ap_psprintf(cmd->temp_pool, "LimitRequestLine \"%s\" "
  +        return apr_psprintf(cmd->temp_pool, "LimitRequestLine \"%s\" "
                              "must not exceed the precompiled maximum of %d",
                              arg, DEFAULT_LIMIT_REQUEST_LINE);
       }
  @@ -2338,12 +2338,12 @@
       }
       lim = atoi(arg);
       if (lim < 0) {
  -        return ap_pstrcat(cmd->temp_pool, "LimitRequestFieldsize \"", arg, 
  +        return apr_pstrcat(cmd->temp_pool, "LimitRequestFieldsize \"", arg, 
                             "\" must be a non-negative integer (0 = no limit)",
                             NULL);
       }
       if (lim > DEFAULT_LIMIT_REQUEST_FIELDSIZE) {
  -        return ap_psprintf(cmd->temp_pool, "LimitRequestFieldsize \"%s\" "
  +        return apr_psprintf(cmd->temp_pool, "LimitRequestFieldsize \"%s\" "
                             "must not exceed the precompiled maximum of %d",
                              arg, DEFAULT_LIMIT_REQUEST_FIELDSIZE);
       }
  @@ -2363,7 +2363,7 @@
       }
       lim = atoi(arg);
       if (lim < 0) {
  -        return ap_pstrcat(cmd->temp_pool, "LimitRequestFields \"", arg, 
  +        return apr_pstrcat(cmd->temp_pool, "LimitRequestFields \"", arg, 
                             "\" must be a non-negative integer (0 = no limit)",
                             NULL);
       }
  @@ -2680,7 +2680,7 @@
   	&& (r->server->path[r->server->pathlen - 1] == '/'
   	    || r->uri[r->server->pathlen] == '/'
   	    || r->uri[r->server->pathlen] == '\0')) {
  -        r->filename = ap_pstrcat(r->pool, conf->ap_document_root,
  +        r->filename = apr_pstrcat(r->pool, conf->ap_document_root,
   				 (r->uri + r->server->pathlen), NULL);
       }
       else {
  @@ -2691,11 +2691,11 @@
            */
           if ((conf->ap_document_root[strlen(conf->ap_document_root)-1] == '/')
   	    && (*(r->uri) == '/')) {
  -	    r->filename = ap_pstrcat(r->pool, conf->ap_document_root, r->uri+1,
  +	    r->filename = apr_pstrcat(r->pool, conf->ap_document_root, r->uri+1,
   				     NULL);
   	}
   	else {
  -	    r->filename = ap_pstrcat(r->pool, conf->ap_document_root, r->uri,
  +	    r->filename = apr_pstrcat(r->pool, conf->ap_document_root, r->uri,
   				     NULL);
   	}
       }
  @@ -2718,10 +2718,10 @@
       core_dir_config *d =
   	    (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
       int rangestatus, errstatus;
  -    ap_file_t *fd = NULL;
  -    ap_status_t status;
  +    apr_file_t *fd = NULL;
  +    apr_status_t status;
   #ifdef USE_MMAP_FILES
  -    ap_mmap_t *mm = NULL;
  +    apr_mmap_t *mm = NULL;
   #endif
   
       /* This handler has no use for a request body (yet), but we still
  @@ -2747,7 +2747,7 @@
       if (r->finfo.protection == 0 || (r->path_info && *r->path_info)) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,
   		      "File does not exist: %s",r->path_info ?
  -		      ap_pstrcat(r->pool, r->filename, r->path_info, NULL)
  +		      apr_pstrcat(r->pool, r->filename, r->path_info, NULL)
   		      : r->filename);
   	return HTTP_NOT_FOUND;
       }
  @@ -2755,7 +2755,7 @@
           return HTTP_METHOD_NOT_ALLOWED;
       }
   	
  -    if ((status = ap_open(&fd, r->filename, APR_READ | APR_BINARY, 0, r->pool)) != APR_SUCCESS) {
  +    if ((status = apr_open(&fd, r->filename, APR_READ | APR_BINARY, 0, r->pool)) != APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
   		     "file permissions deny server access: %s", r->filename);
           return HTTP_FORBIDDEN;
  @@ -2763,10 +2763,10 @@
       ap_update_mtime(r, r->finfo.mtime);
       ap_set_last_modified(r);
       ap_set_etag(r);
  -    ap_table_setn(r->headers_out, "Accept-Ranges", "bytes");
  +    apr_table_setn(r->headers_out, "Accept-Ranges", "bytes");
       if (((errstatus = ap_meets_conditions(r)) != OK)
   	|| (errstatus = ap_set_content_length(r, r->finfo.size))) {
  -        ap_close(fd);
  +        apr_close(fd);
           return errstatus;
       }
   
  @@ -2788,8 +2788,8 @@
   	&& (!r->header_only || (d->content_md5 & 1))) {
   	/* we need to protect ourselves in case we die while we've got the
    	 * file mmapped */
  -        ap_status_t status;
  -        if ((status = ap_mmap_create(&mm, fd, 0, r->finfo.size, r->pool)) != APR_SUCCESS) {
  +        apr_status_t status;
  +        if ((status = apr_mmap_create(&mm, fd, 0, r->finfo.size, r->pool)) != APR_SUCCESS) {
   	    ap_log_rerror(APLOG_MARK, APLOG_CRIT, status, r,
   			 "default_handler: mmap failed: %s", r->filename);
   	    mm = NULL;
  @@ -2804,13 +2804,13 @@
   
   #ifdef APACHE_XLATE
   	if (d->content_md5 & 1) {
  -	    ap_table_setn(r->headers_out, "Content-MD5",
  +	    apr_table_setn(r->headers_out, "Content-MD5",
   			  ap_md5digest(r->pool, fd,
                                          r->rrx->to_net));
   	}
   #else
   	if (d->content_md5 & 1) {
  -	    ap_table_setn(r->headers_out, "Content-MD5",
  +	    apr_table_setn(r->headers_out, "Content-MD5",
   			  ap_md5digest(r->pool, fd));
   	}
   #endif /* APACHE_XLATE */
  @@ -2820,9 +2820,9 @@
   	ap_send_http_header(r);
   	
   	if (!r->header_only) {
  -            ap_size_t length = r->finfo.size;
  -            ap_off_t  offset = 0;
  -            ap_size_t nbytes = 0;
  +            apr_size_t length = r->finfo.size;
  +            apr_off_t  offset = 0;
  +            apr_size_t nbytes = 0;
   
   	    if (!rangestatus) {
   		ap_send_fd(fd, r, offset, length, &nbytes);
  @@ -2842,19 +2842,19 @@
       }
       else {
   	unsigned char *addr;
  -        ap_mmap_offset((void**)&addr, mm ,0);
  +        apr_mmap_offset((void**)&addr, mm ,0);
   
   	if (d->content_md5 & 1) {
   	    ap_md5_ctx_t context;
   	    
  -	    ap_MD5Init(&context);
  +	    apr_MD5Init(&context);
   #ifdef APACHE_XLATE
               if (r->rrx->to_net) {
                   ap_MD5SetXlate(&context, r->rrx->to_net);
               }
   #endif
  -	    ap_MD5Update(&context, addr, (unsigned int)r->finfo.size);
  -	    ap_table_setn(r->headers_out, "Content-MD5",
  +	    apr_MD5Update(&context, addr, (unsigned int)r->finfo.size);
  +	    apr_table_setn(r->headers_out, "Content-MD5",
   			  ap_md5contextTo64(r->pool, &context));
   	}
   
  @@ -2866,8 +2866,8 @@
   		ap_send_mmap(mm, r, 0, r->finfo.size);
   	    }
   	    else {
  -		ap_off_t offset;
  -		ap_size_t length;
  +		apr_off_t offset;
  +		apr_size_t length;
   		while (ap_each_byterange(r, &offset, &length)) {
   		    ap_send_mmap(mm, r, offset, length);
   		}
  @@ -2876,7 +2876,7 @@
       }
   #endif
   
  -    ap_close(fd);
  +    apr_close(fd);
       return OK;
   }
   
  @@ -2886,12 +2886,12 @@
   { NULL, NULL }
   };
   
  -static void core_post_config(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
  +static void core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
   {
       ap_set_version(pconf);
   }
   
  -static void core_open_logs(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
  +static void core_open_logs(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
   {
       ap_open_logs(s, pconf);
   }
  @@ -2922,7 +2922,7 @@
       merge_core_dir_configs,	/* merge per-directory config structures */
       create_core_server_config,	/* create per-server config structure */
       merge_core_server_configs,	/* merge per-server config structures */
  -    core_cmds,			/* command ap_table_t */
  +    core_cmds,			/* command apr_table_t */
       core_handlers,		/* handlers */
       register_hooks		/* register hooks */
   };
  
  
  
  1.66      +98 -98    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.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- http_log.c	2000/07/25 02:05:49	1.65
  +++ http_log.c	2000/08/02 05:26:47	1.66
  @@ -65,7 +65,7 @@
   
   
   #define CORE_PRIVATE
  -#include "apr.h"  /* for ap_signal */
  +#include "apr.h"  /* for apr_signal */
   #include "ap_config.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
  @@ -165,24 +165,24 @@
       {NULL,	-1},
   };
   
  -static int log_child(ap_pool_t *p, const char *progname,
  -                     ap_file_t **fpin)
  +static int log_child(apr_pool_t *p, const char *progname,
  +                     apr_file_t **fpin)
   {
       /* Child process code for 'ErrorLog "|..."';
        * may want a common framework for this, since I expect it will
        * be common for other foo-loggers to want this sort of thing...
        */
       int rc = -1;
  -    ap_procattr_t *procattr;
  -    ap_proc_t *procnew;
  +    apr_procattr_t *procattr;
  +    apr_proc_t *procnew;
   
   #ifdef SIGHUP
       /* No concept of a child process on Win32 */
  -    ap_signal(SIGHUP, SIG_IGN);
  +    apr_signal(SIGHUP, SIG_IGN);
   #endif /* ndef SIGHUP */
   
  -    if ((ap_createprocattr_init(&procattr, p) != APR_SUCCESS) ||
  -        (ap_setprocattr_io(procattr,
  +    if ((apr_createprocattr_init(&procattr, p) != APR_SUCCESS) ||
  +        (apr_setprocattr_io(procattr,
                              APR_FULL_BLOCK,
                              APR_NO_PIPE,
                              APR_NO_PIPE) != APR_SUCCESS)) {
  @@ -193,13 +193,13 @@
           char **args;
           const char *pname;
           
  -        ap_tokenize_to_argv(progname, &args, p);
  -        pname = ap_pstrdup(p, args[0]);
  -        procnew = (ap_proc_t *) ap_palloc(p, sizeof(*procnew));
  -        rc = ap_create_process(procnew, pname, args, NULL, procattr, p);
  +        apr_tokenize_to_argv(progname, &args, p);
  +        pname = apr_pstrdup(p, args[0]);
  +        procnew = (apr_proc_t *) apr_palloc(p, sizeof(*procnew));
  +        rc = apr_create_process(procnew, pname, args, NULL, procattr, p);
       
           if (rc == APR_SUCCESS) {
  -            ap_note_subprocess(p, procnew, kill_after_timeout);
  +            apr_note_subprocess(p, procnew, kill_after_timeout);
               (*fpin) = procnew->in;
           }
       }
  @@ -207,13 +207,13 @@
       return(rc);
   }
   
  -static void open_error_log(server_rec *s, ap_pool_t *p)
  +static void open_error_log(server_rec *s, apr_pool_t *p)
   {
       const char *fname;
       int rc;
   
       if (*s->error_fname == '|') {
  -	ap_file_t *dummy = NULL;
  +	apr_file_t *dummy = NULL;
   
           /* This starts a new process... */
           rc = log_child (p, s->error_fname+1, &dummy);
  @@ -251,7 +251,7 @@
       else {
   	fname = ap_server_root_relative(p, s->error_fname);
   	/*  Change to AP funcs. */
  -        if (ap_open(&s->error_log, fname, APR_APPEND | 
  +        if (apr_open(&s->error_log, fname, APR_APPEND | 
                       APR_READ | APR_WRITE | APR_CREATE, APR_OS_DEFAULT, p) != APR_SUCCESS) {
               perror("fopen");
               ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  @@ -262,21 +262,21 @@
       }
   }
   
  -void ap_open_logs(server_rec *s_main, ap_pool_t *p)
  +void ap_open_logs(server_rec *s_main, apr_pool_t *p)
   {
  -    ap_status_t rc = APR_SUCCESS;
  +    apr_status_t rc = APR_SUCCESS;
       server_rec *virt, *q;
       int replace_stderr;
  -    ap_file_t *errfile = NULL;
  +    apr_file_t *errfile = NULL;
   
       open_error_log(s_main, p);
   
       replace_stderr = 1;
       if (s_main->error_log) {
           /* replace stderr with this new log */
  -        ap_flush(s_main->error_log);
  -        ap_open_stderr(&errfile, p);        
  -        if ((rc = ap_dupfile(&errfile, s_main->error_log, NULL)) != APR_SUCCESS) {
  +        apr_flush(s_main->error_log);
  +        apr_open_stderr(&errfile, p);        
  +        if ((rc = apr_dupfile(&errfile, s_main->error_log, NULL)) != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s_main,
                            "unable to replace stderr with error_log");
           } else {
  @@ -309,22 +309,22 @@
   }
   
   API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
  -    ap_file_t *errfile = NULL;
  +    apr_file_t *errfile = NULL;
   
  -    ap_open_stderr(&errfile, s->process->pool);        
  +    apr_open_stderr(&errfile, s->process->pool);        
       if (s->error_log != NULL) {
  -        ap_dupfile(&(s->error_log), errfile, s->process->pool);
  +        apr_dupfile(&(s->error_log), errfile, s->process->pool);
       }
   }
   
   static void log_error_core(const char *file, int line, int level, 
  -                           ap_status_t status, const server_rec *s, 
  -                           const request_rec *r, ap_pool_t *pool,
  +                           apr_status_t status, const server_rec *s, 
  +                           const request_rec *r, apr_pool_t *pool,
                              const char *fmt, va_list args)
   {
       char errstr[MAX_STRING_LEN];
       size_t len;
  -    ap_file_t *logf = NULL;
  +    apr_file_t *logf = NULL;
   
       if (s == NULL) {
   	/*
  @@ -335,7 +335,7 @@
   	if (((level & APLOG_LEVELMASK) != APLOG_NOTICE) &&
   	    ((level & APLOG_LEVELMASK) > DEFAULT_LOGLEVEL))
   	    return;
  -	ap_open_stderr(&logf, NULL);
  +	apr_open_stderr(&logf, NULL);
       }
       else if (s->error_log) {
   	/*
  @@ -371,7 +371,7 @@
   
       if (logf && ((level & APLOG_STARTUP) != APLOG_STARTUP)) {
   	errstr[0] = '[';
  -	ap_ctime(errstr + 1, ap_now());
  +	apr_ctime(errstr + 1, apr_now());
   	errstr[1 + AP_CTIME_LEN - 1] = ']';
   	errstr[1 + AP_CTIME_LEN    ] = ' ';
   	len = 1 + AP_CTIME_LEN + 1;
  @@ -380,7 +380,7 @@
       }
   
       if ((level & APLOG_STARTUP) != APLOG_STARTUP) {
  -        len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
  +        len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
   	        "[%s] ", priorities[level & APLOG_LEVELMASK].t_name);
       }
   #ifndef TPF
  @@ -396,14 +396,14 @@
   	 * down to the basename.
   	 */
   	if (e != NULL && e[1] != '\0') {
  -	    ap_snprintf(tmp, sizeof(tmp), "%s", &e[1]);
  +	    apr_snprintf(tmp, sizeof(tmp), "%s", &e[1]);
   	    e = &tmp[strlen(tmp)-1];
   	    if (*e == ')')
   		*e = '\0';
   	    file = tmp;
   	}
   #endif /*_OSD_POSIX*/
  -	len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
  +	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
   		"%s(%d): ", file, line);
       }
   #endif /* TPF */
  @@ -413,26 +413,26 @@
   	 * quad is the most secure, which is why I'm implementing it
   	 * first. -djg
   	 */
  -	len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
  +	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
   		"[client %s] ", r->connection->remote_ip);
       }
       if (!(level & APLOG_NOERRNO)
   	&& (status != 0)) {
           char buf[120];
  -	len += ap_snprintf(errstr + len, MAX_STRING_LEN - len,
  -		"(%d)%s: ", status, ap_strerror(status, buf, sizeof(buf)));
  +	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  +		"(%d)%s: ", status, apr_strerror(status, buf, sizeof(buf)));
       }
   
  -    len += ap_vsnprintf(errstr + len, MAX_STRING_LEN - len, fmt, args);
  +    len += apr_vsnprintf(errstr + len, MAX_STRING_LEN - len, fmt, args);
   
       /* NULL if we are logging to syslog */
       if (logf) {
  -        /* Truncate for the terminator (as ap_snprintf does) */
  +        /* Truncate for the terminator (as apr_snprintf does) */
           if (len > MAX_STRING_LEN - sizeof(APR_EOL_STR))
               len = MAX_STRING_LEN - sizeof(APR_EOL_STR);
           strcpy(errstr + len, APR_EOL_STR);
  -        ap_puts(errstr, logf);
  -	ap_flush(logf);
  +        apr_puts(errstr, logf);
  +	apr_flush(logf);
       }
   #ifdef HAVE_SYSLOG
       else {
  @@ -442,7 +442,7 @@
   }
       
   API_EXPORT(void) ap_log_error(const char *file, int line, int level,
  -			      ap_status_t status, const server_rec *s, 
  +			      apr_status_t status, const server_rec *s, 
                                 const char *fmt, ...)
   {
       va_list args;
  @@ -453,7 +453,7 @@
   }
   
   API_EXPORT(void) ap_log_perror(const char *file, int line, int level,
  -			      ap_status_t status, ap_pool_t *p, 
  +			      apr_status_t status, apr_pool_t *p, 
                                 const char *fmt, ...)
   {
       va_list args;
  @@ -464,7 +464,7 @@
   }
   
   API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
  -			       ap_status_t status, const request_rec *r, 
  +			       apr_status_t status, const request_rec *r, 
                                  const char *fmt, ...)
   {
       va_list args;
  @@ -482,28 +482,28 @@
       va_end(args);
       va_start(args,fmt); 
       if (((level & APLOG_LEVELMASK) <= APLOG_WARNING)
  -	&& (ap_table_get(r->notes, "error-notes") == NULL)) {
  -	ap_table_setn(r->notes, "error-notes",
  -		      ap_escape_html(r->pool, ap_pvsprintf(r->pool, fmt, 
  +	&& (apr_table_get(r->notes, "error-notes") == NULL)) {
  +	apr_table_setn(r->notes, "error-notes",
  +		      ap_escape_html(r->pool, apr_pvsprintf(r->pool, fmt, 
   		      args)));
       }
       va_end(args);
   }
   
  -void ap_log_pid(ap_pool_t *p, const char *fname)
  +void ap_log_pid(apr_pool_t *p, const char *fname)
   {
  -    ap_file_t *pid_file = NULL;
  -    ap_finfo_t finfo;
  +    apr_file_t *pid_file = NULL;
  +    apr_finfo_t finfo;
       static pid_t saved_pid = -1;
       pid_t mypid;
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if (!fname) 
   	return;
   
       fname = ap_server_root_relative(p, fname);
       mypid = getpid();
  -    if (mypid != saved_pid && ap_stat(&finfo, fname, p) == APR_SUCCESS) {
  +    if (mypid != saved_pid && apr_stat(&finfo, fname, p) == APR_SUCCESS) {
         /* WINCH and HUP call this on each restart.
          * Only warn on first time through for this pid.
          *
  @@ -512,13 +512,13 @@
          *      based on the last modification time of the pid file.
          */
           ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
  -		     ap_psprintf(p,
  +		     apr_psprintf(p,
                                    "pid file %s overwritten -- Unclean shutdown of previous Apache run?",
                        fname)
   			       );
       }
   
  -    if ((rv = ap_open(&pid_file, fname, APR_WRITE | APR_CREATE | APR_TRUNCATE,
  +    if ((rv = apr_open(&pid_file, fname, APR_WRITE | APR_CREATE | APR_TRUNCATE,
                         APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p)) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, 
                        "could not create %s", fname);
  @@ -527,8 +527,8 @@
   		     ap_server_argv0, fname);
           exit(1);
       }
  -    ap_fprintf(pid_file, "%ld" APR_EOL_STR, (long)mypid);
  -    ap_close(pid_file);
  +    apr_fprintf(pid_file, "%ld" APR_EOL_STR, (long)mypid);
  +    apr_close(pid_file);
       saved_pid = mypid;
   }
   
  @@ -565,7 +565,7 @@
   {
       char time_str[AP_CTIME_LEN];
   
  -    ap_ctime(time_str, ap_now());
  +    apr_ctime(time_str, apr_now());
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                    "[%s] file %s, line %d, assertion \"%s\" failed",
   	         time_str, szFile, nLine, szExp);
  @@ -586,40 +586,40 @@
   static int piped_log_spawn(piped_log *pl)
   {
       int rc;
  -    ap_procattr_t *procattr;
  -    ap_proc_t *procnew;
  -    ap_status_t status;
  +    apr_procattr_t *procattr;
  +    apr_proc_t *procnew;
  +    apr_status_t status;
   
   #ifdef SIGHUP
  -    ap_signal(SIGHUP, SIG_IGN);
  +    apr_signal(SIGHUP, SIG_IGN);
   #endif
  -    if (((status = ap_createprocattr_init(&procattr, pl->p)) != APR_SUCCESS) ||
  -        ((status = ap_setprocattr_childin(procattr, ap_piped_log_read_fd(pl), 
  +    if (((status = apr_createprocattr_init(&procattr, pl->p)) != APR_SUCCESS) ||
  +        ((status = apr_setprocattr_childin(procattr, ap_piped_log_read_fd(pl), 
                                   ap_piped_log_write_fd(pl)))  != APR_SUCCESS)) {
           char buf[120];
           /* Something bad happened, give up and go away. */
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
   	    "piped_log_spawn: unable to setup child process '%s': %s",
  -	    pl->program, ap_strerror(status, buf, sizeof(buf)));
  +	    pl->program, apr_strerror(status, buf, sizeof(buf)));
           rc = -1;
       }
       else {
           char **args;
           const char *pname;
   
  -        ap_tokenize_to_argv(pl->program, &args, pl->p);
  -        pname = ap_pstrdup(pl->p, args[0]);
  -        procnew = (ap_proc_t *) ap_palloc(pl->p, sizeof(*procnew));
  -        rc = ap_create_process(procnew, pname, args, NULL, procattr, pl->p);
  +        apr_tokenize_to_argv(pl->program, &args, pl->p);
  +        pname = apr_pstrdup(pl->p, args[0]);
  +        procnew = (apr_proc_t *) apr_palloc(pl->p, sizeof(*procnew));
  +        rc = apr_create_process(procnew, pname, args, NULL, procattr, pl->p);
       
           if (rc == APR_SUCCESS) {            
               /* pjr - This no longer happens inside the child, */
  -            /*   I am assuming that if ap_create_process was  */
  +            /*   I am assuming that if apr_create_process was  */
               /*   successful that the child is running.        */
               RAISE_SIGSTOP(PIPED_LOG_SPAWN); 
               pl->pid = procnew;
               ap_piped_log_write_fd(pl) = procnew->in;
  -            ap_register_other_child(procnew, piped_log_maintenance, pl, 
  +            apr_register_other_child(procnew, piped_log_maintenance, pl, 
                                       ap_piped_log_write_fd(pl), pl->p);
           }
       }
  @@ -631,12 +631,12 @@
   static void piped_log_maintenance(int reason, void *data, ap_wait_t status)
   {
       piped_log *pl = data;
  -    ap_status_t stats;
  +    apr_status_t stats;
   
       switch (reason) {
       case APR_OC_REASON_DEATH:
   	pl->pid = NULL;
  -	ap_unregister_other_child(pl);
  +	apr_unregister_other_child(pl);
   	if (pl->program == NULL) {
   	    /* during a restart */
   	    break;
  @@ -644,7 +644,7 @@
           break;
       case APR_OC_REASON_LOST:
   	pl->pid = NULL;
  -	ap_unregister_other_child(pl);
  +	apr_unregister_other_child(pl);
   	if (pl->program == NULL) {
   	    /* during a restart */
   	    break;
  @@ -655,20 +655,20 @@
               char buf[120];
   	    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
   		"piped_log_maintenance: unable to respawn '%s': %s",
  -		pl->program, ap_strerror(stats, buf, sizeof(buf)));
  +		pl->program, apr_strerror(stats, buf, sizeof(buf)));
   	}
   	break;
       
       case APR_OC_REASON_UNWRITABLE:
   	if (pl->pid != NULL) {
  -	    ap_kill(pl->pid, SIGTERM);
  +	    apr_kill(pl->pid, SIGTERM);
   	}
   	break;
       
       case APR_OC_REASON_RESTART:
   	pl->program = NULL;
   	if (pl->pid != NULL) {
  -	    ap_kill(pl->pid, SIGTERM);
  +	    apr_kill(pl->pid, SIGTERM);
   	}
   	break;
   
  @@ -678,46 +678,46 @@
   }
   
   
  -static ap_status_t piped_log_cleanup(void *data)
  +static apr_status_t piped_log_cleanup(void *data)
   {
       piped_log *pl = data;
   
       if (pl->pid != NULL) {
  -	ap_kill(pl->pid, SIGTERM);
  +	apr_kill(pl->pid, SIGTERM);
       }
  -    ap_unregister_other_child(pl);
  -    ap_close(ap_piped_log_read_fd(pl));
  -    ap_close(ap_piped_log_write_fd(pl));
  +    apr_unregister_other_child(pl);
  +    apr_close(ap_piped_log_read_fd(pl));
  +    apr_close(ap_piped_log_write_fd(pl));
       return APR_SUCCESS;
   }
   
   
  -static ap_status_t piped_log_cleanup_for_exec(void *data)
  +static apr_status_t piped_log_cleanup_for_exec(void *data)
   {
       piped_log *pl = data;
   
  -    ap_close(ap_piped_log_read_fd(pl));
  -    ap_close(ap_piped_log_write_fd(pl));
  +    apr_close(ap_piped_log_read_fd(pl));
  +    apr_close(ap_piped_log_write_fd(pl));
       return APR_SUCCESS;
   }
   
  -API_EXPORT(piped_log *) ap_open_piped_log(ap_pool_t *p, const char *program)
  +API_EXPORT(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
   {
       piped_log *pl;
   
  -    pl = ap_palloc(p, sizeof (*pl));
  +    pl = apr_palloc(p, sizeof (*pl));
       pl->p = p;
  -    pl->program = ap_pstrdup(p, program);
  +    pl->program = apr_pstrdup(p, program);
       pl->pid = NULL;
  -    if (ap_create_pipe(&ap_piped_log_read_fd(pl), &ap_piped_log_write_fd(pl), p) != APR_SUCCESS) {
  +    if (apr_create_pipe(&ap_piped_log_read_fd(pl), &ap_piped_log_write_fd(pl), p) != APR_SUCCESS) {
   	return NULL;
       }
  -    ap_register_cleanup(p, pl, piped_log_cleanup, piped_log_cleanup_for_exec);
  +    apr_register_cleanup(p, pl, piped_log_cleanup, piped_log_cleanup_for_exec);
       if (piped_log_spawn(pl) == -1) {
   	int save_errno = errno;
  -	ap_kill_cleanup(p, pl, piped_log_cleanup);
  -	ap_close(ap_piped_log_read_fd(pl));
  -	ap_close(ap_piped_log_write_fd(pl));
  +	apr_kill_cleanup(p, pl, piped_log_cleanup);
  +	apr_close(ap_piped_log_read_fd(pl));
  +	apr_close(ap_piped_log_write_fd(pl));
   	errno = save_errno;
   	return NULL;
       }
  @@ -726,18 +726,18 @@
   
   #else
   
  -static ap_status_t piped_log_cleanup(void *data)
  +static apr_status_t piped_log_cleanup(void *data)
   {
       piped_log *pl = data;
   
  -    ap_close(ap_piped_log_write_fd(pl));
  +    apr_close(ap_piped_log_write_fd(pl));
       return APR_SUCCESS;
   }
   
  -API_EXPORT(piped_log *) ap_open_piped_log(ap_pool_t *p, const char *program)
  +API_EXPORT(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
   {
       piped_log *pl;
  -    ap_file_t *dummy = NULL;
  +    apr_file_t *dummy = NULL;
       int rc;
   
       rc = log_child(p, program, &dummy);
  @@ -748,11 +748,11 @@
   	exit (1);
       }
   
  -    pl = ap_palloc(p, sizeof (*pl));
  +    pl = apr_palloc(p, sizeof (*pl));
       pl->p = p;
       ap_piped_log_read_fd(pl) = NULL;
       ap_piped_log_write_fd(pl) = dummy;
  -    ap_register_cleanup(p, pl, piped_log_cleanup, piped_log_cleanup);
  +    apr_register_cleanup(p, pl, piped_log_cleanup, piped_log_cleanup);
   
       return pl;
   }
  @@ -761,6 +761,6 @@
   
   API_EXPORT(void) ap_close_piped_log(piped_log *pl)
   {
  -    ap_run_cleanup(pl->p, pl, piped_log_cleanup);
  +    apr_run_cleanup(pl->p, pl, piped_log_cleanup);
   }
   
  
  
  
  1.62      +39 -39    apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- http_main.c	2000/07/21 19:50:46	1.61
  +++ http_main.c	2000/08/02 05:26:48	1.62
  @@ -191,8 +191,8 @@
   
   static void destroy_and_exit_process(process_rec *process, int process_exit_value)
   {
  -    ap_destroy_pool(process->pool); /* and destroy all descendent pools */
  -    ap_terminate();
  +    apr_destroy_pool(process->pool); /* and destroy all descendent pools */
  +    apr_terminate();
       exit(process_exit_value);
   }
   
  @@ -201,25 +201,25 @@
       process_rec *process;
       
       {
  -	ap_pool_t *cntx;
  -        ap_status_t stat;
  +	apr_pool_t *cntx;
  +        apr_status_t stat;
   
  -	stat = ap_create_pool(&cntx, NULL);
  +	stat = apr_create_pool(&cntx, NULL);
           if (stat != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL,
  -                         "ap_create_pool() failed to create "
  +                         "apr_create_pool() failed to create "
                            "initial context");
  -            ap_terminate();
  +            apr_terminate();
               exit(1);
           }
   
  -	process = ap_palloc(cntx, sizeof(process_rec));
  +	process = apr_palloc(cntx, sizeof(process_rec));
   	process->pool = cntx;
       }
  -    ap_create_pool(&process->pconf, process->pool);
  +    apr_create_pool(&process->pconf, process->pool);
       process->argc = argc;
       process->argv = argv;
  -    process->short_name = ap_filename_of_pathname(argv[0]);
  +    process->short_name = apr_filename_of_pathname(argv[0]);
       return process;
   }
   
  @@ -282,15 +282,15 @@
       const char *def_server_root = HTTPD_ROOT;
       process_rec *process;
       server_rec *server_conf;
  -    ap_pool_t *pglobal;
  -    ap_pool_t *pconf;
  -    ap_pool_t *plog; /* Pool of log streams, reset _after_ each read of conf */
  -    ap_pool_t *ptemp; /* Pool for temporary config stuff, reset often */
  -    ap_pool_t *pcommands; /* Pool for -D, -C and -c switches */
  +    apr_pool_t *pglobal;
  +    apr_pool_t *pconf;
  +    apr_pool_t *plog; /* Pool of log streams, reset _after_ each read of conf */
  +    apr_pool_t *ptemp; /* Pool for temporary config stuff, reset often */
  +    apr_pool_t *pcommands; /* Pool for -D, -C and -c switches */
       module **mod;
       ap_directive_t *conftree = NULL;
   
  -    ap_initialize();
  +    apr_initialize();
       process = create_process(argc, (char *const *)argv);
       pglobal = process->pool;
       pconf = process->pconf;
  @@ -306,35 +306,35 @@
   
       ap_setup_prelinked_modules(process);
   
  -    ap_create_pool(&pcommands, pglobal);
  -    ap_server_pre_read_config  = ap_make_array(pcommands, 1, sizeof(char *));
  -    ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
  -    ap_server_config_defines   = ap_make_array(pcommands, 1, sizeof(char *));
  +    apr_create_pool(&pcommands, pglobal);
  +    ap_server_pre_read_config  = apr_make_array(pcommands, 1, sizeof(char *));
  +    ap_server_post_read_config = apr_make_array(pcommands, 1, sizeof(char *));
  +    ap_server_config_defines   = apr_make_array(pcommands, 1, sizeof(char *));
   
       ap_run_rewrite_args(process);
   
       /* Maintain AP_SERVER_BASEARGS list in http_main.h to allow the MPM 
        * to safely pass on our args from its rewrite_args() handler.
        */
  -    while (ap_getopt(process->argc, process->argv, 
  +    while (apr_getopt(process->argc, process->argv, 
                        AP_SERVER_BASEARGS, &c, pcommands) 
               == APR_SUCCESS) {
           char **new;
           switch (c) {
    	case 'c':
  -	    new = (char **)ap_push_array(ap_server_post_read_config);
  -	    *new = ap_pstrdup(pcommands, ap_optarg);
  +	    new = (char **)apr_push_array(ap_server_post_read_config);
  +	    *new = apr_pstrdup(pcommands, ap_optarg);
   	    break;
   	case 'C':
  -	    new = (char **)ap_push_array(ap_server_pre_read_config);
  -	    *new = ap_pstrdup(pcommands, ap_optarg);
  +	    new = (char **)apr_push_array(ap_server_pre_read_config);
  +	    *new = apr_pstrdup(pcommands, ap_optarg);
   	    break;
   	case 'd':
   	    def_server_root = ap_optarg;
   	    break;
   	case 'D':
  -	    new = (char **)ap_push_array(ap_server_config_defines);
  -	    *new = ap_pstrdup(pcommands, ap_optarg);
  +	    new = (char **)apr_push_array(ap_server_config_defines);
  +	    *new = apr_pstrdup(pcommands, ap_optarg);
   	    break;
   	case 'f':
   	    confname = ap_optarg;
  @@ -361,8 +361,8 @@
   	}
       }
   
  -    ap_create_pool(&plog, pglobal);
  -    ap_create_pool(&ptemp, pconf);
  +    apr_create_pool(&plog, pglobal);
  +    apr_create_pool(&ptemp, pconf);
   
       /* Note that we preflight the config file once
          before reading it _again_ in the main loop.
  @@ -380,14 +380,14 @@
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
   	destroy_and_exit_process(process, 0);
       }
  -    ap_clear_pool(plog);
  +    apr_clear_pool(plog);
       ap_run_open_logs(pconf, plog, ptemp, server_conf);
       ap_post_config_hook(pconf, plog, ptemp, server_conf);
  -    ap_destroy_pool(ptemp);
  +    apr_destroy_pool(ptemp);
   
       for (;;) {
   	ap_hook_deregister_all();
  -	ap_clear_pool(pconf);
  +	apr_clear_pool(pconf);
   	for (mod = ap_prelinked_modules; *mod != NULL; mod++) {
   		ap_register_hooks(*mod);
   	}
  @@ -396,7 +396,7 @@
            * memory.  rbb
            */
           conftree = NULL;
  -	ap_create_pool(&ptemp, pconf);
  +	apr_create_pool(&ptemp, pconf);
   	ap_server_root = def_server_root;
           server_conf = ap_read_config(process, ptemp, confname, &conftree);
   	ap_run_pre_config(pconf, plog, ptemp);
  @@ -404,10 +404,10 @@
           ap_fixup_virtual_hosts(pconf, server_conf);
           ap_fini_vhost_config(pconf, server_conf);
           ap_sort_hooks();
  -	ap_clear_pool(plog);
  +	apr_clear_pool(plog);
   	ap_run_open_logs(pconf, plog, ptemp, server_conf);
   	ap_post_config_hook(pconf, plog, ptemp, server_conf);
  -	ap_destroy_pool(ptemp);
  +	apr_destroy_pool(ptemp);
   
   	if (ap_mpm_run(pconf, plog, server_conf)) break;
       }
  @@ -427,13 +427,13 @@
   
   #ifndef SHARED_CORE_BOOTSTRAP
   /*
  - * Force ap_validate_password() into the image so that modules like
  + * Force apr_validate_password() into the image so that modules like
    * mod_auth can use it even if they're dynamically loaded.
    */
  -void suck_in_ap_validate_password(void);
  -void suck_in_ap_validate_password(void)
  +void suck_in_apr_validate_password(void);
  +void suck_in_apr_validate_password(void)
   {
  -    ap_validate_password("a", "b");
  +    apr_validate_password("a", "b");
   }
   #endif
   
  
  
  
  1.100     +188 -188  apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- http_protocol.c	2000/07/28 20:31:00	1.99
  +++ http_protocol.c	2000/08/02 05:26:48	1.100
  @@ -105,7 +105,7 @@
    * connection.
    */
   static void check_first_conn_error(const request_rec *r, const char *operation,
  -                                   ap_status_t status)
  +                                   apr_status_t status)
   {
       if (!r->connection->aborted) {
           if (status == 0)
  @@ -141,7 +141,7 @@
   
   static int checked_bflush(request_rec *r)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if ((rv = ap_bflush(r->connection->client)) != APR_SUCCESS) {
           check_first_conn_error(r, "checked_bflush", rv);
  @@ -198,7 +198,7 @@
   	 */
   	for (pcset = needcset; *pcset ; pcset++)
   	    if (ap_strcasestr(type, *pcset) != NULL) {
  -		type = ap_pstrcat(r->pool, type, "; charset=", 
  +		type = apr_pstrcat(r->pool, type, "; charset=", 
   		    conf->add_default_charset_name, NULL);
   		break;
   	    }
  @@ -241,7 +241,7 @@
   }
   
   static int internal_byterange(int, long *, request_rec *, const char **,
  -			      ap_off_t *, ap_size_t *);
  +			      apr_off_t *, apr_size_t *);
   
   API_EXPORT(int) ap_set_byterange(request_rec *r)
   {
  @@ -261,8 +261,8 @@
        * Navigator 2-3 and MSIE 3.
        */
   
  -    if (!(range = ap_table_get(r->headers_in, "Range")))
  -        range = ap_table_get(r->headers_in, "Request-Range");
  +    if (!(range = apr_table_get(r->headers_in, "Range")))
  +        range = apr_table_get(r->headers_in, "Request-Range");
   
       if (!range || strncasecmp(range, "bytes=", 6)) {
           return 0;
  @@ -272,42 +272,42 @@
        * Note that this check will return false (as required) if either
        * of the two etags are weak.
        */
  -    if ((if_range = ap_table_get(r->headers_in, "If-Range"))) {
  +    if ((if_range = apr_table_get(r->headers_in, "If-Range"))) {
           if (if_range[0] == '"') {
  -            if (!(match = ap_table_get(r->headers_out, "Etag")) ||
  +            if (!(match = apr_table_get(r->headers_out, "Etag")) ||
                   (strcmp(if_range, match) != 0))
                   return 0;
           }
  -        else if (!(match = ap_table_get(r->headers_out, "Last-Modified")) ||
  +        else if (!(match = apr_table_get(r->headers_out, "Last-Modified")) ||
                    (strcmp(if_range, match) != 0))
               return 0;
       }
   
       if (!ap_strchr_c(range, ',')) {
           /* A single range */
  -        if (!parse_byterange(ap_pstrdup(r->pool, range + 6), r->clength,
  +        if (!parse_byterange(apr_pstrdup(r->pool, range + 6), r->clength,
                                &range_start, &range_end))
               return 0;
   
           r->byterange = 1;
   
  -        ap_table_setn(r->headers_out, "Content-Range",
  -	    ap_psprintf(r->pool, "bytes %ld-%ld/%ld",
  +        apr_table_setn(r->headers_out, "Content-Range",
  +	    apr_psprintf(r->pool, "bytes %ld-%ld/%ld",
   		range_start, range_end, r->clength));
  -        ap_table_setn(r->headers_out, "Content-Length",
  -	    ap_psprintf(r->pool, "%ld", range_end - range_start + 1));
  +        apr_table_setn(r->headers_out, "Content-Length",
  +	    apr_psprintf(r->pool, "%ld", range_end - range_start + 1));
       }
       else {
           /* a multiple range */
  -        const char *r_range = ap_pstrdup(r->pool, range + 6);
  +        const char *r_range = apr_pstrdup(r->pool, range + 6);
           long tlength = 0;
   
           r->byterange = 2;
  -        r->boundary = ap_psprintf(r->pool, "%llx%lx",
  +        r->boundary = apr_psprintf(r->pool, "%llx%lx",
   				r->request_time, (long) getpid());
           while (internal_byterange(0, &tlength, r, &r_range, NULL, NULL));
  -        ap_table_setn(r->headers_out, "Content-Length",
  -	    ap_psprintf(r->pool, "%ld", tlength));
  +        apr_table_setn(r->headers_out, "Content-Length",
  +	    apr_psprintf(r->pool, "%ld", tlength));
       }
   
       r->status = HTTP_PARTIAL_CONTENT;
  @@ -316,8 +316,8 @@
       return 1;
   }
   
  -API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
  -				  ap_size_t *length)
  +API_EXPORT(int) ap_each_byterange(request_rec *r, apr_off_t *offset,
  +				  apr_size_t *length)
   {
       return internal_byterange(1, NULL, r, &r->range, offset, length);
   }
  @@ -333,8 +333,8 @@
    * when done.
    */
   static int internal_byterange(int realreq, long *tlength, request_rec *r,
  -                              const char **r_range, ap_off_t *offset,
  -			      ap_size_t *length)
  +                              const char **r_range, apr_off_t *offset,
  +			      apr_size_t *length)
   {
       long range_start, range_end;
       char *range;
  @@ -380,7 +380,7 @@
           const char *ct = make_content_type(r, r->content_type);
           char ts[MAX_STRING_LEN];
   
  -        ap_snprintf(ts, sizeof(ts), "%ld-%ld/%ld", range_start, range_end,
  +        apr_snprintf(ts, sizeof(ts), "%ld-%ld/%ld", range_start, range_end,
                       r->clength);
           if (realreq)
               (void) checked_bputstrs(r, CRLF "--", r->boundary,
  @@ -408,7 +408,7 @@
   API_EXPORT(int) ap_set_content_length(request_rec *r, long clength)
   {
       r->clength = clength;
  -    ap_table_setn(r->headers_out, "Content-Length", ap_psprintf(r->pool, "%ld", clength));
  +    apr_table_setn(r->headers_out, "Content-Length", apr_psprintf(r->pool, "%ld", clength));
       return 0;
   }
   
  @@ -416,8 +416,8 @@
   {
       int ka_sent = 0;
       int wimpy = ap_find_token(r->pool,
  -                           ap_table_get(r->headers_out, "Connection"), "close");
  -    const char *conn = ap_table_get(r->headers_in, "Connection");
  +                           apr_table_get(r->headers_out, "Connection"), "close");
  +    const char *conn = apr_table_get(r->headers_in, "Connection");
   
   #ifdef APACHE_XLATE
       if (r->rrx->to_net && !r->rrx->to_net_sb) {
  @@ -426,7 +426,7 @@
            * following logic, as the absence of the Content-Length header
            * may affect the decision on chunked encoding.
            */
  -        ap_table_unset(r->headers_out,"Content-Length");
  +        apr_table_unset(r->headers_out,"Content-Length");
       }
   #endif /* APACHE_XLATE */
   
  @@ -459,9 +459,9 @@
           ((r->status == HTTP_NOT_MODIFIED) ||
            (r->status == HTTP_NO_CONTENT) ||
            r->header_only ||
  -         ap_table_get(r->headers_out, "Content-Length") ||
  +         apr_table_get(r->headers_out, "Content-Length") ||
            ap_find_last_token(r->pool,
  -                         ap_table_get(r->headers_out, "Transfer-Encoding"),
  +                         apr_table_get(r->headers_out, "Transfer-Encoding"),
                            "chunked") ||
            ((r->proto_num >= HTTP_VERSION(1,1)) &&
   	  (r->chunked = 1))) && /* THIS CODE IS CORRECT, see comment above. */
  @@ -472,8 +472,8 @@
           !ap_status_drops_connection(r->status) &&
           !wimpy &&
           !ap_find_token(r->pool, conn, "close") &&
  -        (!ap_table_get(r->subprocess_env, "nokeepalive") ||
  -         ap_table_get(r->headers_in, "Via")) &&
  +        (!apr_table_get(r->subprocess_env, "nokeepalive") ||
  +         apr_table_get(r->headers_in, "Via")) &&
           ((ka_sent = ap_find_token(r->pool, conn, "keep-alive")) ||
            (r->proto_num >= HTTP_VERSION(1,1)))
          ) {
  @@ -485,14 +485,14 @@
           /* If they sent a Keep-Alive token, send one back */
           if (ka_sent) {
               if (r->server->keep_alive_max)
  -		ap_table_setn(r->headers_out, "Keep-Alive",
  -		    ap_psprintf(r->pool, "timeout=%d, max=%d",
  +		apr_table_setn(r->headers_out, "Keep-Alive",
  +		    apr_psprintf(r->pool, "timeout=%d, max=%d",
                               r->server->keep_alive_timeout, left));
               else
  -		ap_table_setn(r->headers_out, "Keep-Alive",
  -		    ap_psprintf(r->pool, "timeout=%d",
  +		apr_table_setn(r->headers_out, "Keep-Alive",
  +		    apr_psprintf(r->pool, "timeout=%d",
                               r->server->keep_alive_timeout));
  -            ap_table_mergen(r->headers_out, "Connection", "Keep-Alive");
  +            apr_table_mergen(r->headers_out, "Connection", "Keep-Alive");
           }
   
           return 1;
  @@ -507,7 +507,7 @@
        * to a HTTP/1.1 client. Better safe than sorry.
        */
       if (!wimpy)
  -	ap_table_mergen(r->headers_out, "Connection", "close");
  +	apr_table_mergen(r->headers_out, "Connection", "close");
   
       r->connection->keepalive = 0;
   
  @@ -521,9 +521,9 @@
    * to limit the number of calls to time().  We don't check for futurosity
    * unless the mtime is at least as new as the reference.
    */
  -API_EXPORT(ap_time_t) ap_rationalize_mtime(request_rec *r, ap_time_t mtime)
  +API_EXPORT(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime)
   {
  -    ap_time_t now;
  +    apr_time_t now;
   
       /* For all static responses, it's almost certain that the file was
        * last modified before the beginning of the request.  So there's
  @@ -534,15 +534,15 @@
        * were given a time in the future, we return the current time - the
        * Last-Modified can't be in the future.
        */
  -    now = (mtime < r->request_time) ? r->request_time : ap_now();
  +    now = (mtime < r->request_time) ? r->request_time : apr_now();
       return (mtime > now) ? now : mtime;
   }
   
   API_EXPORT(int) ap_meets_conditions(request_rec *r)
   {
  -    const char *etag = ap_table_get(r->headers_out, "ETag");
  +    const char *etag = apr_table_get(r->headers_out, "ETag");
       const char *if_match, *if_modified_since, *if_unmodified, *if_nonematch;
  -    ap_time_t mtime;
  +    apr_time_t mtime;
   
       /* Check for conditional requests --- note that we only want to do
        * this if we are successful so far and we are not processing a
  @@ -560,14 +560,14 @@
       }
   
       /* XXX: we should define a "time unset" constant */
  -    mtime = (r->mtime != 0) ? r->mtime : ap_now();
  +    mtime = (r->mtime != 0) ? r->mtime : apr_now();
   
       /* If an If-Match request-header field was given
        * AND the field value is not "*" (meaning match anything)
        * AND if our strong ETag does not match any entity tag in that field,
        *     respond with a status of 412 (Precondition Failed).
        */
  -    if ((if_match = ap_table_get(r->headers_in, "If-Match")) != NULL) {
  +    if ((if_match = apr_table_get(r->headers_in, "If-Match")) != NULL) {
           if (if_match[0] != '*' &&
               (etag == NULL || etag[0] == 'W' ||
                !ap_find_list_item(r->pool, if_match, etag))) {
  @@ -580,9 +580,9 @@
            * specified in this field, then the server MUST
            *     respond with a status of 412 (Precondition Failed).
            */
  -        if_unmodified = ap_table_get(r->headers_in, "If-Unmodified-Since");
  +        if_unmodified = apr_table_get(r->headers_in, "If-Unmodified-Since");
           if (if_unmodified != NULL) {
  -            ap_time_t ius = ap_parseHTTPdate(if_unmodified);
  +            apr_time_t ius = ap_parseHTTPdate(if_unmodified);
   
               if ((ius != BAD_DATE) && (mtime > ius)) {
                   return HTTP_PRECONDITION_FAILED;
  @@ -602,13 +602,13 @@
        * GET or HEAD allow weak etag comparison, all other methods require
        * strong comparison.  We can only use weak if it's not a range request.
        */
  -    if_nonematch = ap_table_get(r->headers_in, "If-None-Match");
  +    if_nonematch = apr_table_get(r->headers_in, "If-None-Match");
       if (if_nonematch != NULL) {
           if (r->method_number == M_GET) {
               if (if_nonematch[0] == '*')
                   return HTTP_NOT_MODIFIED;
               if (etag != NULL) {
  -                if (ap_table_get(r->headers_in, "Range")) {
  +                if (apr_table_get(r->headers_in, "Range")) {
                       if (etag[0] != 'W' &&
                           ap_find_list_item(r->pool, if_nonematch, etag)) {
                           return HTTP_NOT_MODIFIED;
  @@ -634,8 +634,8 @@
        */
       else if ((r->method_number == M_GET)
                && ((if_modified_since =
  -                  ap_table_get(r->headers_in, "If-Modified-Since")) != NULL)) {
  -        ap_time_t ims = ap_parseHTTPdate(if_modified_since);
  +                  apr_table_get(r->headers_in, "If-Modified-Since")) != NULL)) {
  +        apr_time_t ims = ap_parseHTTPdate(if_modified_since);
   
   	if ((ims >= mtime) && (ims <= r->request_time)) {
               return HTTP_NOT_MODIFIED;
  @@ -672,14 +672,14 @@
       weak = ((r->request_time - r->mtime > AP_USEC_PER_SEC) && !force_weak) ? "" : "W/";
   
       if (r->finfo.protection != 0) {
  -        etag = ap_psprintf(r->pool,
  +        etag = apr_psprintf(r->pool,
                       "%s\"%lx-%lx-%lx\"", weak,
                       (unsigned long) r->finfo.inode,
                       (unsigned long) r->finfo.size,
                       (unsigned long) r->mtime);
       }
       else {
  -        etag = ap_psprintf(r->pool, "%s\"%lx\"", weak,
  +        etag = apr_psprintf(r->pool, "%s\"%lx\"", weak,
                       (unsigned long) r->mtime);
       }
   
  @@ -724,10 +724,10 @@
               vlv += 3;
           else
               vlv++;
  -        etag = ap_pstrcat(r->pool, variant_etag, ";", vlv, NULL);
  +        etag = apr_pstrcat(r->pool, variant_etag, ";", vlv, NULL);
       }
   
  -    ap_table_setn(r->headers_out, "ETag", etag);
  +    apr_table_setn(r->headers_out, "ETag", etag);
   }
   
   /*
  @@ -737,10 +737,10 @@
    */
   API_EXPORT(void) ap_set_last_modified(request_rec *r)
   {
  -    ap_time_t mod_time = ap_rationalize_mtime(r, r->mtime);
  -    char *datestr = ap_palloc(r->pool, AP_RFC822_DATE_LEN);
  -    ap_rfc822_date(datestr, mod_time);
  -    ap_table_setn(r->headers_out, "Last-Modified", datestr);
  +    apr_time_t mod_time = ap_rationalize_mtime(r, r->mtime);
  +    char *datestr = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +    apr_rfc822_date(datestr, mod_time);
  +    apr_table_setn(r->headers_out, "Last-Modified", datestr);
   }
   
   /* Get the method number associated with the given string, assumed to
  @@ -901,7 +901,7 @@
   {
       int status = HTTP_OK;
   
  -    r->unparsed_uri = ap_pstrdup(r->pool, uri);
  +    r->unparsed_uri = apr_pstrdup(r->pool, uri);
   
       if (r->method_number == M_CONNECT) {
   	status = ap_parse_hostinfo_components(r->pool, uri, &r->parsed_uri);
  @@ -920,7 +920,7 @@
   	}
   	r->args = r->parsed_uri.query;
   	r->uri = r->parsed_uri.path ? r->parsed_uri.path
  -				    : ap_pstrdup(r->pool, "/");
  +				    : apr_pstrdup(r->pool, "/");
   #if defined(OS2) || defined(WIN32)
   	/* Handle path translations for OS/2 and plug security hole.
   	 * This will prevent "http://www.wherever.com/..\..\/" from
  @@ -938,7 +938,7 @@
   	r->args = NULL;
   	r->hostname = NULL;
   	r->status = status;             /* set error status */
  -	r->uri = ap_pstrdup(r->pool, uri);
  +	r->uri = apr_pstrdup(r->pool, uri);
       }
   }
   
  @@ -973,7 +973,7 @@
   	    /* this is a hack to make sure that request time is set,
   	     * it's not perfect, but it's better than nothing 
   	     */
  -	    r->request_time = ap_now();
  +	    r->request_time = apr_now();
               return 0;
           }
       }
  @@ -986,14 +986,14 @@
        * thread isn't used. - mvsk
   
   #ifdef SIGWINCH
  -    ap_signal(SIGWINCH, SIG_IGN);
  +    apr_signal(SIGWINCH, SIG_IGN);
   #endif
       */
   
       ap_bsetflag(conn->client, B_SAFEREAD, 0);
   
  -    r->request_time = ap_now();
  -    r->the_request = ap_pstrdup(r->pool, l);
  +    r->request_time = apr_now();
  +    r->the_request = apr_pstrdup(r->pool, l);
       r->method = ap_getword_white(r->pool, &ll);
       ap_update_connection_status(conn->id, "Method", r->method);
       uri = ap_getword_white(r->pool, &ll);
  @@ -1014,12 +1014,12 @@
       if (len > r->server->limit_req_line) {
           r->status    = HTTP_REQUEST_URI_TOO_LARGE;
           r->proto_num = HTTP_VERSION(1,0);
  -        r->protocol  = ap_pstrdup(r->pool, "HTTP/1.0");
  +        r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");
           return 0;
       }
   
       r->assbackwards = (ll[0] == '\0');
  -    r->protocol = ap_pstrdup(r->pool, ll[0] ? ll : "HTTP/0.9");
  +    r->protocol = apr_pstrdup(r->pool, ll[0] ? ll : "HTTP/0.9");
       ap_update_connection_status(conn->id, "Protocol", r->protocol);
   
       if (2 == sscanf(r->protocol, "HTTP/%u.%u", &major, &minor)
  @@ -1039,10 +1039,10 @@
       char *copy;
       int len;
       unsigned int fields_read = 0;
  -    ap_table_t *tmp_headers;
  +    apr_table_t *tmp_headers;
   
  -    /* We'll use ap_overlap_tables later to merge these into r->headers_in. */
  -    tmp_headers = ap_make_table(r->pool, 50);
  +    /* We'll use apr_overlap_tables later to merge these into r->headers_in. */
  +    tmp_headers = apr_make_table(r->pool, 50);
   
       /*
        * Read header lines until we get the empty separator line, a read error,
  @@ -1053,7 +1053,7 @@
           if (r->server->limit_req_fields &&
               (++fields_read > r->server->limit_req_fields)) {
               r->status = HTTP_BAD_REQUEST;
  -            ap_table_setn(r->notes, "error-notes",
  +            apr_table_setn(r->notes, "error-notes",
                             "The number of request header fields exceeds "
                             "this server's limit.<P>\n");
               return;
  @@ -1064,17 +1064,17 @@
            */
           if (len > r->server->limit_req_fieldsize) {
               r->status = HTTP_BAD_REQUEST;
  -            ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool,
  +            apr_table_setn(r->notes, "error-notes", apr_pstrcat(r->pool,
                   "Size of a request header field exceeds server limit.<P>\n"
                   "<PRE>\n", ap_escape_html(r->pool, field), "</PRE>\n", NULL));
               return;
           }
  -        copy = ap_palloc(r->pool, len + 1);
  +        copy = apr_palloc(r->pool, len + 1);
           memcpy(copy, field, len + 1);
   
           if (!(value = strchr(copy, ':'))) {     /* Find the colon separator */
               r->status = HTTP_BAD_REQUEST;       /* or abort the bad request */
  -            ap_table_setn(r->notes, "error-notes", ap_pstrcat(r->pool,
  +            apr_table_setn(r->notes, "error-notes", apr_pstrcat(r->pool,
                   "Request header field is missing colon separator.<P>\n"
                   "<PRE>\n", ap_escape_html(r->pool, copy), "</PRE>\n", NULL));
               return;
  @@ -1085,21 +1085,21 @@
           while (*value == ' ' || *value == '\t')
               ++value;            /* Skip to start of value   */
   
  -	ap_table_addn(tmp_headers, copy, value);
  +	apr_table_addn(tmp_headers, copy, value);
       }
   
  -    ap_overlap_tables(r->headers_in, tmp_headers, AP_OVERLAP_TABLES_MERGE);
  +    apr_overlap_tables(r->headers_in, tmp_headers, AP_OVERLAP_TABLES_MERGE);
   }
   
   request_rec *ap_read_request(conn_rec *conn)
   {
       request_rec *r;
  -    ap_pool_t *p;
  +    apr_pool_t *p;
       const char *expect;
       int access_status;
   
  -    ap_create_pool(&p, conn->pool);
  -    r = ap_pcalloc(p, sizeof(request_rec));
  +    apr_create_pool(&p, conn->pool);
  +    r = apr_pcalloc(p, sizeof(request_rec));
       r->pool            = p;
       r->connection      = conn;
       r->server          = conn->base_server;
  @@ -1110,11 +1110,11 @@
       r->user            = NULL;
       r->ap_auth_type    = NULL;
   
  -    r->headers_in      = ap_make_table(r->pool, 50);
  -    r->subprocess_env  = ap_make_table(r->pool, 50);
  -    r->headers_out     = ap_make_table(r->pool, 12);
  -    r->err_headers_out = ap_make_table(r->pool, 5);
  -    r->notes           = ap_make_table(r->pool, 5);
  +    r->headers_in      = apr_make_table(r->pool, 50);
  +    r->subprocess_env  = apr_make_table(r->pool, 50);
  +    r->headers_out     = apr_make_table(r->pool, 12);
  +    r->err_headers_out = apr_make_table(r->pool, 5);
  +    r->notes           = apr_make_table(r->pool, 5);
   
       r->request_config  = ap_create_request_config(r->pool);
       r->per_dir_config  = r->server->lookup_defaults;
  @@ -1128,7 +1128,7 @@
       r->the_request     = NULL;
   
   #ifdef APACHE_XLATE
  -    r->rrx = ap_pcalloc(p, sizeof(struct ap_rr_xlate));
  +    r->rrx = apr_pcalloc(p, sizeof(struct ap_rr_xlate));
       ap_set_content_xlate(r, 1, ap_locale_to_ascii);
       ap_set_content_xlate(r, 0, ap_locale_from_ascii);
   #endif /*APACHE_XLATE*/
  @@ -1195,7 +1195,7 @@
   
       if ((!r->hostname && (r->proto_num >= HTTP_VERSION(1,1))) ||
           ((r->proto_num == HTTP_VERSION(1,1)) &&
  -         !ap_table_get(r->headers_in, "Host"))) {
  +         !apr_table_get(r->headers_in, "Host"))) {
           /*
            * Client sent us an HTTP/1.1 or later request without telling us the
            * hostname, either with a full URL or a Host: header. We therefore
  @@ -1213,7 +1213,7 @@
           ap_run_log_transaction(r);
           return r;
       }
  -    if (((expect = ap_table_get(r->headers_in, "Expect")) != NULL) &&
  +    if (((expect = apr_table_get(r->headers_in, "Expect")) != NULL) &&
           (expect[0] != '\0')) {
           /*
            * The Expect header field was added to HTTP/1.1 after RFC 2068
  @@ -1266,10 +1266,10 @@
       rnew->status          = HTTP_OK;
   
       rnew->headers_in      = r->headers_in;
  -    rnew->subprocess_env  = ap_copy_table(rnew->pool, r->subprocess_env);
  -    rnew->headers_out     = ap_make_table(rnew->pool, 5);
  -    rnew->err_headers_out = ap_make_table(rnew->pool, 5);
  -    rnew->notes           = ap_make_table(rnew->pool, 5);
  +    rnew->subprocess_env  = apr_copy_table(rnew->pool, r->subprocess_env);
  +    rnew->headers_out     = apr_make_table(rnew->pool, 5);
  +    rnew->err_headers_out = apr_make_table(rnew->pool, 5);
  +    rnew->notes           = apr_make_table(rnew->pool, 5);
   
       rnew->expecting_100   = r->expecting_100;
       rnew->read_length     = r->read_length;
  @@ -1311,23 +1311,23 @@
       if (strcasecmp(ap_auth_type(r), "Basic"))
           ap_note_auth_failure(r);
       else
  -        ap_table_setn(r->err_headers_out,
  +        apr_table_setn(r->err_headers_out,
                     r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
  -                  ap_pstrcat(r->pool, "Basic realm=\"", ap_auth_name(r), "\"",
  +                  apr_pstrcat(r->pool, "Basic realm=\"", ap_auth_name(r), "\"",
                             NULL));
   }
   
   API_EXPORT(void) ap_note_digest_auth_failure(request_rec *r)
   {
  -    ap_table_setn(r->err_headers_out,
  +    apr_table_setn(r->err_headers_out,
   	    r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
  -	    ap_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%llx\"",
  +	    apr_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%llx\"",
   		ap_auth_name(r), r->request_time));
   }
   
   API_EXPORT(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
   {
  -    const char *auth_line = ap_table_get(r->headers_in,
  +    const char *auth_line = apr_table_get(r->headers_in,
                                         r->proxyreq ? "Proxy-Authorization"
                                                     : "Authorization");
       const char *t;
  @@ -1510,7 +1510,7 @@
        */
       if (r->proxyreq
           || (r->proto_num == HTTP_VERSION(1,0)
  -            && ap_table_get(r->subprocess_env, "force-response-1.0"))) {
  +            && apr_table_get(r->subprocess_env, "force-response-1.0"))) {
   
           protocol = "HTTP/1.0";
           r->connection->keepalive = -1;
  @@ -1527,13 +1527,13 @@
   
       (void) checked_bputstrs(r, protocol, " ", r->status_line, CRLF, NULL);
   
  -    date = ap_palloc(r->pool, AP_RFC822_DATE_LEN);
  -    ap_rfc822_date(date, r->request_time);
  +    date = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +    apr_rfc822_date(date, r->request_time);
       ap_send_header_field(r, "Date", date);
       ap_send_header_field(r, "Server", ap_get_server_version());
   
  -    ap_table_unset(r->headers_out, "Date");        /* Avoid bogosity */
  -    ap_table_unset(r->headers_out, "Server");
  +    apr_table_unset(r->headers_out, "Date");        /* Avoid bogosity */
  +    apr_table_unset(r->headers_out, "Server");
   #ifdef APACHE_XLATE
       AP_POP_OUTPUTCONVERSION_STATE(r->connection->client); }
   #endif /*APACHE_XLATE*/
  @@ -1572,7 +1572,7 @@
    */
   static char *make_allow(request_rec *r)
   {
  -    return 2 + ap_pstrcat(r->pool,
  +    return 2 + apr_pstrcat(r->pool,
                      (r->allowed & (1 << M_GET))       ? ", GET, HEAD" : "",
                      (r->allowed & (1 << M_POST))      ? ", POST"      : "",
                      (r->allowed & (1 << M_PUT))       ? ", PUT"       : "",
  @@ -1609,7 +1609,7 @@
   
       ap_rvputs(r, r->the_request, CRLF, NULL);
   
  -    ap_table_do((int (*) (void *, const char *, const char *))
  +    apr_table_do((int (*) (void *, const char *, const char *))
                   ap_send_header_field, (void *) r, r->headers_in, NULL);
       ap_rputs(CRLF, r);
   
  @@ -1625,11 +1625,11 @@
   
       ap_basic_http_header(r);
   
  -    ap_table_setn(r->headers_out, "Content-Length", "0");
  -    ap_table_setn(r->headers_out, "Allow", make_allow(r));
  +    apr_table_setn(r->headers_out, "Content-Length", "0");
  +    apr_table_setn(r->headers_out, "Allow", make_allow(r));
       ap_set_keepalive(r);
   
  -    ap_table_do((int (*) (void *, const char *, const char *)) ap_send_header_field,
  +    apr_table_do((int (*) (void *, const char *, const char *)) ap_send_header_field,
                (void *) r, r->headers_out, NULL);
   
       terminate_header(r);
  @@ -1649,12 +1649,12 @@
   static int use_range_x(request_rec *r)
   {
       const char *ua;
  -    return (ap_table_get(r->headers_in, "Request-Range") ||
  -            ((ua = ap_table_get(r->headers_in, "User-Agent"))
  +    return (apr_table_get(r->headers_in, "Request-Range") ||
  +            ((ua = apr_table_get(r->headers_in, "User-Agent"))
                && ap_strstr_c(ua, "MSIE 3")));
   }
   
  -/* This routine is called by ap_table_do and merges all instances of
  +/* This routine is called by apr_table_do and merges all instances of
    * the passed field values into a single array that will be further
    * processed by some later routine.  Originally intended to help split
    * and recombine multiple Vary fields, though it is generic to any field
  @@ -1662,15 +1662,15 @@
    */
   static int uniq_field_values(void *d, const char *key, const char *val)
   {
  -    ap_array_header_t *values;
  +    apr_array_header_t *values;
       char *start;
       char *e;
       char **strpp;
       int  i;
   
  -    values = (ap_array_header_t *)d;
  +    values = (apr_array_header_t *)d;
   
  -    e = ap_pstrdup(values->cont, val);
  +    e = apr_pstrdup(values->cont, val);
   
       do {
           /* Find a non-empty fieldname */
  @@ -1699,7 +1699,7 @@
               }
           }
           if (i == values->nelts) {  /* if not found */
  -           *(char **)ap_push_array(values) = start;
  +           *(char **)apr_push_array(values) = start;
           }
       } while (*e != '\0');
   
  @@ -1713,22 +1713,22 @@
    */
   static void fixup_vary(request_rec *r)
   {
  -    ap_array_header_t *varies;
  +    apr_array_header_t *varies;
   
  -    varies = ap_make_array(r->pool, 5, sizeof(char *));
  +    varies = apr_make_array(r->pool, 5, sizeof(char *));
   
       /* Extract all Vary fields from the headers_out, separate each into
        * its comma-separated fieldname values, and then add them to varies
        * if not already present in the array.
        */
  -    ap_table_do((int (*)(void *, const char *, const char *))uniq_field_values,
  +    apr_table_do((int (*)(void *, const char *, const char *))uniq_field_values,
   		(void *) varies, r->headers_out, "Vary", NULL);
   
       /* If we found any, replace old Vary fields with unique-ified value */
   
       if (varies->nelts > 0) {
  -	ap_table_setn(r->headers_out, "Vary",
  -		      ap_array_pstrcat(r->pool, varies, ','));
  +	apr_table_setn(r->headers_out, "Vary",
  +		      apr_array_pstrcat(r->pool, varies, ','));
       }
   }
   
  @@ -1765,7 +1765,7 @@
        * later attempts to set or unset a given fieldname might be bypassed.
        */
       if (!ap_is_empty_table(r->err_headers_out))
  -        r->headers_out = ap_overlay_tables(r->pool, r->err_headers_out,
  +        r->headers_out = apr_overlay_tables(r->pool, r->err_headers_out,
                                           r->headers_out);
   
       /*
  @@ -1773,10 +1773,10 @@
        * Since this will have nasty effects on HTTP/1.1 caches, force
        * the response into HTTP/1.0 mode.
        */
  -    if (ap_table_get(r->subprocess_env, "force-no-vary") != NULL) {
  -	ap_table_unset(r->headers_out, "Vary");
  +    if (apr_table_get(r->subprocess_env, "force-no-vary") != NULL) {
  +	apr_table_unset(r->headers_out, "Vary");
   	r->proto_num = HTTP_VERSION(1,0);
  -	ap_table_set(r->subprocess_env, "force-response-1.0", "1");
  +	apr_table_set(r->subprocess_env, "force-response-1.0", "1");
       }
       else {
   	fixup_vary(r);
  @@ -1792,42 +1792,42 @@
       ap_set_keepalive(r);
   
       if (r->chunked) {
  -        ap_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
  -        ap_table_unset(r->headers_out, "Content-Length");
  +        apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
  +        apr_table_unset(r->headers_out, "Content-Length");
       }
   
       if (r->byterange > 1)
  -        ap_table_setn(r->headers_out, "Content-Type",
  -                  ap_pstrcat(r->pool, "multipart", use_range_x(r) ? "/x-" : "/",
  +        apr_table_setn(r->headers_out, "Content-Type",
  +                  apr_pstrcat(r->pool, "multipart", use_range_x(r) ? "/x-" : "/",
                             "byteranges; boundary=", r->boundary, NULL));
  -    else ap_table_setn(r->headers_out, "Content-Type", make_content_type(r, 
  +    else apr_table_setn(r->headers_out, "Content-Type", make_content_type(r, 
   	r->content_type));
   
       if (r->content_encoding)
  -        ap_table_setn(r->headers_out, "Content-Encoding", r->content_encoding);
  +        apr_table_setn(r->headers_out, "Content-Encoding", r->content_encoding);
   
       if (r->content_languages && r->content_languages->nelts) {
           for (i = 0; i < r->content_languages->nelts; ++i) {
  -            ap_table_mergen(r->headers_out, "Content-Language",
  +            apr_table_mergen(r->headers_out, "Content-Language",
                           ((char **) (r->content_languages->elts))[i]);
           }
       }
       else if (r->content_language)
  -        ap_table_setn(r->headers_out, "Content-Language", r->content_language);
  +        apr_table_setn(r->headers_out, "Content-Language", r->content_language);
   
       /*
        * Control cachability for non-cachable responses if not already set by
        * some other part of the server configuration.
        */
  -    if (r->no_cache && !ap_table_get(r->headers_out, "Expires")) {
  -	date = ap_palloc(r->pool, AP_RFC822_DATE_LEN);
  -        ap_rfc822_date(date, r->request_time);
  -        ap_table_addn(r->headers_out, "Expires", date);
  +    if (r->no_cache && !apr_table_get(r->headers_out, "Expires")) {
  +	date = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +        apr_rfc822_date(date, r->request_time);
  +        apr_table_addn(r->headers_out, "Expires", date);
       }
   
  -    /* Send the entire ap_table_t of header fields, terminated by an empty line. */
  +    /* Send the entire apr_table_t of header fields, terminated by an empty line. */
   
  -    ap_table_do((int (*) (void *, const char *, const char *)) ap_send_header_field,
  +    apr_table_do((int (*) (void *, const char *, const char *)) ap_send_header_field,
                (void *) r, r->headers_out, NULL);
   
       terminate_header(r);
  @@ -1919,8 +1919,8 @@
   
   API_EXPORT(int) ap_setup_client_block(request_rec *r, int read_policy)
   {
  -    const char *tenc = ap_table_get(r->headers_in, "Transfer-Encoding");
  -    const char *lenp = ap_table_get(r->headers_in, "Content-Length");
  +    const char *tenc = apr_table_get(r->headers_in, "Transfer-Encoding");
  +    const char *lenp = apr_table_get(r->headers_in, "Content-Length");
       unsigned long max_body;
   
       r->read_body = read_policy;
  @@ -1976,7 +1976,7 @@
            * from looking at the MIME header. 
            * If no Content-Type header is found, text conversion is assumed.
            */
  -        const char *typep = ap_table_get(r->headers_in, "Content-Type");
  +        const char *typep = apr_table_get(r->headers_in, "Content-Type");
           int convert_in = (typep == NULL ||
                             strncasecmp(typep, "text/", 5) == 0 ||
                             strncasecmp(typep, "message/", 8) == 0 ||
  @@ -2049,11 +2049,11 @@
   API_EXPORT(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
   {
       int c;
  -    ap_size_t len_to_read;
  -    ap_ssize_t len_read;
  +    apr_size_t len_to_read;
  +    apr_ssize_t len_read;
       long chunk_start = 0;
       unsigned long max_body;
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if (!r->read_chunked) {     /* Content-length read */
           len_to_read = (r->remaining > bufsiz) ? bufsiz : r->remaining;
  @@ -2108,10 +2108,10 @@
           if (len_to_read == 0) { /* Last chunk indicated, get footers */
               if (r->read_body == REQUEST_CHUNKED_DECHUNK) {
                   get_mime_headers(r);
  -                ap_snprintf(buffer, bufsiz, "%ld", r->read_length);
  -                ap_table_unset(r->headers_in, "Transfer-Encoding");
  -                ap_table_setn(r->headers_in, "Content-Length",
  -                    ap_pstrdup(r->pool, buffer));
  +                apr_snprintf(buffer, bufsiz, "%ld", r->read_length);
  +                apr_table_unset(r->headers_in, "Transfer-Encoding");
  +                apr_table_setn(r->headers_in, "Content-Length",
  +                    apr_pstrdup(r->pool, buffer));
                   return 0;
               }
               r->remaining = -1;  /* Indicate footers in-progress */
  @@ -2252,13 +2252,13 @@
   }
   
   #if APR_HAS_SENDFILE
  -static ap_status_t static_send_file(ap_file_t *fd, request_rec *r, ap_off_t offset, 
  -                                    ap_size_t length, ap_size_t *nbytes) 
  +static apr_status_t static_send_file(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +                                    apr_size_t length, apr_size_t *nbytes) 
   {
  -    ap_int32_t flags = 0;
  -    ap_status_t rv;
  +    apr_int32_t flags = 0;
  +    apr_status_t rv;
       struct iovec iov;
  -    ap_hdtr_t hdtr;
  +    apr_hdtr_t hdtr;
   
       ap_bsetopt(r->connection->client, BO_TIMEOUT,
                  r->connection->keptalive
  @@ -2276,7 +2276,7 @@
       iov.iov_len =  r->connection->client->outcnt;
       r->connection->client->outcnt = 0;
   
  -    /* initialize the ap_hdtr_t struct */
  +    /* initialize the apr_hdtr_t struct */
       hdtr.headers = &iov;
       hdtr.numheaders = 1;
       hdtr.trailers = NULL;
  @@ -2308,13 +2308,13 @@
   /*
    * Send the body of a response to the client.
    */
  -API_EXPORT(ap_status_t) ap_send_fd(ap_file_t *fd, request_rec *r, ap_off_t offset, 
  -                                   ap_size_t length, ap_size_t *nbytes) 
  +API_EXPORT(apr_status_t) ap_send_fd(apr_file_t *fd, request_rec *r, apr_off_t offset, 
  +                                   apr_size_t length, apr_size_t *nbytes) 
   {
  -    ap_status_t rv = APR_SUCCESS;
  -    ap_size_t total_bytes_sent = 0;
  +    apr_status_t rv = APR_SUCCESS;
  +    apr_size_t total_bytes_sent = 0;
       register int o;
  -    ap_ssize_t n;
  +    apr_ssize_t n;
       char buf[IOBUFSIZE];
   
       if ((length == 0) || r->connection->aborted) {
  @@ -2344,10 +2344,10 @@
       /* Either sendfile is not defined or it failed with APR_ENOTIMPL */
       if (offset) {
           /* Seek the file to the offset */
  -        rv = ap_seek(fd, APR_SET, &offset);
  +        rv = apr_seek(fd, APR_SET, &offset);
           if (rv != APR_SUCCESS) {
               *nbytes = total_bytes_sent;
  -            /* ap_close(fd); close the file or let the caller handle it? */
  +            /* apr_close(fd); close the file or let the caller handle it? */
               return rv;
           }
       }
  @@ -2359,7 +2359,7 @@
               n = IOBUFSIZE;
           
           do {
  -            rv = ap_read(fd, buf, &n);
  +            rv = apr_read(fd, buf, &n);
           } while (rv == APR_EINTR && !r->connection->aborted);
   
           /* Is this still the right check? maybe check for n==0 or rv == APR_EOF? */
  @@ -2392,9 +2392,9 @@
       long total_bytes_sent = 0;
       long zero_timeout = 0;
       register int o;
  -    ap_ssize_t n;
  -    ap_ssize_t bytes_read;
  -    ap_status_t read_rv;
  +    apr_ssize_t n;
  +    apr_ssize_t bytes_read;
  +    apr_status_t read_rv;
   
       if (length == 0) {
           return 0;
  @@ -2430,7 +2430,7 @@
               (void) ap_rflush(r);
               break;
           }
  -        else if (ap_canonical_error(read_rv) != APR_EAGAIN) {
  +        else if (apr_canonical_error(read_rv) != APR_EAGAIN) {
               r->connection->aborted = 1;
               break;
           }
  @@ -2465,12 +2465,12 @@
   #endif
   
   /* send data from an in-memory buffer */
  -API_EXPORT(size_t) ap_send_mmap(ap_mmap_t *mm, request_rec *r, size_t offset,
  +API_EXPORT(size_t) ap_send_mmap(apr_mmap_t *mm, request_rec *r, size_t offset,
                                size_t length)
   {
       size_t total_bytes_sent = 0;
       int n;
  -    ap_ssize_t w;
  +    apr_ssize_t w;
       char *addr;
       
       if (length == 0)
  @@ -2486,7 +2486,7 @@
               n = length - offset;
           }
   
  -        ap_mmap_offset((void**)&addr, mm, offset);
  +        apr_mmap_offset((void**)&addr, mm, offset);
           w = ap_rwrite(addr, n, r);
           if (w < 0)
               break;
  @@ -2530,8 +2530,8 @@
   
   API_EXPORT(int) ap_rwrite(const void *buf, int nbyte, request_rec *r)
   {
  -    ap_ssize_t n;
  -    ap_status_t rv;
  +    apr_ssize_t n;
  +    apr_status_t rv;
   
       if (r->connection->aborted)
           return EOF;
  @@ -2606,7 +2606,7 @@
   
   API_EXPORT(int) ap_rflush(request_rec *r)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       if ((rv = ap_bflush(r->connection->client)) != APR_SUCCESS) {
           check_first_conn_error(r, "rflush", rv);
  @@ -2626,7 +2626,7 @@
       int status = r->status;
       int idx = ap_index_of_response(status);
       char *custom_response;
  -    const char *location = ap_table_get(r->headers_out, "Location");
  +    const char *location = apr_table_get(r->headers_out, "Location");
   
       /*
        * It's possible that the Location field might be in r->err_headers_out
  @@ -2634,7 +2634,7 @@
        * former.
        */
       if (location == NULL) {
  -	location = ap_table_get(r->err_headers_out, "Location");
  +	location = apr_table_get(r->err_headers_out, "Location");
       }
       /* We need to special-case the handling of 204 and 304 responses,
        * since they have specific HTTP requirements and do not include a
  @@ -2642,12 +2642,12 @@
        */
       if (status == HTTP_NOT_MODIFIED) {
           if (!ap_is_empty_table(r->err_headers_out))
  -            r->headers_out = ap_overlay_tables(r->pool, r->err_headers_out,
  +            r->headers_out = apr_overlay_tables(r->pool, r->err_headers_out,
                                                  r->headers_out);
           ap_basic_http_header(r);
           ap_set_keepalive(r);
   
  -        ap_table_do((int (*)(void *, const char *, const char *)) ap_send_header_field,
  +        apr_table_do((int (*)(void *, const char *, const char *)) ap_send_header_field,
                       (void *) r, r->headers_out,
                       "Connection",
                       "Keep-Alive",
  @@ -2673,7 +2673,7 @@
       }
   
       if (!r->assbackwards) {
  -        ap_table_t *tmp = r->headers_out;
  +        apr_table_t *tmp = r->headers_out;
   
           /* For all HTTP/1.x responses for which we generate the message,
            * we need to avoid inheriting the "normal status" header fields
  @@ -2682,11 +2682,11 @@
            */
           r->headers_out = r->err_headers_out;
           r->err_headers_out = tmp;
  -        ap_clear_table(r->err_headers_out);
  +        apr_clear_table(r->err_headers_out);
   
           if (ap_is_HTTP_REDIRECT(status) || (status == HTTP_CREATED)) {
               if ((location != NULL) && *location) {
  -	        ap_table_setn(r->headers_out, "Location", location);
  +	        apr_table_setn(r->headers_out, "Location", location);
               }
               else {
                   location = "";   /* avoids coredump when printing, below */
  @@ -2701,7 +2701,7 @@
   
           if ((status == HTTP_METHOD_NOT_ALLOWED)
               || (status == HTTP_NOT_IMPLEMENTED)) {
  -            ap_table_setn(r->headers_out, "Allow", make_allow(r));
  +            apr_table_setn(r->headers_out, "Allow", make_allow(r));
           }
   
           ap_send_http_header(r);
  @@ -2806,7 +2806,7 @@
   	case HTTP_BAD_REQUEST:
   	    ap_rputs("Your browser sent a request that "
   	             "this server could not understand.<P>\n", r);
  -	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	    if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   		ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
   	    break;
  @@ -2836,14 +2836,14 @@
   	case HTTP_MULTIPLE_CHOICES:
   	    {
   		const char *list;
  -		if ((list = ap_table_get(r->notes, "variant-list")))
  +		if ((list = apr_table_get(r->notes, "variant-list")))
   		    ap_rputs(list, r);
   	    }
   	    break;
   	case HTTP_LENGTH_REQUIRED:
   	    ap_rvputs(r, "A request of the requested method ", r->method,
   		      " requires a valid Content-length.<P>\n", NULL);
  -	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	    if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   		ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
   	    break;
  @@ -2856,14 +2856,14 @@
   	    ap_rvputs(r, ap_escape_html(r->pool, r->method), " to ",
   		      ap_escape_html(r->pool, r->uri),
   		      " not supported.<P>\n", NULL);
  -	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	    if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   		ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
   	    break;
   	case HTTP_BAD_GATEWAY:
   	    ap_rputs("The proxy server received an invalid" CRLF
   	             "response from an upstream server.<P>" CRLF, r);
  -	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	    if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   		ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
   	    break;
  @@ -2894,7 +2894,7 @@
   	case HTTP_REQUEST_URI_TOO_LARGE:
   	    ap_rputs("The requested URL's length exceeds the capacity\n"
   	             "limit for this server.<P>\n", r);
  -	    if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	    if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   		ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
   	    break;
  @@ -2911,7 +2911,7 @@
   	    ap_rvputs(r, "The expectation given in the Expect request-header"
   	              "\nfield could not be met by this server.<P>\n"
   	              "The client sent<PRE>\n    Expect: ",
  -	              ap_table_get(r->headers_in, "Expect"), "\n</PRE>\n"
  +	              apr_table_get(r->headers_in, "Expect"), "\n</PRE>\n"
   	              "but we only allow the 100-continue expectation.\n",
   	              NULL);
   	    break;
  @@ -2958,8 +2958,8 @@
   	     * that is totally safe for any user to see (ie lacks paths,
   	     * database passwords, etc.)
   	     */
  -	    if (((error_notes = ap_table_get(r->notes, "error-notes")) != NULL)
  -		&& (h1 = ap_table_get(r->notes, "verbose-error-to")) != NULL
  +	    if (((error_notes = apr_table_get(r->notes, "error-notes")) != NULL)
  +		&& (h1 = apr_table_get(r->notes, "verbose-error-to")) != NULL
   		&& (strcmp(h1, "*") == 0)) {
   	        ap_rvputs(r, error_notes, "<P>\n", NULL);
   	    }
  @@ -2984,7 +2984,7 @@
   	  * which some people consider to be a breach of privacy.  Until we
   	  * can figure out a way to remove the pathname, leave this commented.
   	  *
  -	  * if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  +	  * if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
   	  *     ap_rvputs(r, error_notes, "<P>\n", NULL);
   	  * }
   	  */
  
  
  
  1.38      +42 -42    apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- http_request.c	2000/07/28 20:31:01	1.37
  +++ http_request.c	2000/08/02 05:26:48	1.38
  @@ -140,13 +140,13 @@
   }
   
   
  -static int check_symlinks(char *d, int opts, ap_pool_t *p)
  +static int check_symlinks(char *d, int opts, apr_pool_t *p)
   {
   #if defined(OS2) || defined(WIN32)
       /* OS/2 doesn't have symlinks */
       return OK;
   #else
  -    ap_finfo_t lfi, fi;
  +    apr_finfo_t lfi, fi;
       char *lastp;
       int res;
   
  @@ -172,7 +172,7 @@
       else
           lastp = NULL;
   
  -    res = ap_lstat(&lfi, d, p);
  +    res = apr_lstat(&lfi, d, p);
   
       if (lastp)
           *lastp = '/';
  @@ -190,7 +190,7 @@
       if (!(opts & OPT_SYM_OWNER))
           return HTTP_FORBIDDEN;
   
  -    if (ap_stat(&fi, d, p) < 0)
  +    if (apr_stat(&fi, d, p) < 0)
           return HTTP_FORBIDDEN;
   
       return (fi.user == lfi.user) ? OK : HTTP_FORBIDDEN;
  @@ -271,7 +271,7 @@
            }
            else {
                errno = 0;
  -             rv = ap_stat(&r->finfo, path, r->pool);
  +             rv = apr_stat(&r->finfo, path, r->pool);
            }
   
           if (cp != end)
  @@ -289,7 +289,7 @@
                   cp = last_cp;
               }
   
  -            r->path_info = ap_pstrdup(r->pool, cp);
  +            r->path_info = apr_pstrdup(r->pool, cp);
               *cp = '\0';
               return OK;
           }
  @@ -297,7 +297,7 @@
   	 * even if they returned an error.
   	 */
   	r->finfo.protection = 0;
  -	rvc = ap_canonical_error(rv);
  +	rvc = apr_canonical_error(rv);
   
   #if defined(APR_ENOENT) && defined(APR_ENOTDIR)
           if (rvc == APR_ENOENT || rvc == APR_ENOTDIR) {
  @@ -366,7 +366,7 @@
        */
   
       if (r->filename == NULL) {
  -        r->filename = ap_pstrdup(r->pool, r->uri);
  +        r->filename = apr_pstrdup(r->pool, r->uri);
           r->finfo.protection = 0;   /* Not really a file... */
           r->finfo.filetype = APR_NOFILE;
           r->per_dir_config = per_dir_defaults;
  @@ -405,7 +405,7 @@
                       this_conf = entry_config;
               }
               else if (entry_core->d_is_fnmatch) {
  -                if (!ap_fnmatch(entry_dir, r->filename, 0))
  +                if (!apr_fnmatch(entry_dir, r->filename, 0))
                       this_conf = entry_config;
               }
               else if (!strncmp(r->filename, entry_dir, strlen(entry_dir)))
  @@ -431,7 +431,7 @@
   
       r->filename   = ap_os_canonical_filename(r->pool, r->filename);
   
  -    test_filename = ap_pstrdup(r->pool, r->filename);
  +    test_filename = apr_pstrdup(r->pool, r->filename);
   
       ap_no2slash(test_filename);
       num_dirs = ap_count_dirs(test_filename);
  @@ -460,7 +460,7 @@
        * We need 2 extra bytes, one for trailing \0 and one because
        * make_dirstr_prefix will add potentially one extra /.
        */
  -    test_dirname = ap_palloc(r->pool, test_filename_len + 2);
  +    test_dirname = apr_palloc(r->pool, test_filename_len + 2);
   
       iStart = 1;
   #ifdef WIN32
  @@ -517,7 +517,7 @@
   
               this_conf = NULL;
               if (entry_core->d_is_fnmatch) {
  -                if (!ap_fnmatch(entry_dir, test_dirname, FNM_PATHNAME)) {
  +                if (!apr_fnmatch(entry_dir, test_dirname, FNM_PATHNAME)) {
                       this_conf = entry_config;
                   }
               }
  @@ -540,7 +540,7 @@
               void *htaccess_conf = NULL;
   
               res = ap_parse_htaccess(&htaccess_conf, r, overrides_here,
  -                                 ap_pstrdup(r->pool, test_dirname),
  +                                 apr_pstrdup(r->pool, test_dirname),
                                    sconf->access_name);
               if (res)
                   return res;
  @@ -621,7 +621,7 @@
   	test_location = r->uri;
       }
       else {
  -	test_location = ap_pstrdup(r->pool, r->uri);
  +	test_location = apr_pstrdup(r->pool, r->uri);
   	ap_no2slash(test_location);
       }
   
  @@ -647,7 +647,7 @@
   		this_conf = entry_config;
   	}
   	else if (entry_core->d_is_fnmatch) {
  -	    if (!ap_fnmatch(entry_url, test_location, FNM_PATHNAME)) {
  +	    if (!apr_fnmatch(entry_url, test_location, FNM_PATHNAME)) {
   		this_conf = entry_config;
   	    }
   	}
  @@ -708,7 +708,7 @@
                       this_conf = entry_config;
               }
               else if (entry_core->d_is_fnmatch) {
  -                if (!ap_fnmatch(entry_file, test_file, FNM_PATHNAME)) {
  +                if (!apr_fnmatch(entry_file, test_file, FNM_PATHNAME)) {
                       this_conf = entry_config;
                   }
               }
  @@ -744,11 +744,11 @@
   
   static request_rec *make_sub_request(const request_rec *r)
   {
  -    ap_pool_t *rrp;
  +    apr_pool_t *rrp;
       request_rec *rr;
       
  -    ap_create_pool(&rrp, r->pool);
  -    rr = ap_pcalloc(rrp, sizeof(request_rec));
  +    apr_create_pool(&rrp, r->pool);
  +    rr = apr_pcalloc(rrp, sizeof(request_rec));
       rr->pool = rrp;
       return rr;
   }
  @@ -881,7 +881,7 @@
           rnew->filename = ap_make_full_path(rnew->pool, fdir, new_file);
           ap_parse_uri(rnew, rnew->uri);    /* fill in parsed_uri values */
   
  -        if (ap_stat(&rnew->finfo, rnew->filename, rnew->pool) != APR_SUCCESS) {
  +        if (apr_stat(&rnew->finfo, rnew->filename, rnew->pool) != APR_SUCCESS) {
               rnew->finfo.protection = 0;
           }
   
  @@ -936,7 +936,7 @@
            */
           rnew->uri = "INTERNALLY GENERATED file-relative req";
           rnew->filename = ((ap_os_is_path_absolute(new_file)) ?
  -                          ap_pstrdup(rnew->pool, new_file) :
  +                          apr_pstrdup(rnew->pool, new_file) :
                             ap_make_full_path(rnew->pool, fdir, new_file));
           rnew->per_dir_config = r->server->lookup_defaults;
           res = directory_walk(rnew);
  @@ -977,7 +977,7 @@
   #else /*APACHE_XLATE*/
       {
           /* Save the output conversion setting across subrequests */
  -        ap_xlate_t *saved_xlate;
  +        apr_xlate_t *saved_xlate;
   
           ap_bgetopt(r->connection->client, BO_WXLATE, &saved_xlate);
           retval  = ap_invoke_handler(r);
  @@ -991,7 +991,7 @@
   API_EXPORT(void) ap_destroy_sub_req(request_rec *r)
   {
       /* Reclaim the space */
  -    ap_destroy_pool(r->pool);
  +    apr_destroy_pool(r->pool);
   }
   
   /*****************************************************************
  @@ -1064,7 +1064,7 @@
                * status...
                */
               r->status = HTTP_MOVED_TEMPORARILY;
  -            ap_table_setn(r->headers_out, "Location", custom_response);
  +            apr_table_setn(r->headers_out, "Location", custom_response);
           }
           else if (custom_response[0] == '/') {
               const char *error_notes;
  @@ -1074,17 +1074,17 @@
                * This redirect needs to be a GET no matter what the original
                * method was.
                */
  -            ap_table_setn(r->subprocess_env, "REQUEST_METHOD", r->method);
  +            apr_table_setn(r->subprocess_env, "REQUEST_METHOD", r->method);
   
   	    /*
   	     * Provide a special method for modules to communicate
   	     * more informative (than the plain canned) messages to us.
   	     * Propagate them to ErrorDocuments via the ERROR_NOTES variable:
   	     */
  -            if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
  -		ap_table_setn(r->subprocess_env, "ERROR_NOTES", error_notes);
  +            if ((error_notes = apr_table_get(r->notes, "error-notes")) != NULL) {
  +		apr_table_setn(r->subprocess_env, "ERROR_NOTES", error_notes);
   	    }
  -            r->method = ap_pstrdup(r->pool, "GET");
  +            r->method = apr_pstrdup(r->pool, "GET");
               r->method_number = M_GET;
               ap_internal_redirect(custom_response, r);
               return;
  @@ -1118,7 +1118,7 @@
   {
       /* Is there a require line configured for the type of *this* req? */
   
  -    const ap_array_header_t *reqs_arr = ap_requires(r);
  +    const apr_array_header_t *reqs_arr = ap_requires(r);
       require_line *reqs;
       int i;
   
  @@ -1173,7 +1173,7 @@
   	}
       }
   
  -    if (r->proto_num > HTTP_VERSION(1,0) && ap_table_get(r->subprocess_env, "downgrade-1.0")) {
  +    if (r->proto_num > HTTP_VERSION(1,0) && apr_table_get(r->subprocess_env, "downgrade-1.0")) {
           r->proto_num = HTTP_VERSION(1,0);
       }
   
  @@ -1295,17 +1295,17 @@
       ap_run_log_transaction(r);
   }
   
  -static ap_table_t *rename_original_env(ap_pool_t *p, ap_table_t *t)
  +static apr_table_t *rename_original_env(apr_pool_t *p, apr_table_t *t)
   {
  -    ap_array_header_t *env_arr = ap_table_elts(t);
  -    ap_table_entry_t *elts = (ap_table_entry_t *) env_arr->elts;
  -    ap_table_t *new = ap_make_table(p, env_arr->nalloc);
  +    apr_array_header_t *env_arr = ap_table_elts(t);
  +    apr_table_entry_t *elts = (apr_table_entry_t *) env_arr->elts;
  +    apr_table_t *new = apr_make_table(p, env_arr->nalloc);
       int i;
   
       for (i = 0; i < env_arr->nelts; ++i) {
           if (!elts[i].key)
               continue;
  -        ap_table_setn(new, ap_pstrcat(p, "REDIRECT_", elts[i].key, NULL),
  +        apr_table_setn(new, apr_pstrcat(p, "REDIRECT_", elts[i].key, NULL),
                     elts[i].val);
       }
   
  @@ -1315,7 +1315,7 @@
   static request_rec *internal_internal_redirect(const char *new_uri, request_rec *r)
   {
       int access_status;
  -    request_rec *new = (request_rec *) ap_pcalloc(r->pool, sizeof(request_rec));
  +    request_rec *new = (request_rec *) apr_pcalloc(r->pool, sizeof(request_rec));
   
       new->connection = r->connection;
       new->server     = r->server;
  @@ -1352,10 +1352,10 @@
       new->main            = r->main;
   
       new->headers_in      = r->headers_in;
  -    new->headers_out     = ap_make_table(r->pool, 12);
  +    new->headers_out     = apr_make_table(r->pool, 12);
       new->err_headers_out = r->err_headers_out;
       new->subprocess_env  = rename_original_env(r->pool, r->subprocess_env);
  -    new->notes           = ap_make_table(r->pool, 5);
  +    new->notes           = apr_make_table(r->pool, 5);
   
       new->htaccess        = r->htaccess;
       new->no_cache        = r->no_cache;
  @@ -1364,8 +1364,8 @@
       new->read_length     = r->read_length;     /* We can only read it once */
       new->vlist_validator = r->vlist_validator;
   
  -    ap_table_setn(new->subprocess_env, "REDIRECT_STATUS",
  -	ap_psprintf(r->pool, "%d", r->status));
  +    apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
  +	apr_psprintf(r->pool, "%d", r->status));
   
       /*
        * XXX: hmm.  This is because mod_setenvif and mod_unique_id really need
  @@ -1378,7 +1378,7 @@
       }
   
   #ifdef APACHE_XLATE
  -    new->rrx = ap_pcalloc(new->pool, sizeof(struct ap_rr_xlate));
  +    new->rrx = apr_pcalloc(new->pool, sizeof(struct ap_rr_xlate));
       ap_set_content_xlate(new, 1, ap_locale_to_ascii);
       ap_set_content_xlate(new, 0, ap_locale_from_ascii);
   #endif /*APACHE_XLATE*/
  @@ -1419,7 +1419,7 @@
    * Function to set the r->mtime field to the specified value if it's later
    * than what's already there.
    */
  -API_EXPORT(void) ap_update_mtime(request_rec *r, ap_time_t dependency_mtime)
  +API_EXPORT(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime)
   {
       if (r->mtime < dependency_mtime) {
   	r->mtime = dependency_mtime;
  
  
  
  1.25      +43 -43    apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- http_vhost.c	2000/07/21 19:50:47	1.24
  +++ http_vhost.c	2000/08/02 05:26:48	1.25
  @@ -117,7 +117,7 @@
       				 * sharing this address */
   };
   
  -/* This defines the size of the hash ap_table_t used for hashing ip addresses
  +/* This defines the size of the hash apr_table_t used for hashing ip addresses
    * of virtual hosts.  It must be a power of two.
    */
   #ifndef IPHASH_TABLE_SIZE
  @@ -167,7 +167,7 @@
   
   
   /* called at the beginning of the config */
  -void ap_init_vhost_config(ap_pool_t *p)
  +void ap_init_vhost_config(apr_pool_t *p)
   {
       memset(iphash_table, 0, sizeof(iphash_table));
       default_list = NULL;
  @@ -183,7 +183,7 @@
    * *paddr is the variable used to keep track of **paddr between calls
    * port is the default port to assume
    */
  -static const char *get_addresses(ap_pool_t *p, const char *w_,
  +static const char *get_addresses(apr_pool_t *p, const char *w_,
   				 server_addr_rec ***paddr, unsigned port)
   {
       struct hostent *hep;
  @@ -196,7 +196,7 @@
       if (*w_ == 0)
   	return NULL;
   
  -    w=ap_pstrdup(p, w_);
  +    w=apr_pstrdup(p, w_);
       t = strchr(w, ':');
       if (t) {
   	if (strcmp(t + 1, "*") == 0) {
  @@ -225,12 +225,12 @@
   	is_an_ip_addr = 1;
       }
       if (is_an_ip_addr) {
  -	sar = ap_pcalloc(p, sizeof(server_addr_rec));
  +	sar = apr_pcalloc(p, sizeof(server_addr_rec));
   	**paddr = sar;
   	*paddr = &sar->next;
   	sar->host_addr.s_addr = my_addr;
   	sar->host_port = port;
  -	sar->virthost = ap_pstrdup(p, w);
  +	sar->virthost = apr_pstrdup(p, w);
   	return NULL;
       }
   
  @@ -243,12 +243,12 @@
       }
   
       for (i = 0; hep->h_addr_list[i]; ++i) {
  -	sar = ap_pcalloc(p, sizeof(server_addr_rec));
  +	sar = apr_pcalloc(p, sizeof(server_addr_rec));
   	**paddr = sar;
   	*paddr = &sar->next;
   	sar->host_addr = *(struct in_addr *) hep->h_addr_list[i];
   	sar->host_port = port;
  -	sar->virthost = ap_pstrdup(p, w);
  +	sar->virthost = apr_pstrdup(p, w);
       }
   
       return NULL;
  @@ -256,7 +256,7 @@
   
   
   /* parse the <VirtualHost> addresses */
  -const char *ap_parse_vhost_addrs(ap_pool_t *p, const char *hostname, server_rec *s)
  +const char *ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s)
   {
       server_addr_rec **addrs;
       const char *err;
  @@ -291,7 +291,7 @@
   }
   
   
  -/* hash ap_table_t statistics, keep this in here for the beta period so
  +/* hash apr_table_t statistics, keep this in here for the beta period so
    * we can find out if the hash function is ok
    */
   #ifdef IPHASH_STATISTICS
  @@ -322,14 +322,14 @@
   	}
       }
       qsort(count, IPHASH_TABLE_SIZE, sizeof(count[0]), iphash_compare);
  -    p = buf + ap_snprintf(buf, sizeof(buf),
  +    p = buf + apr_snprintf(buf, sizeof(buf),
   		    "iphash: total hashed = %u, avg chain = %u, "
   		    "chain lengths (count x len):",
   		    total, total / IPHASH_TABLE_SIZE);
       total = 1;
       for (i = 1; i < IPHASH_TABLE_SIZE; ++i) {
   	if (count[i - 1] != count[i]) {
  -	    p += ap_snprintf(p, sizeof(buf) - (p - buf), " %ux%u",
  +	    p += apr_snprintf(p, sizeof(buf) - (p - buf), " %ux%u",
   			     total, count[i - 1]);
   	    total = 1;
   	}
  @@ -337,7 +337,7 @@
   	    ++total;
   	}
       }
  -    p += ap_snprintf(p, sizeof(buf) - (p - buf), " %ux%u",
  +    p += apr_snprintf(p, sizeof(buf) - (p - buf), " %ux%u",
   		     total, count[IPHASH_TABLE_SIZE - 1]);
       ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, main_s, buf);
   }
  @@ -362,12 +362,12 @@
   
   
   
  -static ipaddr_chain *new_ipaddr_chain(ap_pool_t *p,
  +static ipaddr_chain *new_ipaddr_chain(apr_pool_t *p,
   				    server_rec *s, server_addr_rec *sar)
   {
       ipaddr_chain *new;
   
  -    new = ap_palloc(p, sizeof(*new));
  +    new = apr_palloc(p, sizeof(*new));
       new->names = NULL;
       new->server = s;
       new->sar = sar;
  @@ -376,11 +376,11 @@
   }
   
   
  -static name_chain *new_name_chain(ap_pool_t *p, server_rec *s, server_addr_rec *sar)
  +static name_chain *new_name_chain(apr_pool_t *p, server_rec *s, server_addr_rec *sar)
   {
       name_chain *new;
   
  -    new = ap_palloc(p, sizeof(*new));
  +    new = apr_palloc(p, sizeof(*new));
       new->server = s;
       new->sar = sar;
       new->next = NULL;
  @@ -395,7 +395,7 @@
       ipaddr_chain *trav;
       unsigned addr;
   
  -    /* scan the hash ap_table_t for an exact match first */
  +    /* scan the hash apr_table_t for an exact match first */
       addr = server_ip->s_addr;
       bucket = hash_inaddr(addr);
       for (trav = iphash_table[bucket]; trav; trav = trav->next) {
  @@ -425,41 +425,41 @@
       return NULL;
   }
   
  -static void dump_vhost_config(ap_file_t *f)
  +static void dump_vhost_config(apr_file_t *f)
   {
       int i;
       ipaddr_chain *ic;
       name_chain *nc;
       char buf[MAX_STRING_LEN];
   
  -    ap_fprintf(f, "VirtualHost configuration:\n");
  +    apr_fprintf(f, "VirtualHost configuration:\n");
       for (i = 0; i < IPHASH_TABLE_SIZE; ++i) {
   	for (ic = iphash_table[i]; ic; ic = ic->next) {
   	    if (ic->sar->host_port == 0) {
  -		ap_snprintf(buf, sizeof(buf), "%pA:*", &ic->sar->host_addr);
  +		apr_snprintf(buf, sizeof(buf), "%pA:*", &ic->sar->host_addr);
   	    }
   	    else {
  -		ap_snprintf(buf, sizeof(buf), "%pA:%u", &ic->sar->host_addr,
  +		apr_snprintf(buf, sizeof(buf), "%pA:%u", &ic->sar->host_addr,
   		    ic->sar->host_port);
   	    }
   	    if (ic->names == NULL) {
  -		ap_fprintf(f, "%-22s %s (%s:%u)\n", buf,
  +		apr_fprintf(f, "%-22s %s (%s:%u)\n", buf,
   		    ic->server->server_hostname, ic->server->defn_name,
   		    ic->server->defn_line_number);
   		continue;
   	    }
  -	    ap_fprintf(f, "%-22s is a NameVirtualHost\n"
  +	    apr_fprintf(f, "%-22s is a NameVirtualHost\n"
   	               "%22s default server %s (%s:%u)\n",
   		       buf, "", ic->server->server_hostname,
   		       ic->server->defn_name, ic->server->defn_line_number);
   	    for (nc = ic->names; nc; nc = nc->next) {
   		if (nc->sar->host_port) {
  -		    ap_fprintf(f, "%22s port %u ", "", nc->sar->host_port);
  +		    apr_fprintf(f, "%22s port %u ", "", nc->sar->host_port);
   		}
   		else {
  -		    ap_fprintf(f, "%22s port * ", "");
  +		    apr_fprintf(f, "%22s port * ", "");
   		}
  -		ap_fprintf(f, "namevhost %s (%s:%u)\n",
  +		apr_fprintf(f, "namevhost %s (%s:%u)\n",
   			nc->server->server_hostname,
   			nc->server->defn_name,
   			nc->server->defn_line_number);
  @@ -467,15 +467,15 @@
   	}
       }
       if (default_list) {
  -	ap_fprintf(f, "_default_ servers:\n");
  +	apr_fprintf(f, "_default_ servers:\n");
   	for (ic = default_list; ic; ic = ic->next) {
   	    if (ic->sar->host_port == 0) {
  -		ap_fprintf(f, "port * ");
  +		apr_fprintf(f, "port * ");
   	    }
   	    else {
  -		ap_fprintf(f, "port %u ", ic->sar->host_port);
  +		apr_fprintf(f, "port %u ", ic->sar->host_port);
   	    }
  -	    ap_fprintf(f, "server %s (%s:%u)\n",
  +	    apr_fprintf(f, "server %s (%s:%u)\n",
   		ic->server->server_hostname, ic->server->defn_name,
   		ic->server->defn_line_number);
   	}
  @@ -483,7 +483,7 @@
   }
   
   /* compile the tables and such we need to do the run-time vhost lookups */
  -void ap_fini_vhost_config(ap_pool_t *p, server_rec *main_s)
  +void ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s)
   {
       server_addr_rec *sar;
       int has_default_vhost_addr;
  @@ -506,7 +506,7 @@
   	iphash_table_tail[i] = &iphash_table[i];
       }
   
  -    /* The first things to go into the hash ap_table_t are the NameVirtualHosts
  +    /* The first things to go into the hash apr_table_t are the NameVirtualHosts
        * Since name_vhost_list is in the same order that the directives
        * occured in the config file, we'll copy it in that order.
        */
  @@ -522,7 +522,7 @@
   	 */
       }
   
  -    /* The next things to go into the hash ap_table_t are the virtual hosts
  +    /* The next things to go into the hash apr_table_t are the virtual hosts
        * themselves.  They're listed off of main_s->next in the reverse
        * order they occured in the config file, so we insert them at
        * the iphash_table_tail but don't advance the tail.
  @@ -608,14 +608,14 @@
   		    DNS in the VirtualHost statement.  It's disabled
   		    anyhow by the host matching code.  -djg */
   		s->server_hostname =
  -		    ap_pstrdup(p, "bogus_host_without_forward_dns");
  +		    apr_pstrdup(p, "bogus_host_without_forward_dns");
   	    }
   	    else {
   		struct hostent *h;
   
   		if ((h = gethostbyaddr((char *) &(s->addrs->host_addr),
   					sizeof(struct in_addr), AF_INET))) {
  -		    s->server_hostname = ap_pstrdup(p, (char *) h->h_name);
  +		    s->server_hostname = apr_pstrdup(p, (char *) h->h_name);
   		}
   		else {
   		    /* again, what can we do?  They didn't specify a
  @@ -626,7 +626,7 @@
   			    "ServerName",
   			    inet_ntoa(s->addrs->host_addr));
   		    s->server_hostname =
  -			ap_pstrdup(p, "bogus_host_without_reverse_dns");
  +			apr_pstrdup(p, "bogus_host_without_reverse_dns");
   		}
   	    }
   	}
  @@ -663,8 +663,8 @@
       dump_iphash_statistics(main_s);
   #endif
       if (getenv("DUMP_VHOSTS")) {
  -        ap_file_t *thefile = NULL;
  -        ap_open_stderr(&thefile, p);
  +        apr_file_t *thefile = NULL;
  +        apr_open_stderr(&thefile, p);
   	dump_vhost_config(thefile);
       }
   }
  @@ -679,7 +679,7 @@
    */
   static void fix_hostname(request_rec *r)
   {
  -    char *host = ap_palloc(r->pool, strlen(r->hostname) + 1);
  +    char *host = apr_palloc(r->pool, strlen(r->hostname) + 1);
       const char *src;
       char *dst;
   
  @@ -726,7 +726,7 @@
   static int matches_aliases(server_rec *s, const char *host)
   {
       int i;
  -    ap_array_header_t *names;
  +    apr_array_header_t *names;
   
       /* match ServerName */
       if (!strcasecmp(host, s->server_hostname)) {
  @@ -919,7 +919,7 @@
   void ap_update_vhost_from_headers(request_rec *r)
   {
       /* must set this for HTTP/1.1 support */
  -    if (r->hostname || (r->hostname = ap_table_get(r->headers_in, "Host"))) {
  +    if (r->hostname || (r->hostname = apr_table_get(r->headers_in, "Host"))) {
   	fix_hostname(r);
   	if (r->status != HTTP_OK)
   	    return;
  @@ -942,7 +942,7 @@
       ipaddr_chain *trav;
       unsigned port = ntohs(conn->local_addr.sin_port);
   
  -    /* scan the hash ap_table_t for an exact match first */
  +    /* scan the hash apr_table_t for an exact match first */
       trav = find_ipaddr(&conn->local_addr.sin_addr, port);
       if (trav) {
   	/* save the name_chain for later in case this is a name-vhost */
  
  
  
  1.20      +17 -17    apache-2.0/src/main/iol_file.c
  
  Index: iol_file.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- iol_file.c	2000/05/29 04:22:05	1.19
  +++ iol_file.c	2000/08/02 05:26:48	1.20
  @@ -69,11 +69,11 @@
   
   typedef struct {
       ap_iol iol;
  -    ap_file_t *file;
  +    apr_file_t *file;
   } iol_file;
   
   #define method(syscall, args)	\
  -    static ap_status_t file_##syscall args \
  +    static apr_status_t file_##syscall args \
       { \
   	iol_file *iol = (iol_file *)viol; \
   	*nbytes = arg2; \
  @@ -82,52 +82,52 @@
   	return syscall(iol->file, (void*)arg1, nbytes); \
       }
   
  -method(ap_write, (ap_iol *viol, const char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
  -method(ap_read, (ap_iol *viol, char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
  +method(apr_write, (ap_iol *viol, const char *arg1, apr_size_t arg2, apr_ssize_t *nbytes))
  +method(apr_read, (ap_iol *viol, char *arg1, apr_size_t arg2, apr_ssize_t *nbytes))
   
  -static ap_status_t file_ap_writev(ap_iol *viol, const struct iovec *vec, ap_size_t nvec, 
  -                                  ap_ssize_t *nbytes) 
  +static apr_status_t file_apr_writev(ap_iol *viol, const struct iovec *vec, apr_size_t nvec, 
  +                                  apr_ssize_t *nbytes) 
   {
       iol_file *iol = (iol_file *) viol;
  -    return ap_writev(iol->file, vec, nvec, nbytes);
  +    return apr_writev(iol->file, vec, nvec, nbytes);
   }
   
   
   /* This function will clean-up the iol struct and close the file... */
  -static ap_status_t file_close(ap_iol *viol)
  +static apr_status_t file_close(ap_iol *viol)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
       iol_file *iol = (iol_file *)viol;
  -    rv = ap_close(iol->file);
  +    rv = apr_close(iol->file);
       free(iol);
   
       return rv;
   }
   
  -static ap_status_t file_setopt(ap_iol *viol, ap_iol_option opt,
  +static apr_status_t file_setopt(ap_iol *viol, ap_iol_option opt,
                                  const void *value)
   {
       iol_file *iol = (iol_file *)viol;
   
       switch (opt) {
       case AP_IOL_TIMEOUT:
  -        return ap_set_pipe_timeout(iol->file, 
  +        return apr_set_pipe_timeout(iol->file, 
   				   *(const int*)value * AP_USEC_PER_SEC);
       default:
           return APR_EINVAL;
       }
   }
   
  -static ap_status_t file_getopt(ap_iol *viol, ap_iol_option opt, void *value)
  +static apr_status_t file_getopt(ap_iol *viol, ap_iol_option opt, void *value)
   {
       return APR_EINVAL;
   }
   
   static const ap_iol_methods file_methods = {
       file_close,
  -    file_ap_write,
  -    file_ap_writev,
  -    file_ap_read,
  +    file_apr_write,
  +    file_apr_writev,
  +    file_apr_read,
       file_setopt,
       file_getopt,
       NULL,
  @@ -137,7 +137,7 @@
   /*
    * Create an ap_iol struct given an apr_file_t
    */
  -ap_iol *ap_create_file_iol(ap_file_t *file)
  +ap_iol *ap_create_file_iol(apr_file_t *file)
   {
       iol_file *iol;
       iol = malloc(sizeof(iol_file));
  
  
  
  1.10      +25 -25    apache-2.0/src/main/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_socket.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- iol_socket.c	2000/08/01 17:57:56	1.9
  +++ iol_socket.c	2000/08/02 05:26:48	1.10
  @@ -71,17 +71,17 @@
   
   typedef struct {
       ap_iol iol;
  -    ap_socket_t *sock;
  +    apr_socket_t *sock;
   } iol_socket;
   
  -static ap_status_t socket_setopt(ap_iol *viol, ap_iol_option opt,
  +static apr_status_t socket_setopt(ap_iol *viol, ap_iol_option opt,
                                  const void *value)
   {
       iol_socket *iol = (iol_socket *)viol;
   
       switch (opt) {
       case AP_IOL_TIMEOUT:
  -        ap_setsocketopt(iol->sock, APR_SO_TIMEOUT, 
  +        apr_setsocketopt(iol->sock, APR_SO_TIMEOUT, 
                           *(const int*)value * AP_USEC_PER_SEC);
           break;
       default:
  @@ -90,14 +90,14 @@
       return APR_SUCCESS;
   }
   
  -static ap_status_t socket_getopt(ap_iol *viol, ap_iol_option opt, void *value)
  +static apr_status_t socket_getopt(ap_iol *viol, ap_iol_option opt, void *value)
   {
       iol_socket *iol = (iol_socket *)viol;
   
       switch (opt) {
       case AP_IOL_TIMEOUT:
  -        ap_getsocketopt(iol->sock, APR_SO_TIMEOUT, (ap_int32_t *) value);
  -        (*(ap_int32_t *)value) /= AP_USEC_PER_SEC;
  +        apr_getsocketopt(iol->sock, APR_SO_TIMEOUT, (apr_int32_t *) value);
  +        (*(apr_int32_t *)value) /= AP_USEC_PER_SEC;
           break;
       default:
           return APR_EINVAL;
  @@ -106,47 +106,47 @@
   }
   
   
  -static ap_status_t socket_write(ap_iol *viol, const char* buf, ap_size_t size,
  -     ap_ssize_t *nbytes)
  +static apr_status_t socket_write(ap_iol *viol, const char* buf, apr_size_t size,
  +     apr_ssize_t *nbytes)
   {
       *nbytes = size;
  -    return ap_send(((iol_socket *)viol)->sock, buf, nbytes);
  +    return apr_send(((iol_socket *)viol)->sock, buf, nbytes);
   }
   
  -static ap_status_t socket_writev(ap_iol *viol, const struct iovec *vec, ap_size_t nvec,
  -    ap_ssize_t *nbytes)
  +static apr_status_t socket_writev(ap_iol *viol, const struct iovec *vec, apr_size_t nvec,
  +    apr_ssize_t *nbytes)
   {
   #ifndef HAVE_NETINET_TCP_H
       /* At present BeOS doesn't support writev for sockets... */
       *nbytes = vec[0].iov_len;
  -    return ap_send(((iol_socket *)viol)->sock, vec[0].iov_base, nbytes);
  +    return apr_send(((iol_socket *)viol)->sock, vec[0].iov_base, nbytes);
   #else
  -    return ap_sendv(((iol_socket *)viol)->sock, vec, nvec, nbytes);
  +    return apr_sendv(((iol_socket *)viol)->sock, vec, nvec, nbytes);
   #endif
   }
   
  -static ap_status_t socket_read(ap_iol *viol, char* buf, ap_size_t size,
  -     ap_ssize_t *nbytes)
  +static apr_status_t socket_read(ap_iol *viol, char* buf, apr_size_t size,
  +     apr_ssize_t *nbytes)
   {
       *nbytes = size;
  -    return ap_recv(((iol_socket *)viol)->sock, buf, nbytes);
  +    return apr_recv(((iol_socket *)viol)->sock, buf, nbytes);
   }
   
   #if APR_HAS_SENDFILE
  -static ap_status_t socket_sendfile(ap_iol *viol, ap_file_t *file,
  -                                   ap_hdtr_t *hdtr, ap_off_t *offset, 
  -                                   ap_size_t *len,  ap_int32_t flags) 
  +static apr_status_t socket_sendfile(ap_iol *viol, apr_file_t *file,
  +                                   apr_hdtr_t *hdtr, apr_off_t *offset, 
  +                                   apr_size_t *len,  apr_int32_t flags) 
   {
       return ap_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
   }
   #endif
   
  -static ap_status_t socket_close(ap_iol *viol)
  +static apr_status_t socket_close(ap_iol *viol)
   {
       iol_socket *iol = (iol_socket *)viol;
       int saved_errno;
   
  -    saved_errno = ap_close_socket(iol->sock);
  +    saved_errno = apr_close_socket(iol->sock);
       iol = NULL;
       if (saved_errno == 0) {
           return APR_SUCCESS;
  @@ -154,11 +154,11 @@
       return saved_errno;
   }
   
  -static ap_status_t socket_shutdown(ap_iol *viol, int how)
  +static apr_status_t socket_shutdown(ap_iol *viol, int how)
   {
       iol_socket *iol = (iol_socket *)viol;
   
  -    return ap_shutdown(iol->sock, how);
  +    return apr_shutdown(iol->sock, how);
   }
       
   static const ap_iol_methods socket_methods = {
  @@ -176,11 +176,11 @@
       socket_shutdown,
   };
   
  -API_EXPORT(ap_iol *) ap_iol_attach_socket(ap_pool_t *p, ap_socket_t *sock)
  +API_EXPORT(ap_iol *) ap_iol_attach_socket(apr_pool_t *p, apr_socket_t *sock)
   {
       iol_socket *iol;
   
  -    iol = ap_palloc(p, sizeof(iol_socket));
  +    iol = apr_palloc(p, sizeof(iol_socket));
   
       iol->iol.methods = &socket_methods;
       iol->sock = sock;
  
  
  
  1.30      +29 -29    apache-2.0/src/main/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- listen.c	2000/07/21 19:50:47	1.29
  +++ listen.c	2000/08/02 05:26:48	1.30
  @@ -76,33 +76,33 @@
   static int send_buffer_size;
   
   /* TODO: make_sock is just begging and screaming for APR abstraction */
  -static ap_status_t make_sock(ap_pool_t *p, ap_listen_rec *server)
  +static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
   {
  -    ap_socket_t *s = server->sd;
  +    apr_socket_t *s = server->sd;
       int one = 1;
       char addr[512];
  -    ap_status_t stat;
  -    ap_uint32_t port;
  +    apr_status_t stat;
  +    apr_uint32_t port;
       char *ipaddr;
   
  -    ap_get_local_port(&port,s);
  -    ap_get_local_ipaddr(&ipaddr,s);
  -    ap_snprintf(addr, sizeof(addr), "address %s port %u", ipaddr,
  +    apr_get_local_port(&port,s);
  +    apr_get_local_ipaddr(&ipaddr,s);
  +    apr_snprintf(addr, sizeof(addr), "address %s port %u", ipaddr,
   		(unsigned) port);
   
  -    stat = ap_setsocketopt(s, APR_SO_REUSEADDR, one);
  +    stat = apr_setsocketopt(s, APR_SO_REUSEADDR, one);
       if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
   		    "make_sock: for %s, setsockopt: (SO_REUSEADDR)", addr);
  -	ap_close_socket(s);
  +	apr_close_socket(s);
   	return stat;
       }
       
  -    stat = ap_setsocketopt(s, APR_SO_KEEPALIVE, one);
  +    stat = apr_setsocketopt(s, APR_SO_KEEPALIVE, one);
       if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
   		    "make_sock: for %s, setsockopt: (SO_KEEPALIVE)", addr);
  -	ap_close_socket(s);
  +	apr_close_socket(s);
   	return stat;
       }
   
  @@ -126,7 +126,7 @@
        * If no size is specified, use the kernel default.
        */
       if (send_buffer_size) {
  -	stat = ap_setsocketopt(s, APR_SO_SNDBUF,  send_buffer_size);
  +	stat = apr_setsocketopt(s, APR_SO_SNDBUF,  send_buffer_size);
           if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
               ap_log_error(APLOG_MARK, APLOG_WARNING, stat, NULL,
   			"make_sock: failed to set SendBufferSize for %s, "
  @@ -135,17 +135,17 @@
   	}
       }
   
  -    if ((stat = ap_bind(s)) != APR_SUCCESS) {
  +    if ((stat = apr_bind(s)) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
   	    "make_sock: could not bind to %s", addr);
  -	ap_close_socket(s);
  +	apr_close_socket(s);
   	return stat;
       }
   
  -    if ((stat = ap_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
  +    if ((stat = apr_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_ERR, stat, NULL,
   	    "make_sock: unable to listen for connections on %s", addr);
  -	ap_close_socket(s);
  +	apr_close_socket(s);
   	return stat;
       }
   
  @@ -155,12 +155,12 @@
   }
   
   
  -static ap_status_t close_listeners_on_exec(void *v)
  +static apr_status_t close_listeners_on_exec(void *v)
   {
       ap_listen_rec *lr;
   
       for (lr = ap_listeners; lr; lr = lr->next) {
  -	ap_close_socket(lr->sd);
  +	apr_close_socket(lr->sd);
   	lr->active = 0;
       }
       return APR_SUCCESS;
  @@ -171,14 +171,14 @@
   {
       ap_listen_rec **walk;
       ap_listen_rec *new;
  -    ap_status_t status;
  +    apr_status_t status;
       char *oldaddr;
       unsigned int oldport;
   
       /* see if we've got an old listener for this address:port */
       for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
  -        ap_get_local_port(&oldport, (*walk)->sd);
  -	ap_get_local_ipaddr(&oldaddr,(*walk)->sd);
  +        apr_get_local_port(&oldport, (*walk)->sd);
  +	apr_get_local_ipaddr(&oldaddr,(*walk)->sd);
   	if (!strcmp(oldaddr, addr) && port == oldport) {
   	    /* re-use existing record */
   	    new = *walk;
  @@ -190,15 +190,15 @@
       }
   
       /* this has to survive restarts */
  -    new = ap_palloc(process->pool, sizeof(ap_listen_rec));
  +    new = apr_palloc(process->pool, sizeof(ap_listen_rec));
       new->active = 0;
  -    if ((status = ap_create_tcp_socket(&new->sd, process->pool)) != APR_SUCCESS) {
  +    if ((status = apr_create_tcp_socket(&new->sd, process->pool)) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL,
                    "make_sock: failed to get a socket for %s", addr);
           return;
       }
  -    ap_set_local_port(new->sd, port);
  -    ap_set_local_ipaddr(new->sd, addr);
  +    apr_set_local_port(new->sd, port);
  +    apr_set_local_ipaddr(new->sd, addr);
       new->next = ap_listeners;
       ap_listeners = new;
   }
  @@ -208,7 +208,7 @@
   #endif
   int ap_listen_open(process_rec *process, unsigned port)
   {
  -    ap_pool_t *pconf = process->pconf;
  +    apr_pool_t *pconf = process->pconf;
       ap_listen_rec *lr;
       ap_listen_rec *next;
       int num_open;
  @@ -233,14 +233,14 @@
   
       /* close the old listeners */
       for (lr = old_listeners; lr; lr = next) {
  -	ap_close_socket(lr->sd);
  +	apr_close_socket(lr->sd);
   	lr->active = 0;
   	next = lr->next;
   /*	free(lr);*/
       }
       old_listeners = NULL;
   
  -    ap_register_cleanup(pconf, NULL, ap_null_cleanup, close_listeners_on_exec);
  +    apr_register_cleanup(pconf, NULL, apr_null_cleanup, close_listeners_on_exec);
   
       return num_open ? 0 : -1;
   }
  @@ -270,7 +270,7 @@
   
   const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips_)
   {
  -    char *ips=ap_pstrdup(cmd->pool, ips_);
  +    char *ips=apr_pstrdup(cmd->pool, ips_);
       char *ports;
       unsigned short port;
   
  
  
  
  1.31      +12 -12    apache-2.0/src/main/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- mpm_common.c	2000/07/30 12:03:46	1.30
  +++ mpm_common.c	2000/08/02 05:26:48	1.31
  @@ -86,7 +86,7 @@
   {
       int i;
       long int waittime = 1024 * 16;      /* in usecs */
  -    ap_status_t waitret;
  +    apr_status_t waitret;
       int tries;
       int not_dead_yet;
       int max_daemons = ap_get_max_daemons();
  @@ -99,19 +99,19 @@
            * Set delay with an exponential backoff.
            */
           waittime = waittime * 4;
  -        ap_sleep(waittime);
  +        apr_sleep(waittime);
   
           /* now see who is done */
           not_dead_yet = 0;
           for (i = 0; i < max_daemons; ++i) {
               pid_t pid = MPM_CHILD_PID(i);
  -            ap_proc_t proc;
  +            apr_proc_t proc;
   
               if (pid == 0)
                   continue;
   
               proc.pid = pid;
  -            waitret = ap_wait_proc(&proc, APR_NOWAIT);
  +            waitret = apr_wait_proc(&proc, APR_NOWAIT);
               if (waitret != APR_CHILD_NOTDONE) {
                   MPM_NOTE_CHILD_KILLED(i);
                   continue;
  @@ -164,7 +164,7 @@
                   break;
               }
           }
  -        ap_check_other_child();
  +        apr_check_other_child();
           if (!not_dead_yet) {
               /* nothing left to wait for */
               break;
  @@ -179,19 +179,19 @@
   #endif
   static int wait_or_timeout_counter;
   
  -void ap_wait_or_timeout(ap_wait_t *status, ap_proc_t *ret, ap_pool_t *p)
  +void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p)
   {
  -    ap_status_t rv;
  +    apr_status_t rv;
   
       ++wait_or_timeout_counter;
       if (wait_or_timeout_counter == INTERVAL_OF_WRITABLE_PROBES) {
           wait_or_timeout_counter = 0;
   #if APR_HAS_OTHER_CHILD
  -        ap_probe_writable_fds();
  +        apr_probe_writable_fds();
   #endif
       }
  -    rv = ap_wait_all_procs(ret, status, APR_NOWAIT, p);
  -    if (ap_canonical_error(rv) == APR_EINTR) {
  +    rv = apr_wait_all_procs(ret, status, APR_NOWAIT, p);
  +    if (apr_canonical_error(rv) == APR_EINTR) {
           ret->pid = -1;
           return;
       }
  @@ -203,12 +203,12 @@
           return;
       }
   #endif
  -    ap_sleep(SCOREBOARD_MAINTENANCE_INTERVAL);
  +    apr_sleep(SCOREBOARD_MAINTENANCE_INTERVAL);
       ret->pid = -1;
       return;
   }
   
  -void ap_process_child_status(ap_proc_t *pid, ap_wait_t status)
  +void ap_process_child_status(apr_proc_t *pid, ap_wait_t status)
   {
       /* Child died... if it died due to a fatal error,
           * we should simply bail out.
  
  
  
  1.20      +24 -24    apache-2.0/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- rfc1413.c	2000/06/12 23:02:50	1.19
  +++ rfc1413.c	2000/08/02 05:26:49	1.20
  @@ -108,19 +108,19 @@
   
   /* bind_connect - bind both ends of a socket */
   /* Ambarish fix this. Very broken */
  -static int get_rfc1413(ap_socket_t *sock, const char *local_ip,
  +static int get_rfc1413(apr_socket_t *sock, const char *local_ip,
   		       const char *rmt_ip, 
   		       char user[RFC1413_USERLEN+1], server_rec *srv)
   {
       unsigned int rmt_port, our_port;
       unsigned int sav_rmt_port, sav_our_port;
  -    ap_status_t status;
  +    apr_status_t status;
       int i;
       char *cp;
       char buffer[RFC1413_MAXDATA + 1];
       int buflen;
   #ifdef CHARSET_EBCDIC
  -    ap_size_t inbytes_left, outbytes_left;
  +    apr_size_t inbytes_left, outbytes_left;
   #endif
   
       /*
  @@ -132,10 +132,10 @@
        * addresses from the query socket.
        */
   
  -    ap_set_local_port(sock, ANY_PORT);
  -    ap_set_local_ipaddr(sock, local_ip);
  +    apr_set_local_port(sock, ANY_PORT);
  +    apr_set_local_ipaddr(sock, local_ip);
   
  -    if ((status = ap_bind(sock)) != APR_SUCCESS) {
  +    if ((status = apr_bind(sock)) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, status, srv,
   		    "bind: rfc1413: Error binding to local port");
   	return -1;
  @@ -145,16 +145,16 @@
    * errors from connect usually imply the remote machine doesn't support
    * the service
    */
  -    ap_set_remote_port(sock, RFC1413_PORT);
  -    ap_set_remote_ipaddr(sock, rmt_ip);
  +    apr_set_remote_port(sock, RFC1413_PORT);
  +    apr_set_remote_ipaddr(sock, rmt_ip);
                       
  -    if (ap_connect(sock, NULL) != APR_SUCCESS)
  +    if (apr_connect(sock, NULL) != APR_SUCCESS)
           return -1;
  -    ap_get_local_port(&sav_our_port, sock);
  -    ap_get_remote_port(&sav_rmt_port, sock);
  +    apr_get_local_port(&sav_our_port, sock);
  +    apr_get_remote_port(&sav_rmt_port, sock);
   
   /* send the data */
  -    buflen = ap_snprintf(buffer, sizeof(buffer), "%u,%u\r\n", sav_rmt_port,
  +    buflen = apr_snprintf(buffer, sizeof(buffer), "%u,%u\r\n", sav_rmt_port,
   		sav_our_port);
   #ifdef CHARSET_EBCDIC
       inbytes_left = outbytes_left = buflen;
  @@ -165,10 +165,10 @@
       /* send query to server. Handle short write. */
       i = 0;
       while(i < strlen(buffer)) {
  -        ap_ssize_t j = strlen(buffer + i);
  -        ap_status_t status;
  -	status  = ap_send(sock, buffer+i, &j);
  -	if (status != APR_SUCCESS && ap_canonical_error(status) != APR_EINTR) {
  +        apr_ssize_t j = strlen(buffer + i);
  +        apr_status_t status;
  +	status  = apr_send(sock, buffer+i, &j);
  +	if (status != APR_SUCCESS && apr_canonical_error(status) != APR_EINTR) {
   	    ap_log_error(APLOG_MARK, APLOG_CRIT, status, srv,
   		         "write: rfc1413: error sending request");
   	    return -1;
  @@ -191,10 +191,10 @@
        * this allows it to work on both ASCII and EBCDIC machines.
        */
       while((cp = strchr(buffer, '\012')) == NULL && i < sizeof(buffer) - 1) {
  -        ap_ssize_t j = sizeof(buffer) - 1 - i;
  -        ap_status_t status;
  -	status = ap_recv(sock, buffer+i, &j);
  -	if (status != APR_SUCCESS && ap_canonical_error(status) != APR_EINTR) {
  +        apr_ssize_t j = sizeof(buffer) - 1 - i;
  +        apr_status_t status;
  +	status = apr_recv(sock, buffer+i, &j);
  +	if (status != APR_SUCCESS && apr_canonical_error(status) != APR_EINTR) {
   	    ap_log_error(APLOG_MARK, APLOG_CRIT, status, srv,
   			"read: rfc1413: error reading response");
   	    return -1;
  @@ -233,14 +233,14 @@
   /* rfc1413 - return remote user name, given socket structures */
   char *ap_rfc1413(conn_rec *conn, server_rec *srv)
   {
  -    ap_status_t status;
  +    apr_status_t status;
       static char user[RFC1413_USERLEN + 1];	/* XXX */
       static char *result;
  -    static ap_socket_t *sock;
  +    static apr_socket_t *sock;
   
       result = FROM_UNKNOWN;
   
  -    if ((status = ap_create_tcp_socket(&sock, conn->pool)) != APR_SUCCESS) {
  +    if ((status = apr_create_tcp_socket(&sock, conn->pool)) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, status, srv,
   		    "socket: rfc1413: error creating socket");
   	conn->remote_logname = result;
  @@ -248,7 +248,7 @@
   
       if (get_rfc1413(sock, conn->local_ip, conn->remote_ip, user, srv) >= 0)
           result = user;
  -    ap_close_socket(sock);
  +    apr_close_socket(sock);
       conn->remote_logname = result;
   
       return conn->remote_logname;
  
  
  
  1.65      +103 -103  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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- util.c	2000/07/25 01:06:27	1.64
  +++ util.c	2000/08/02 05:26:49	1.65
  @@ -126,7 +126,7 @@
    * Examine a field value (such as a media-/content-type) string and return
    * it sans any parameters; e.g., strip off any ';charset=foo' and the like.
    */
  -API_EXPORT(char *) ap_field_noparam(ap_pool_t *p, const char *intype)
  +API_EXPORT(char *) ap_field_noparam(apr_pool_t *p, const char *intype)
   {
       const char *semi;
   
  @@ -134,19 +134,19 @@
   
       semi = ap_strchr_c(intype, ';');
       if (semi == NULL) {
  -	return ap_pstrdup(p, intype);
  +	return apr_pstrdup(p, intype);
       } 
       else {
   	while ((semi > intype) && ap_isspace(semi[-1])) {
   	    semi--;
   	}
  -	return ap_pstrndup(p, intype, semi - intype);
  +	return apr_pstrndup(p, intype, semi - intype);
       }
   }
   
  -API_EXPORT(char *) ap_ht_time(ap_pool_t *p, ap_time_t t, const char *fmt, int gmt)
  +API_EXPORT(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int gmt)
   {
  -    ap_size_t retcode;
  +    apr_size_t retcode;
       char ts[MAX_STRING_LEN];
       char tf[MAX_STRING_LEN];
       ap_exploded_time_t xt;
  @@ -155,7 +155,7 @@
   	const char *f;
   	char *strp;
   
  -        ap_explode_gmt(&xt, t);
  +        apr_explode_gmt(&xt, t);
   	/* Convert %Z to "GMT" and %z to "+0000";
   	 * on hosts that do not have a time zone string in struct tm,
   	 * strftime must assume its argument is local time.
  @@ -187,13 +187,13 @@
   	fmt = tf;
       }
       else {
  -        ap_explode_localtime(&xt, t);
  +        apr_explode_localtime(&xt, t);
       }
   
       /* check return code? */
  -    ap_strftime(ts, &retcode, MAX_STRING_LEN, fmt, &xt);
  +    apr_strftime(ts, &retcode, MAX_STRING_LEN, fmt, &xt);
       ts[MAX_STRING_LEN - 1] = '\0';
  -    return ap_pstrdup(p, ts);
  +    return apr_pstrdup(p, ts);
   }
   
   /* Roy owes Rob beer. */
  @@ -275,30 +275,30 @@
    * regfree() doesn't clear it. So we don't allow it.
    */
   
  -static ap_status_t regex_cleanup(void *preg)
  +static apr_status_t regex_cleanup(void *preg)
   {
       regfree((regex_t *) preg);
       return APR_SUCCESS;
   }
   
  -API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern,
  +API_EXPORT(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
   				   int cflags)
   {
  -    regex_t *preg = ap_palloc(p, sizeof(regex_t));
  +    regex_t *preg = apr_pall