httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/support ab.c htdigest.c
Date Sun, 06 Aug 2000 06:07:54 GMT
wrowe       00/08/05 23:07:54

  Modified:    src      ApacheCore.def ApacheCore.dsp InstallBin.dsp
               src/include ap_config.h mpm_common.h util_md5.h
               src/lib/apr aprlib.def aprlib.dsp
               src/lib/apr/file_io/os2 dir.c fileio.h filestat.c
                        readwrite.c
               src/lib/apr/file_io/unix dir.c filestat.c readwrite.c
               src/lib/apr/file_io/win32 dir.c fileio.h filestat.c open.c
                        pipe.c
               src/lib/apr/i18n/unix xlate.c
               src/lib/apr/include apr.h.in apr.hw apr_compat.h
                        apr_file_io.h apr_getopt.h apr_hash.h apr_lib.h
                        apr_md5.h apr_network_io.h apr_pools.h
                        apr_portable.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
               src/lib/apr/misc/unix errorcodes.c getopt.c misc.h
               src/lib/apr/misc/win32 misc.c names.c
               src/lib/apr/network_io/beos poll.c sendrecv.c sockets.c
               src/lib/apr/network_io/os2 poll.c sockets.c
               src/lib/apr/network_io/unix poll.c sendrecv.c sockets.c
               src/lib/apr/network_io/win32 poll.c sockets.c
               src/lib/apr/passwd apr_md5.c
               src/lib/apr/strings apr_cpystrn.c apr_fnmatch.c
                        apr_snprintf.c
               src/lib/apr/tables apr_hash.c apr_tables.c
               src/lib/apr/test client.c testargs.c testfile.c testmd5.c
                        testpipe.c testsf.c testtime.c
               src/lib/apr/threadproc/beos proc.c
               src/lib/apr/threadproc/os2 proc.c thread.c
               src/lib/apr/threadproc/unix proc.c
               src/lib/apr/threadproc/win32 proc.c signals.c
               src/lib/apr/time/unix time.c timestr.c
               src/lib/apr/time/win32 access.c time.c timestr.c
               src/lib/pcre pcre.dsp pcreposix.dsp
               src/main gen_test_char.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
                        mpm_common.c util.c util_date.c util_md5.c
                        util_script.c
               src/modules/dav/fs repos.c
               src/modules/dav/main mod_dav.c opaquelock.c
               src/modules/experimental mod_mmap_static.c
               src/modules/file_cache cache_util.c file_garbage.c
                        mod_cache.h
               src/modules/mpm/beos beos.c
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_beos mpmt_beos.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
                        scoreboard.h
               src/modules/mpm/perchild perchild.c
               src/modules/mpm/prefork prefork.c
               src/modules/mpm/spmt_os2 spmt_os2.c
               src/modules/mpm/winnt mpm_winnt.c
               src/modules/proxy mod_proxy.c proxy_connect.c proxy_ftp.c
                        proxy_http.c proxy_util.c
               src/modules/standard mod_access.c mod_alias.c
                        mod_auth_digest.c mod_autoindex.c mod_cern_meta.c
                        mod_cgi.c mod_cgid.c mod_dir.c mod_env.c
                        mod_expires.c mod_file_cache.c mod_imap.c
                        mod_include.c mod_log_config.c mod_mime.c
                        mod_mime_magic.c mod_negotiation.c mod_rewrite.c
                        mod_setenvif.c mod_speling.c mod_unique_id.c
                        mod_usertrack.c mod_vhost_alias.c
               src/os/bs2000 bs2login.c os.h
               src/os/tpf os.c os.h
               src/os/unix os.h
               src/os/win32 apache.ico main_win32.c mod_isapi.c
               src/support ab.c htdigest.c
  Log:
    Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
    see src/lib/apr/apr_compat.h for most details.
    Also a few minor nits to get Win32 to build.
  
  Revision  Changes    Path
  1.26      +4 -4      apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ApacheCore.def	2000/07/10 21:49:18	1.25
  +++ ApacheCore.def	2000/08/06 06:07:00	1.26
  @@ -139,9 +139,9 @@
   ;	ap_kill_cleanups_for_socket   @132
   	;ap_kill_timeout   @133
   	ap_log_assert   @134
  -	ap_log_error_old   @135
  -	ap_log_reason   @136
  -	ap_log_unixerr   @137
  +;	ap_log_error_old   @135
  +;	ap_log_reason   @136
  +;	ap_log_unixerr   @137
   ;	ap_make_array   @138
   	ap_make_dirstr   @139
   	ap_make_dirstr_parent   @140
  @@ -279,7 +279,7 @@
   	ap_limit_section   @272
   	ap_loaded_modules   @273
   	ap_log_error   @274
  -	ap_log_printf   @275
  +;	ap_log_printf   @275
   	ap_log_rerror   @276
   ;	ap_month_snames  @277
   ;	ap_null_cleanup   @278
  
  
  
  1.32      +26 -5     apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ApacheCore.dsp	2000/07/03 08:29:58	1.31
  +++ ApacheCore.dsp	2000/08/06 06:07:00	1.32
  @@ -26,7 +26,6 @@
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  -RSC=rc.exe
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  @@ -40,10 +39,11 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -64,10 +64,11 @@
   # PROP Intermediate_Dir "LibD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /I ".\modules\mpm\winnt" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -370,10 +371,22 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\modules\mpm\winnt\mpm.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\mpm_common.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\modules\mpm\winnt\mpm_default.h
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\mpm_status.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\modules\mpm\winnt\mpm_winnt.h
   # End Source File
   # Begin Source File
  @@ -390,7 +403,15 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\util_charset.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\util_date.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\util_ebcdic.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.4       +1 -1      apache-2.0/src/InstallBin.dsp
  
  Index: InstallBin.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/InstallBin.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstallBin.dsp	2000/05/24 23:44:30	1.3
  +++ InstallBin.dsp	2000/08/06 06:07:00	1.4
  @@ -58,7 +58,7 @@
   # PROP Use_Debug_Libraries 1
   # PROP Output_Dir "Debug"
   # PROP Intermediate_Dir "Debug"
  -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=D LONG=Debug _install"
  +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=e:\apache\apache-2.0 SHORT=D LONG=Debug _install"
   # PROP Rebuild_Opt ""
   # PROP Target_File "..\Apache.exe"
   # PROP Bsc_Name ".\apache.bsc"
  
  
  
  1.41      +1 -1      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- ap_config.h	2000/07/26 15:31:28	1.40
  +++ ap_config.h	2000/08/06 06:07:01	1.41
  @@ -56,7 +56,7 @@
   #define AP_AC_CONFIG_H
   
   #include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
  -#include "apr_lib.h"		/* ap_isfoo() macros */
  +#include "apr_lib.h"		/* apr_isfoo() macros */
   
   /* Implemented flags for dynamic library bindings.
    *
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mpm_common.h	2000/08/06 02:21:06	1.8
  +++ mpm_common.h	2000/08/06 06:07:01	1.9
  @@ -105,7 +105,7 @@
    * @param ret The process id of the process that died
    * @param p The pool to allocate out of
    */
  -void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p);
  +void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p);
   
   /**
    * Log why a child died to the error log, if the child died without the
  @@ -113,7 +113,7 @@
    * @param pid The child that has died
    * @param status The status returned from ap_wait_or_timeout
    */
  -void ap_process_child_status(apr_proc_t *pid, ap_wait_t status);
  +void ap_process_child_status(apr_proc_t *pid, apr_wait_t status);
   
   #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
   /**
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- util_md5.h	2000/08/02 05:25:31	1.13
  +++ util_md5.h	2000/08/06 06:07:01	1.14
  @@ -67,7 +67,7 @@
   
   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);
  +API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context);
   #ifdef APACHE_XLATE
   API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
                                   apr_xlate_t *xlate);
  
  
  
  1.32      +9 -9      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- aprlib.def	2000/08/04 02:48:36	1.31
  +++ aprlib.def	2000/08/06 06:07:01	1.32
  @@ -118,7 +118,7 @@
   ;	apr_get_os_proc   @109
   	apr_get_os_thread   @110
   	apr_get_os_threadkey   @111
  -	ap_os_systemcase_filename   @112
  +	apr_os_systemcase_filename   @112
   	canonical_filename   @113
   	apr_create_pool   @114
   	apr_clear_pool   @115
  @@ -128,13 +128,13 @@
   	apr_set_userdata   @119
   	apr_initialize   @120
   	apr_getopt    @121
  -	ap_opterr   @122 DATA
  -	ap_optind   @123 DATA
  -	ap_optopt   @124 DATA
  -	ap_optreset   @125 DATA
  -	ap_optarg   @126 DATA
  +	apr_opterr   @122 DATA
  +	apr_optind   @123 DATA
  +	apr_optopt   @124 DATA
  +	apr_optreset   @125 DATA
  +	apr_optarg   @126 DATA
   ;	apr_make_time   @127
  -	apr_ansi_time_to_ap_time @127
  +	apr_ansi_time_to_apr_time @127
   ;	apr_current_time   @128
   	apr_now		  @128
   ;	apr_explode_time   @129
  @@ -242,8 +242,8 @@
           apr_dso_sym @221
   ;        apr_dso_init @222
           apr_collapse_spaces @223
  -	ap_month_snames @224
  -	ap_day_snames @225
  +	apr_month_snames @224
  +	apr_day_snames @225
   	apr_canonical_error @226
   	apr_strerror @227
   	apr_generate_random_bytes @228
  
  
  
  1.35      +4 -0      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- aprlib.dsp	2000/07/25 00:42:10	1.34
  +++ aprlib.dsp	2000/08/06 06:07:02	1.35
  @@ -364,6 +364,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\apr_compat.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\apr_dso.h
   # End Source File
   # Begin Source File
  
  
  
  1.15      +4 -3      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- dir.c	2000/08/02 05:25:44	1.14
  +++ dir.c	2000/08/06 06:07:02	1.15
  @@ -172,7 +172,8 @@
   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);
  +        apr_os2_time_to_apr_time(time, thedir->entry.fdateLastWrite, 
  +                                 thedir->entry.ftimeLastWrite);
           return APR_SUCCESS;
       }
   
  @@ -181,12 +182,12 @@
   
   
   
  -apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
   {
       int rc;
       HFILE hFile;
       ULONG action, Type, Attr;
  -    ap_filetype_e typemap[8] = { APR_REG, APR_CHR, APR_PIPE };
  +    apr_filetype_e typemap[8] = { APR_REG, APR_CHR, APR_PIPE };
   
       if (thedir->validentry) {
           if (thedir->entry.attrFile & FILE_DIRECTORY) {
  
  
  
  1.21      +2 -1      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- fileio.h	2000/08/02 05:25:44	1.20
  +++ fileio.h	2000/08/06 06:07:02	1.21
  @@ -97,7 +97,8 @@
   };
   
   apr_status_t apr_file_cleanup(void *);
  -apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time);
  +apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, 
  +                                      FTIME os2time);
   
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.12      +7 -4      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- filestat.c	2000/08/02 05:25:46	1.11
  +++ filestat.c	2000/08/06 06:07:02	1.12
  @@ -75,14 +75,17 @@
       finfo->inode = 0;
       finfo->device = 0;
       finfo->size = fstatus->cbFile;
  -    ap_os2_time_to_ap_time(&finfo->atime, fstatus->fdateLastAccess, fstatus->ftimeLastAccess );
  -    ap_os2_time_to_ap_time(&finfo->mtime, fstatus->fdateLastWrite,  fstatus->ftimeLastWrite );
  -    ap_os2_time_to_ap_time(&finfo->ctime, fstatus->fdateCreation,   fstatus->ftimeCreation );
  +    apr_os2_time_to_apr_time(&finfo->atime, fstatus->fdateLastAccess, 
  +                             fstatus->ftimeLastAccess );
  +    apr_os2_time_to_apr_time(&finfo->mtime, fstatus->fdateLastWrite,  
  +                             fstatus->ftimeLastWrite );
  +    apr_os2_time_to_apr_time(&finfo->ctime, fstatus->fdateCreation,   
  +                             fstatus->ftimeCreation );
   }
   
   
   
  -static apr_status_t handle_type(ap_filetype_e *ftype, HFILE file)
  +static apr_status_t handle_type(apr_filetype_e *ftype, HFILE file)
   {
       ULONG filetype, fileattr, rc;
   
  
  
  
  1.30      +1 -1      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- readwrite.c	2000/08/02 05:25:47	1.29
  +++ readwrite.c	2000/08/06 06:07:02	1.30
  @@ -346,7 +346,7 @@
   
   
   
  -apr_status_t ap_file_check_read(apr_file_t *fd)
  +apr_status_t apr_file_check_read(apr_file_t *fd)
   {
       int rc;
   
  
  
  
  1.37      +2 -2      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- dir.c	2000/08/02 05:25:50	1.36
  +++ dir.c	2000/08/06 06:07:03	1.37
  @@ -200,11 +200,11 @@
           return errno;
       }
       
  -    apr_ansi_time_to_ap_time(mtime, filestat.st_mtime);
  +    apr_ansi_time_to_apr_time(mtime, filestat.st_mtime);
       return APR_SUCCESS;
   }
    
  -apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  
  
  
  1.30      +11 -11    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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- filestat.c	2000/08/02 05:25:51	1.29
  +++ filestat.c	2000/08/06 06:07:03	1.30
  @@ -57,9 +57,9 @@
   #include "apr_general.h"
   #include "apr_errno.h"
   
  -static ap_filetype_e filetype_from_mode(int mode)
  +static apr_filetype_e filetype_from_mode(int mode)
   {
  -    ap_filetype_e type = APR_NOFILE;
  +    apr_filetype_e type = APR_NOFILE;
   
       if (S_ISREG(mode))
           type = APR_REG;
  @@ -92,9 +92,9 @@
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        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);
  +        apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  @@ -123,9 +123,9 @@
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        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);
  +        apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  @@ -145,9 +145,9 @@
           finfo->size = info.st_size;
           finfo->inode = info.st_ino;
           finfo->device = info.st_dev;
  -        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);
  +        apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
  +        apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
  +        apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
           return APR_SUCCESS;
       }
       else {
  
  
  
  1.58      +2 -2      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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- readwrite.c	2000/08/02 05:25:52	1.57
  +++ readwrite.c	2000/08/06 06:07:04	1.58
  @@ -74,8 +74,8 @@
           FD_ZERO(&fdset);
           FD_SET(file->filedes, &fdset);
           if (file->timeout >= 0) {
  -            tv.tv_sec = file->timeout / AP_USEC_PER_SEC;
  -            tv.tv_usec = file->timeout % AP_USEC_PER_SEC;
  +            tv.tv_sec = file->timeout / APR_USEC_PER_SEC;
  +            tv.tv_usec = file->timeout % APR_USEC_PER_SEC;
               tvptr = &tv;
           }
           else {
  
  
  
  1.26      +1 -1      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- dir.c	2000/08/02 05:25:55	1.25
  +++ dir.c	2000/08/06 06:07:05	1.26
  @@ -179,7 +179,7 @@
       return APR_SUCCESS;
   }
    
  -apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
  +apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
   {
       switch(thedir->entry->dwFileAttributes) {
       case FILE_ATTRIBUTE_DIRECTORY: {
  
  
  
  1.29      +6 -6      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- fileio.h	2000/08/02 05:25:55	1.28
  +++ fileio.h	2000/08/06 06:07:05	1.29
  @@ -92,7 +92,7 @@
    * fname --  the filename as passed to the open call.
    * dwFileAttricutes -- Attributes used to open the file.
    * demonfname -- the canonicalized filename.  Used to store the result from
  - *               ap_os_canonicalize_filename.
  + *               apr_os_canonicalize_filename.
    * lowerdemonfname -- inserted at Ken Parzygnat's request, because of the
    *                    ugly way windows deals with case in the filesystem.
    * append -- Windows doesn't support the append concept when opening files.
  @@ -143,12 +143,12 @@
   apr_status_t file_cleanup(void *);
   /*mode_t get_fileperms(apr_fileperms_t);
   */
  -APR_EXPORT(char *) ap_os_systemcase_filename(struct apr_pool_t *pCont, 
  -                                             const char *szFile);
  +APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, 
  +                                              const char *szFile);
   char * canonical_filename(struct apr_pool_t *pCont, const char *szFile);
   
  -apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
  -                              BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  -                              apr_pool_t *p);
  +apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
  +                                BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  +                                apr_pool_t *p);
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.24      +4 -4      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- filestat.c	2000/08/02 05:25:56	1.23
  +++ filestat.c	2000/08/06 06:07:05	1.24
  @@ -66,9 +66,9 @@
   #define S_ISREG(m)  (((m) & (S_IFMT))  == S_IFREG)
   #define S_ISDIR(m)  (((m) & (S_IFDIR)) == S_IFDIR)
   
  -static ap_filetype_e filetype_from_mode(int mode)
  +static apr_filetype_e filetype_from_mode(int mode)
   {
  -    ap_filetype_e type = APR_NOFILE;
  +    apr_filetype_e type = APR_NOFILE;
   
       if (S_ISREG(mode))
           type = APR_REG;
  @@ -194,7 +194,7 @@
        */
       WIN32_FIND_DATA FileInformation;
       HANDLE hFind;
  -    ap_oslevel_e os_level;
  +    apr_oslevel_e os_level;
       apr_status_t rv = APR_SUCCESS;
   
       memset(finfo,'\0', sizeof(*finfo));
  @@ -208,7 +208,7 @@
       if (strlen(fname) >= MAX_PATH) {
           rv = ERROR_FILENAME_EXCED_RANGE;
       }
  -    else if (!ap_get_oslevel(cont, &os_level) && os_level >= APR_WIN_98) {
  +    else if (!apr_get_oslevel(cont, &os_level) && os_level >= APR_WIN_98) {
           if (!GetFileAttributesEx(fname, GetFileExInfoStandard, 
                                    (WIN32_FILE_ATTRIBUTE_DATA*) &FileInformation)) {
               rv = GetLastError();
  
  
  
  1.47      +2 -2      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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- open.c	2000/08/02 05:25:56	1.46
  +++ open.c	2000/08/06 06:07:05	1.47
  @@ -82,7 +82,7 @@
       DWORD createflags = 0;
       DWORD attributes = 0;
       DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE;
  -    ap_oslevel_e level;
  +    apr_oslevel_e level;
       apr_status_t rv;
   
       if ((*new) == NULL) {
  @@ -117,7 +117,7 @@
       (*new)->demonfname = canonical_filename((*new)->cntxt, fname);
       (*new)->lowerdemonfname = strlwr((*new)->demonfname);
    
  -    if (ap_get_oslevel(cont, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
  +    if (apr_get_oslevel(cont, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
           sharemode |= FILE_SHARE_DELETE;
       }
   
  
  
  
  1.27      +7 -7      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- pipe.c	2000/08/02 05:25:56	1.26
  +++ pipe.c	2000/08/06 06:07:05	1.27
  @@ -108,10 +108,10 @@
       return APR_SUCCESS;
   }
   
  -/* ap_create_nt_pipe()
  +/* apr_create_nt_pipe()
    * 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 
  + * apr_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). 
    * A pipe handle must be opened in full async i/o mode in order to 
    * emulate Unix non-blocking pipes with timeouts. 
  @@ -128,11 +128,11 @@
    *
    * wgs
    */
  -apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
  -                              BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  -                              apr_pool_t *p)
  +apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
  +                                BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
  +                                apr_pool_t *p)
   {
  -    ap_oslevel_e level;
  +    apr_oslevel_e level;
       SECURITY_ATTRIBUTES sa;
       static unsigned long id = 0;
       DWORD dwPipeMode;
  @@ -169,7 +169,7 @@
       (*out)->direction = 0;
       (*out)->pOverlapped = NULL;
   
  -    if (ap_get_oslevel(p, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
  +    if (apr_get_oslevel(p, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
           /* Create the read end of the pipe */
           dwOpenMode = PIPE_ACCESS_INBOUND;
           if (bAsyncRead) {
  
  
  
  1.11      +12 -12    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- xlate.c	2000/08/02 05:26:02	1.10
  +++ xlate.c	2000/08/06 06:07:06	1.11
  @@ -156,7 +156,7 @@
       }
   }
   
  -static apr_status_t ap_xlate_cleanup(void *convset)
  +static apr_status_t apr_xlate_cleanup(void *convset)
   {
   #ifdef HAVE_ICONV
       apr_xlate_t *old = convset;
  @@ -203,8 +203,8 @@
   }
   #endif /* HAVE_ICONV */
   
  -apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage,
  -                          const char *frompage, apr_pool_t *pool)
  +apr_status_t apr_xlate_open(apr_xlate_t **convset, const char *topage,
  +                            const char *frompage, apr_pool_t *pool)
   {
       apr_status_t status;
       apr_xlate_t *new;
  @@ -248,7 +248,7 @@
   
       if (found) {
           *convset = new;
  -        apr_register_cleanup(pool, (void *)new, ap_xlate_cleanup,
  +        apr_register_cleanup(pool, (void *)new, apr_xlate_cleanup,
                               apr_null_cleanup);
           status = APR_SUCCESS;
       }
  @@ -260,15 +260,15 @@
       return status;
   }
   
  -apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff)
  +apr_status_t apr_xlate_get_sb(apr_xlate_t *convset, int *onoff)
   {
       *onoff = convset->sbcs_table != NULL;
       return APR_SUCCESS;
   } 
   
  -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)
  +apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf,
  +                                   apr_size_t *inbytes_left, char *outbuf,
  +                                   apr_size_t *outbytes_left)
   {
       apr_status_t status = APR_SUCCESS;
   #ifdef HAVE_ICONV
  @@ -329,7 +329,7 @@
       return status;
   }
   
  -apr_int32_t ap_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar)
  +apr_int32_t apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar)
   {
       if (convset->sbcs_table) {
           return convset->sbcs_table[inchar];
  @@ -339,12 +339,12 @@
       }
   }
   
  -apr_status_t ap_xlate_close(apr_xlate_t *convset)
  +apr_status_t apr_xlate_close(apr_xlate_t *convset)
   {
       apr_status_t status;
   
  -    if ((status = ap_xlate_cleanup(convset)) == APR_SUCCESS) {
  -        apr_kill_cleanup(convset->pool, convset, ap_xlate_cleanup);
  +    if ((status = apr_xlate_cleanup(convset)) == APR_SUCCESS) {
  +        apr_kill_cleanup(convset->pool, convset, apr_xlate_cleanup);
       }
   
       return status;
  
  
  
  1.39      +4 -4      apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr.h.in	2000/08/02 05:51:39	1.38
  +++ apr.h.in	2000/08/06 06:07:07	1.39
  @@ -15,11 +15,11 @@
   #if !defined(__GNUC__) || __GNUC__ < 2 || \
       (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
       defined(NEXT)
  -#define ap_inline
  +#define apr_inline
   #define __attribute__(__x)
   #define ENUM_BITFIELD(e,n,w)  signed int n : w
   #else
  -#define ap_inline __inline__
  +#define apr_inline __inline__
   #define USE_GNU_INLINE
   #define ENUM_BITFIELD(e,n,w)  e n : w
   #endif
  @@ -158,12 +158,12 @@
   #include <sys/wait.h>
   
   #ifdef WEXITSTATUS
  -#define ap_wait_t       int
  +#define apr_wait_t       int
   #else
   /* We don't have a POSIX wait interface. Assume we have the old-style. Is this
    * a bad assumption? */
   /* Yessiree bob, it was... but will this work instead? */
  -#define ap_wait_t       union wait
  +#define apr_wait_t       union wait
   #define WEXITSTATUS(status)    (int)((status).w_retcode)
   #define WTERMSIG(status)       (int)((status).w_termsig)
   #endif /* !WEXITSTATUS */
  
  
  
  1.25      +2 -2      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- apr.hw	2000/08/04 02:48:37	1.24
  +++ apr.hw	2000/08/06 06:07:07	1.25
  @@ -109,7 +109,7 @@
   #include <signal.h>
   #include <stdlib.h>
   
  -#define ap_inline
  +#define apr_inline
   #define __attribute__(__x)
   #define ENUM_BITFIELD(e,n,w)  signed int n : w
   
  @@ -199,7 +199,7 @@
   
   #define apr_signal(a,b) signal(a,b)
   
  -typedef int ap_wait_t;
  +typedef int apr_wait_t;
   
   /* struct iovec is needed to emulate Unix writev */
   struct iovec {
  
  
  
  1.2       +37 -0     apache-2.0/src/lib/apr/include/apr_compat.h
  
  Index: apr_compat.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_compat.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_compat.h	2000/08/02 05:33:08	1.1
  +++ apr_compat.h	2000/08/06 06:07:08	1.2
  @@ -3,12 +3,16 @@
   
   /* redefine 1.3.x symbols to those that now live in libapr */
   
  +#define ap_inline apr_inline
  +
  +#define ap_md5_ctx_t apr_md5_ctx_t
   #define ap_MD5Encode apr_MD5Encode
   #define ap_MD5Final apr_MD5Final
   #define ap_MD5Init apr_MD5Init
   #define ap_MD5Update apr_MD5Update
   #define ap_append_arrays apr_append_arrays
   #define ap_array_cat apr_array_cat
  +#define ap_array_header_t apr_array_header_t
   #define ap_array_pstrcat apr_array_pstrcat
   #define ap_bytes_in_free_blocks apr_bytes_in_free_blocks
   #define ap_bytes_in_pool apr_bytes_in_pool
  @@ -19,20 +23,31 @@
   #define ap_copy_array_hdr apr_copy_array_hdr
   #define ap_copy_table apr_copy_table
   #define ap_cpystrn apr_cpystrn
  +#define ap_day_snames apr_day_snames
   #define ap_destroy_pool apr_destroy_pool
  +#define ap_exploded_time_t apr_exploded_time_t
   #define ap_fnmatch apr_fnmatch
  +#define ap_inet_addr apr_inet_addr
   #define ap_init_alloc apr_init_alloc
  +#define ap_is_empty_table apr_is_empty_table
   #define ap_is_fnmatch apr_is_fnmatch
   #define ap_kill_cleanup apr_kill_cleanup
   #define ap_make_array apr_make_array
   #define ap_make_sub_pool apr_make_sub_pool
   #define ap_make_table apr_make_table
  +#define ap_month_snames apr_month_snames
   #define ap_note_subprocess apr_note_subprocess
   #define ap_null_cleanup apr_null_cleanup
  +#define ap_optarg apr_optarg 
  +#define ap_opterr apr_opterr
  +#define ap_optind apr_optind
  +#define ap_optopt apr_optopt
  +#define ap_optreset apr_optreset
   #define ap_overlap_tables apr_overlap_tables
   #define ap_overlay_tables apr_overlay_tables
   #define ap_palloc apr_palloc
   #define ap_pcalloc apr_pcalloc
  +#define ap_pool_join apr_pool_join
   #define ap_psprintf apr_psprintf
   #define ap_pstrcat apr_pstrcat
   #define ap_pstrdup apr_pstrdup
  @@ -47,6 +62,7 @@
   #define ap_table_add apr_table_add
   #define ap_table_addn apr_table_addn
   #define ap_table_do apr_table_do
  +#define ap_table_elts apr_table_elts
   #define ap_table_get apr_table_get
   #define ap_table_merge apr_table_merge
   #define ap_table_mergen apr_table_mergen
  @@ -57,5 +73,26 @@
   #define ap_validate_password apr_validate_password
   #define ap_vformatter apr_vformatter
   #define ap_vsnprintf apr_vsnprintf
  +#define ap_wait_t apr_wait_t
  +
  +#define ap_isalnum apr_isalnum
  +#define ap_isalpha apr_isalpha
  +#define ap_iscntrl apr_iscntrl
  +#define ap_isdigit apr_isdigit
  +#define ap_isgraph apr_isgraph
  +#define ap_islower apr_islower
  +#define ap_isascii apr_isascii
  +#define ap_isprint apr_isprint
  +#define ap_ispunct apr_ispunct
  +#define ap_isspace apr_isspace
  +#define ap_isupper apr_isupper
  +#define ap_isxdigit apr_isxdigit
  +#define ap_tolower apr_tolower
  +#define ap_toupper apr_toupper
  +
  +#define AP_USEC_PER_SEC APR_USEC_PER_SEC
  +#define AP_RFC822_DATE_LEN APR_RFC822_DATE_LEN
  +#define AP_OVERLAP_TABLES_MERGE APR_OVERLAP_TABLES_MERGE
  +#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
   
   #endif /* APR_COMPAT_H */
  
  
  
  1.65      +4 -4      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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- apr_file_io.h	2000/08/05 04:26:45	1.64
  +++ apr_file_io.h	2000/08/06 06:07:08	1.65
  @@ -71,7 +71,7 @@
    */
   
   typedef enum {APR_NOFILE, APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE, APR_LNK, 
  -              APR_SOCK} ap_filetype_e; 
  +              APR_SOCK} apr_filetype_e; 
   
   /* Flags for apr_open */
   #define APR_READ       1           /* Open the file for reading */
  @@ -129,7 +129,7 @@
       /** The type of file.  One of APR_NOFILE, APR_REG, APR_DIR, APR_CHR, 
        *  APR_BLK, APR_PIPE, APR_LNK, APR_SOCK 
        */
  -    ap_filetype_e filetype;
  +    apr_filetype_e filetype;
       /** The user id that owns the file */
       apr_uid_t user;
       /** The group id that owns the file */
  @@ -261,7 +261,7 @@
    * @param thefile The file descriptor to write to.
    * @param vec The array from which to get the data to write to the file.
    * @param nvec The number of elements in the struct iovec array. This must 
  - *             be smaller than AP_MAX_IOVEC_SIZE.  If it isn't, the function 
  + *             be smaller than APR_MAX_IOVEC_SIZE.  If it isn't, the function 
    *             will fail with APR_EINVAL.
    * @param nbytes The number of bytes written.
    * @tip It is possible for both bytes to be written and an error to be returned.
  @@ -536,7 +536,7 @@
    * @param type the file type of the directory entry. 
    * @param thedir the currently open directory.
    */
  -apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir);
  +apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir);
   
   /**
    * Write a string to a file using a printf format.
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apr_getopt.h	2000/08/02 05:26:04	1.13
  +++ apr_getopt.h	2000/08/06 06:07:08	1.14
  @@ -56,12 +56,12 @@
   #define APR_GETOPT_H
   
   APR_VAR_IMPORT int
  -    ap_opterr,                          /* if error message should be printed */
  -    ap_optind,                          /* index into parent argv vector */
  -    ap_optopt,                          /* character checked for validity */
  -    ap_optreset;                        /* reset getopt */
  +    apr_opterr,                          /* if error message should be printed */
  +    apr_optind,                          /* index into parent argv vector */
  +    apr_optopt,                          /* character checked for validity */
  +    apr_optreset;                        /* reset getopt */
   APR_VAR_IMPORT char *
  -    ap_optarg;                          /* argument associated with option */
  +    apr_optarg;                          /* argument associated with option */
   
   /**
    * Parse the command line options passed to the program.
  
  
  
  1.9       +3 -3      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_hash.h	2000/08/05 04:26:45	1.8
  +++ apr_hash.h	2000/08/06 06:07:08	1.9
  @@ -56,8 +56,8 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#ifndef ap_HASH_H
  -#define ap_HASH_H
  +#ifndef APR_HASH_H
  +#define APR_HASH_H
   
   #ifdef __cplusplus
   extern "C" {
  @@ -164,4 +164,4 @@
   }
   #endif
   
  -#endif	/* !ap_HASH_H */
  +#endif	/* !APR_HASH_H */
  
  
  
  1.42      +19 -19    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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- apr_lib.h	2000/08/02 05:26:04	1.41
  +++ apr_lib.h	2000/08/06 06:07:08	1.42
  @@ -114,20 +114,20 @@
    * that's legacy libc for ya.  These new macros do not support EOF like
    * the standard macros do.  Tough.
    */
  -#define ap_isalnum(c) (isalnum(((unsigned char)(c))))
  -#define ap_isalpha(c) (isalpha(((unsigned char)(c))))
  -#define ap_iscntrl(c) (iscntrl(((unsigned char)(c))))
  -#define ap_isdigit(c) (isdigit(((unsigned char)(c))))
  -#define ap_isgraph(c) (isgraph(((unsigned char)(c))))
  -#define ap_islower(c) (islower(((unsigned char)(c))))
  -#define ap_isascii(c) (isascii(((unsigned char)(c))))
  -#define ap_isprint(c) (isprint(((unsigned char)(c))))
  -#define ap_ispunct(c) (ispunct(((unsigned char)(c))))
  -#define ap_isspace(c) (isspace(((unsigned char)(c))))
  -#define ap_isupper(c) (isupper(((unsigned char)(c))))
  -#define ap_isxdigit(c) (isxdigit(((unsigned char)(c))))
  -#define ap_tolower(c) (tolower(((unsigned char)(c))))
  -#define ap_toupper(c) (toupper(((unsigned char)(c))))
  +#define apr_isalnum(c) (isalnum(((unsigned char)(c))))
  +#define apr_isalpha(c) (isalpha(((unsigned char)(c))))
  +#define apr_iscntrl(c) (iscntrl(((unsigned char)(c))))
  +#define apr_isdigit(c) (isdigit(((unsigned char)(c))))
  +#define apr_isgraph(c) (isgraph(((unsigned char)(c))))
  +#define apr_islower(c) (islower(((unsigned char)(c))))
  +#define apr_isascii(c) (isascii(((unsigned char)(c))))
  +#define apr_isprint(c) (isprint(((unsigned char)(c))))
  +#define apr_ispunct(c) (ispunct(((unsigned char)(c))))
  +#define apr_isspace(c) (isspace(((unsigned char)(c))))
  +#define apr_isupper(c) (isupper(((unsigned char)(c))))
  +#define apr_isxdigit(c) (isxdigit(((unsigned char)(c))))
  +#define apr_tolower(c) (tolower(((unsigned char)(c))))
  +#define apr_toupper(c) (toupper(((unsigned char)(c))))
   
   /*
    * Small utility macros to make things easier to read.  Not usually a
  @@ -135,12 +135,12 @@
    */
   
   #ifdef WIN32
  -#define ap_killpg(x, y)
  +#define apr_killpg(x, y)
   #else /* WIN32 */
   #ifdef NO_KILLPG
  -#define ap_killpg(x, y)		(kill (-(x), (y)))
  +#define apr_killpg(x, y)        (kill (-(x), (y)))
   #else /* NO_KILLPG */
  -#define ap_killpg(x, y)		(killpg ((x), (y)))
  +#define apr_killpg(x, y)        (killpg ((x), (y)))
   #endif /* NO_KILLPG */
   #endif /* WIN32 */
   
  @@ -166,9 +166,9 @@
    * for the increased robustness of having printf-warnings work.
    *
    * Additionally, apr_vformatter allows for arbitrary output methods
  - * using the ap_vformatter_buff and flush_func.
  + * using the apr_vformatter_buff and flush_func.
    *
  - * The ap_vformatter_buff has two elements curpos and endpos.
  + * The apr_vformatter_buff has two elements curpos and endpos.
    * 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
  
  
  
  1.17      +14 -13    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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_md5.h	2000/08/05 04:26:45	1.16
  +++ apr_md5.h	2000/08/06 06:07:09	1.17
  @@ -100,10 +100,10 @@
   
   /* UINT4 defines a four byte word */
   typedef unsigned int UINT4;
  -typedef struct ap_md5_ctx_t ap_md5_ctx_t;
  +typedef struct apr_md5_ctx_t apr_md5_ctx_t;
   
   /** MD5 context. */
  -struct ap_md5_ctx_t {
  +struct apr_md5_ctx_t {
       /** state (ABCD) */
       UINT4 state[4];
       /** number of bits, modulo 2^64 (lsb first) */
  @@ -119,21 +119,22 @@
   /**
    * MD5 Initialize.  Begins an MD5 operation, writing a new context.
    * @param context The MD5 context to initialize.
  - * @deffunc apr_status_t apr_MD5Init(ap_md5_ctx_t *context)
  + * @deffunc apr_status_t apr_MD5Init(apr_md5_ctx_t *context)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Init(ap_md5_ctx_t *context);
  +APR_EXPORT(apr_status_t) apr_MD5Init(apr_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 apr_status_t ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate)
  + * @deffunc apr_status_t apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate)
    */
   #if APR_HAS_XLATE
  -APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate);
  +APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
  +                                         apr_xlate_t *xlate);
   #else
  -#define ap_MD5SetXlate(context, xlate) APR_ENOTIMPL
  +#define apr_MD5SetXlate(context, xlate) APR_ENOTIMPL
   #endif
   
   /**
  @@ -142,21 +143,21 @@
    * @param context The MD5 content to update.
    * @param input next message block to update
    * @param inputLen The length of the next message block
  - * @deffunc apr_status_t apr_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen)
  + * @deffunc apr_status_t apr_MD5Update(apr_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen)
    */
  -APR_EXPORT(apr_status_t) apr_MD5Update(ap_md5_ctx_t *context,
  -                                     const unsigned char *input,
  -                                     unsigned int inputLen);
  +APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
  +                                       const unsigned char *input,
  +                                       unsigned int inputLen);
   
   /**
    * MD5 finalization.  Ends an MD5 message-digest operation, writing the 
    * message digest and zeroing the context
    * @param digest The final MD5 digest
    * @param context The MD5 content we are finalizing.
  - * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context)
  + * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], apr_md5_ctx_t *context)
    */
   APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  -                                    ap_md5_ctx_t *context);
  +                                      apr_md5_ctx_t *context);
   
   /**
    * Encode a password using an MD5 algorithm
  
  
  
  1.52      +5 -5      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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- apr_network_io.h	2000/08/05 04:26:45	1.51
  +++ apr_network_io.h	2000/08/06 06:07:09	1.52
  @@ -101,7 +101,7 @@
   #define APR_POLLNVAL  0x040
   
   typedef enum {APR_SHUTDOWN_READ, APR_SHUTDOWN_WRITE, 
  -	      APR_SHUTDOWN_READWRITE} ap_shutdown_how_e;
  +	      APR_SHUTDOWN_READWRITE} apr_shutdown_how_e;
   
   /* We need to make sure we always have an in_addr type, so APR will just
    * define it ourselves, if the platform doesn't provide it.
  @@ -112,14 +112,14 @@
   }
   #endif
   
  -/* I guess not everybody uses inet_addr.  This defines ap_inet_addr
  +/* I guess not everybody uses inet_addr.  This defines apr_inet_addr
    * appropriately.
    */
   
   #if APR_HAVE_INET_ADDR
  -#define ap_inet_addr    inet_addr
  +#define apr_inet_addr    inet_addr
   #elif APR_HAVE_INET_NETWORK        /* only DGUX, as far as I know */
  -#define ap_inet_addr    inet_network
  +#define apr_inet_addr    inet_network
   #endif
   
   typedef struct apr_socket_t     apr_socket_t;
  @@ -167,7 +167,7 @@
    * @tip This does not actually close the socket descriptor, it just
    *      controls which calls are still valid on the socket.
    */
  -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how);
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how);
   
   /**
    * Close a tcp socket.
  
  
  
  1.30      +20 -20    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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- apr_pools.h	2000/08/05 04:26:45	1.29
  +++ apr_pools.h	2000/08/06 06:07:09	1.30
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#ifndef ap_POOLS_H
  -#define ap_POOLS_H
  +#ifndef APR_POOLS_H
  +#define APR_POOLS_H
   
   #ifdef __cplusplus
   extern "C" {
  @@ -140,37 +140,37 @@
    * if the data is allocated in any ancestor of T's pool.  This is the
    * basis on which the POOL_DEBUG code works -- it tests these ancestor
    * relationships for all data inserted into tables.  POOL_DEBUG also
  - * provides tools (ap_find_pool, and ap_pool_is_ancestor) for other
  + * provides tools (apr_find_pool, and apr_pool_is_ancestor) for other
    * folks to implement similar restrictions for their own data
    * structures.
    *
    * However, sometimes this ancestor requirement is inconvenient --
    * sometimes we're forced to create a sub pool (such as through
  - * ap_sub_req_lookup_uri), and the sub pool is guaranteed to have
  + * apr_sub_req_lookup_uri), and the sub pool is guaranteed to have
    * the same lifetime as the parent pool.  This is a guarantee implemented
    * by the *caller*, not by the pool code.  That is, the caller guarantees
    * they won't destroy the sub pool individually prior to destroying the
    * parent pool.
    *
  - * In this case the caller must call ap_pool_join() to indicate this
  + * In this case the caller must call apr_pool_join() to indicate this
    * guarantee to the POOL_DEBUG code.  There are a few examples spread
    * through the standard modules.
    */
   #ifndef POOL_DEBUG
  -#ifdef ap_pool_join
  -#undef ap_pool_join
  +#ifdef apr_pool_join
  +#undef apr_pool_join
   #endif
  -#define ap_pool_join(a,b)
  +#define apr_pool_join(a,b)
   #else
  -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);
  +APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub);
  +APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts);
  +APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   #endif
   
   #ifdef ULTRIX_BRAIN_DEATH
  -#define ap_fdopen(d,m) fdopen((d), (char *)(m))
  +#define apr_fdopen(d,m) fdopen((d), (char *)(m))
   #else
  -#define ap_fdopen(d,m) fdopen((d), (m))
  +#define apr_fdopen(d,m) fdopen((d), (m))
   #endif
   
   /*
  @@ -241,9 +241,9 @@
    * @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(apr_pool_t *a, apr_pool_t *b)
  + * @deffunc int apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
    */
  -APR_EXPORT(int) ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
  +APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
   
   /**
    * Allocate a block of memory from a pool
  @@ -318,14 +318,14 @@
    * destroyed before the parent pool
    */
   #ifndef POOL_DEBUG
  -#ifdef ap_pool_join
  -#undef ap_pool_join
  -#endif /* ap_pool_join */
  -#define ap_pool_join(a,b)
  +#ifdef apr_pool_join
  +#undef apr_pool_join
  +#endif /* apr_pool_join */
  +#define apr_pool_join(a,b)
   #endif /* POOL_DEBUG */
   
   #ifdef __cplusplus
   }
   #endif
   
  -#endif	/* !ap_POOLS_H */
  +#endif	/* !APR_POOLS_H */
  
  
  
  1.39      +14 -10    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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr_portable.h	2000/08/02 05:26:07	1.38
  +++ apr_portable.h	2000/08/06 06:07:09	1.39
  @@ -218,7 +218,8 @@
    * @param ostime the native time format
    * @param aprtime the time to convert
    */
  -apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprtime);
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, 
  +                                 apr_exploded_time_t *aprtime);
   
   /**
    * Get the imploded time in the platforms native format.
  @@ -252,7 +253,7 @@
    *      an apr file type.
    */
   apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, 
  -                           apr_pool_t *cont); 
  +                             apr_pool_t *cont); 
   
   /**
    * convert the dir from os specific type to apr type.
  @@ -261,7 +262,7 @@
    * @param cont The pool to use when creating to apr directory.
    */
   apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, 
  -                          apr_pool_t *cont); 
  +                            apr_pool_t *cont); 
   
   /**
    * Convert a socket from the os specific type to the apr type
  @@ -270,7 +271,7 @@
    * @param cont The socket we are converting to an apr type.
    */
   apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, 
  -                           apr_pool_t *cont);
  +                             apr_pool_t *cont);
   
   /**
    * Convert the lock from os specific type to apr type
  @@ -279,7 +280,7 @@
    * @param cont The pool to use if it is needed.
    */
   apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
  -                           apr_pool_t *cont); 
  +                             apr_pool_t *cont); 
   
   /**
    * Put the imploded time in the APR format.
  @@ -287,7 +288,8 @@
    * @param ostime the time to convert
    * @param cont the pool to use if necessary
    */
  -apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime, apr_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 +297,8 @@
    * @param ostime the time to convert
    * @param cont the pool to use if necessary
    */
  -apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime, apr_os_exp_time_t **ostime, apr_pool_t *cont); 
  +apr_status_t apr_put_os_exp_time(apr_exploded_time_t *aprtime, 
  +                                 apr_os_exp_time_t **ostime, apr_pool_t *cont); 
   
   #if APR_HAS_THREADS
   /**
  @@ -305,7 +308,7 @@
    * @param cont The pool to use if it is needed.
    */
   apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, 
  -                             apr_pool_t *cont);
  +                               apr_pool_t *cont);
   
   /**
    * convert the thread private memory key from os specific type to apr type.
  @@ -313,8 +316,9 @@
    * @param thekey The os specific handle to convert
    * @param cont The pool to use if it is needed.
    */
  -apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, apr_os_threadkey_t *thekey, 
  -                                apr_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.6       +6 -6      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_tables.h	2000/08/05 04:26:45	1.5
  +++ apr_tables.h	2000/08/06 06:07:09	1.6
  @@ -132,8 +132,8 @@
    * placing it here we are able to get compile-time diagnostics from modules
    * written which assume that a apr_table_t is the same as an apr_array_header_t. -djg
    */
  -#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))
  +#define apr_table_elts(t) ((apr_array_header_t *)(t))
  +#define apr_is_empty_table(t) (((t) == NULL)||(((apr_array_header_t *)(t))->nelts == 0))
   
   APR_EXPORT(apr_array_header_t *) apr_make_array(struct apr_pool_t *p, int nelts,
   						int elt_size);
  @@ -193,12 +193,12 @@
   
   /* Conceptually, apr_overlap_tables does this:
   
  -    apr_array_header_t *barr = ap_table_elts(b);
  +    apr_array_header_t *barr = apr_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) {
  +        if (flags & apr_OVERLAP_TABLES_MERGE) {
               apr_table_mergen(a, belt[i].key, belt[i].val);
           }
           else {
  @@ -213,8 +213,8 @@
       in an ancestor of a's pool.  In practice b and a are usually from
       the same pool.
   */
  -#define AP_OVERLAP_TABLES_SET   (0)
  -#define AP_OVERLAP_TABLES_MERGE (1)
  +#define APR_OVERLAP_TABLES_SET   (0)
  +#define APR_OVERLAP_TABLES_MERGE (1)
   APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b,
   				    unsigned flags);
   
  
  
  
  1.43      +2 -2      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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- apr_thread_proc.h	2000/08/05 04:26:46	1.42
  +++ apr_thread_proc.h	2000/08/06 06:07:09	1.43
  @@ -416,8 +416,8 @@
    * @param p Pool to allocate child information out of.
    */
   
  -apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status, 
  -                              apr_wait_how_e waithow, apr_pool_t *p);
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, apr_wait_t *status, 
  +                                apr_wait_how_e waithow, apr_pool_t *p);
   
   /**
    * Detach the process from the controlling terminal.
  
  
  
  1.26      +14 -14    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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- apr_time.h	2000/08/05 04:26:46	1.25
  +++ apr_time.h	2000/08/06 06:07:10	1.26
  @@ -66,8 +66,8 @@
    * @package APR Time library
    */
   
  -APR_VAR_IMPORT const char ap_month_snames[12][4];
  -APR_VAR_IMPORT const char ap_day_snames[7][4];
  +APR_VAR_IMPORT const char apr_month_snames[12][4];
  +APR_VAR_IMPORT const char apr_day_snames[7][4];
   
   /* number of microseconds since 00:00:00 january 1, 1970 UTC */
   typedef apr_int64_t apr_time_t;
  @@ -76,15 +76,15 @@
   typedef apr_int32_t apr_interval_time_t;
   
   #ifdef WIN32
  -#define AP_USEC_PER_SEC ((LONGLONG) 1000000)
  +#define APR_USEC_PER_SEC ((LONGLONG) 1000000)
   #else
   /* XXX: this is wrong -- the LL is only required if int64 is implemented as
    * a long long, it could be just a long on some platforms.  the C99
    * correct way of doing this is to use INT64_C(1000000) which comes
    * from stdint.h.  we'd probably be doing a Good Thing to check for
  - * INT64_C in autoconf... or otherwise define an AP_INT64_C(). -dean
  + * INT64_C in autoconf... or otherwise define an APR_INT64_C(). -dean
    */
  -#define AP_USEC_PER_SEC (1000000LL)
  +#define APR_USEC_PER_SEC (1000000LL)
   #endif
   
   /**
  @@ -92,13 +92,13 @@
    */
   apr_time_t apr_now(void);
   
  -typedef struct ap_exploded_time_t ap_exploded_time_t;
  +typedef struct apr_exploded_time_t apr_exploded_time_t;
   /**
    * 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)
    */
  -struct ap_exploded_time_t {
  +struct apr_exploded_time_t {
       /** microseconds past tm_sec */
       apr_int32_t tm_usec;
       /** (0-61) seconds past tm_min */
  @@ -128,21 +128,21 @@
    * @param result the resulting apr_time_t
    * @param input the time_t to convert
    */
  -apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input);
  +apr_status_t apr_ansi_time_to_apr_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
    */
  -apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input);
  +apr_status_t apr_explode_gmt(apr_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
    */
  -apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input);
  +apr_status_t apr_explode_localtime(apr_exploded_time_t *result, apr_time_t input);
   
   /**
    * Convert time value from human readable format to number of seconds 
  @@ -150,7 +150,7 @@
    * @param result the resulting imploded time
    * @param input the input exploded time
    */
  -apr_status_t apr_implode_time(apr_time_t *result, ap_exploded_time_t *input);
  +apr_status_t apr_implode_time(apr_time_t *result, apr_exploded_time_t *input);
   
   /**
    * Sleep for the specified number of micro-seconds.
  @@ -159,7 +159,7 @@
    */
   void apr_sleep(apr_interval_time_t t);
   
  -#define AP_RFC822_DATE_LEN (30)
  +#define APR_RFC822_DATE_LEN (30)
   /**
    * apr_rfc822_date formats dates in the RFC822
    * format in an efficient manner.  it is a fixed length
  @@ -170,7 +170,7 @@
    */
   apr_status_t apr_rfc822_date(char *date_str, apr_time_t t);
   
  -#define AP_CTIME_LEN (25)
  +#define APR_CTIME_LEN (25)
   /**
    * apr_ctime formats dates in the ctime() format
    * in an efficient manner.  it is a fixed length format
  @@ -189,7 +189,7 @@
    * @param format The format for the time string
    * @param tm The time to convert
    */
  -apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_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, apr_exploded_time_t *tm);
   
   #ifdef __cplusplus
   }
  
  
  
  1.7       +23 -23    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_xlate.h	2000/08/02 05:26:08	1.6
  +++ apr_xlate.h	2000/08/06 06:07:10	1.7
  @@ -69,9 +69,9 @@
    */
   
   /* APR_HAS_XLATE determines whether or not useful implementations of 
  - * ap_xlate_open() et al are provided. 
  + * apr_xlate_open() et al are provided. 
    *
  - * If APR_HAS_XLATE is zero, ap_xlate_open() et al will all return 
  + * If APR_HAS_XLATE is zero, apr_xlate_open() et al will all return 
    * APR_ENOTIMPL at run-time.
    */
   
  @@ -83,22 +83,22 @@
    * these are macros which always return failure.
    */
   
  -#define ap_xlate_open(convset, topage, frompage, pool) APR_ENOTIMPL
  +#define apr_xlate_open(convset, topage, frompage, pool) APR_ENOTIMPL
   
  -#define ap_xlate_get_sb(convset, onoff) APR_ENOTIMPL
  +#define apr_xlate_get_sb(convset, onoff) APR_ENOTIMPL
   
  -#define ap_xlate_conv_buffer(convset, inbuf, inbytes_left, outbuf, \
  -                          outbytes_left) APR_ENOTIMPL
  +#define apr_xlate_conv_buffer(convset, inbuf, inbytes_left, outbuf, \
  +                              outbytes_left) APR_ENOTIMPL
   
  -#define ap_xlate_conv_byte(convset, inchar) (-1)
  +#define apr_xlate_conv_byte(convset, inchar) (-1)
   
  -/* The purpose of ap_xlate_conv_char is to translate one character
  +/* The purpose of apr_xlate_conv_char is to translate one character
    * at a time.  This needs to be written carefully so that it works
    * with double-byte character sets. 
    */
  -#define ap_xlate_conv_char(convset, inchar, outchar) APR_ENOTIMPL
  +#define apr_xlate_conv_char(convset, inchar, outchar) APR_ENOTIMPL
   
  -#define ap_xlate_close(convset) APR_ENOTIMPL
  +#define apr_xlate_close(convset) APR_ENOTIMPL
   
   #else  /* ! APR_HAS_XLATE */
   
  @@ -125,7 +125,7 @@
    *  names to indicate the charset of the current locale.
    * </PRE>
    */
  -apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage, 
  +apr_status_t apr_xlate_open(apr_xlate_t **convset, const char *topage, 
                             const char *frompage, apr_pool_t *pool);
   
   #define APR_DEFAULT_CHARSET (const char *)0
  @@ -133,16 +133,16 @@
   
   /**
    * Find out whether or not the specified conversion is single-byte-only.
  - * @param convset The handle allocated by ap_xlate_open, specifying the 
  + * @param convset The handle allocated by apr_xlate_open, specifying the 
    *                parameters of conversion
    * @param onoff Output: whether or not the conversion is single-byte-only
    */
   
  -apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff);
  +apr_status_t apr_xlate_get_sb(apr_xlate_t *convset, int *onoff);
   
   /**
    * Convert a buffer of text from one codepage to another.
  - * @param convset The handle allocated by ap_xlate_open, specifying 
  + * @param convset The handle allocated by apr_xlate_open, specifying 
    *                the parameters of conversion
    * @param inbuf The address of the source buffer
    * @param inbytes_left Input: the amount of input data to be translated
  @@ -151,36 +151,36 @@
    * @param outbytes_left Input: the size of the output buffer
    *                      Output: the amount of the output buffer not yet used
    */
  -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);
  +apr_status_t apr_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
  + * The purpose of apr_xlate_conv_char is to translate one character
    * at a time.  This needs to be written carefully so that it works
    * with double-byte character sets. 
  - * @param convset The handle allocated by ap_xlate_open, specifying the
  + * @param convset The handle allocated by apr_xlate_open, specifying the
    *                parameters of conversion
    * @param inchar The character to convert
    * @param outchar The converted character
    */
  -apr_status_t ap_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar);
  +apr_status_t apr_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar);
   
   /**
    * Convert a single-byte character from one charset to another.
  - * @param convset The handle allocated by ap_xlate_open, specifying the 
  + * @param convset The handle allocated by apr_xlate_open, specifying the 
    *                parameters of conversion
    * @param inchar The single-byte character to convert.
    * @tip This only works when converting between single-byte character sets.
           -1 will be returned if the conversion can't be performed.
   */
  -apr_int32_t ap_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar);
  +apr_int32_t apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar);
   
   /**
    * Close a codepage translation handle.
    * @param convset The codepage translation handle to close
    */
  -apr_status_t ap_xlate_close(apr_xlate_t *convset);
  +apr_status_t apr_xlate_close(apr_xlate_t *convset);
   
   #endif  /* ! APR_HAS_XLATE */
   
  
  
  
  1.67      +7 -7      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.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- apr_pools.c	2000/08/02 05:26:18	1.66
  +++ apr_pools.c	2000/08/06 06:07:13	1.67
  @@ -131,8 +131,8 @@
   #define BLOCK_MINALLOC	0
   #endif /* ALLOC_USE_MALLOC */
   
  -#define AP_SLACK_LOW    1
  -#define AP_SLACK_HIGH   2
  +#define APR_SLACK_LOW    1
  +#define APR_SLACK_HIGH   2
   
   
   /*****************************************************************
  @@ -671,7 +671,7 @@
   }
   
   /* 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,
  + * This is because if we also call this function from apr_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.
  @@ -762,7 +762,7 @@
   /* Find the pool that ts belongs to, return NULL if it doesn't
    * belong to any pool.
    */
  -APR_EXPORT(apr_pool_t *) ap_find_pool(const void *ts)
  +APR_EXPORT(apr_pool_t *) apr_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(apr_pool_t *a, apr_pool_t *b)
  +APR_EXPORT(int) apr_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(apr_pool_t *p, apr_pool_t *sub)
  +APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub)
   {
       union block_hdr *b;
   
  @@ -1207,7 +1207,7 @@
        */
       {
           for (p = procs; p; p = p->next) {
  -            CloseHandle(p->pid->pid);
  +            CloseHandle((HANDLE)p->pid->pid);
           }
       }
   #endif /* WIN32 */
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_signal.c	2000/08/02 05:26:18	1.11
  +++ apr_signal.c	2000/08/06 06:07:13	1.12
  @@ -80,5 +80,5 @@
   }
   #else
   /* need some function in this file, otherwise the linker on NeXT bitches */
  -void ap_signal_is_not_here(void) {}
  +void apr_signal_is_not_here(void) {}
   #endif
  
  
  
  1.16      +1 -1      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- crossproc.c	2000/08/02 05:26:19	1.15
  +++ crossproc.c	2000/08/06 06:07:14	1.16
  @@ -73,7 +73,7 @@
       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) {
  +    if ((stat = create_sem(0, "apr_interproc")) < B_NO_ERROR) {
           lock_inter_cleanup(new);
           return stat;
       }
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- intraproc.c	2000/08/02 05:26:19	1.11
  +++ intraproc.c	2000/08/06 06:07:14	1.12
  @@ -75,7 +75,7 @@
       new->ben_intraproc = (int32)apr_palloc(new->cntxt, sizeof(int32));
       
       
  -    if ((stat = create_sem(0, "ap_intraproc")) < B_NO_ERROR){
  +    if ((stat = create_sem(0, "apr_intraproc")) < B_NO_ERROR){
       	lock_intra_cleanup(new);
           return stat;
       }
  
  
  
  1.25      +2 -2      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- errorcodes.c	2000/08/02 05:26:22	1.24
  +++ errorcodes.c	2000/08/06 06:07:15	1.25
  @@ -187,9 +187,9 @@
   
         for (c=0; c<len; c++) {
   	  /* skip multiple whitespace */
  -          while (ap_isspace(message[c]) && ap_isspace(message[c+1]))
  +          while (apr_isspace(message[c]) && apr_isspace(message[c+1]))
                 c++;
  -          *(pos++) = ap_isspace(message[c]) ? ' ' : message[c];
  +          *(pos++) = apr_isspace(message[c]) ? ' ' : message[c];
         }
     
         *pos = 0;
  
  
  
  1.18      +32 -32    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- getopt.c	2000/08/02 05:26:22	1.17
  +++ getopt.c	2000/08/06 06:07:16	1.18
  @@ -34,91 +34,91 @@
   #include "misc.h"
   
   APR_VAR_EXPORT int
  -    ap_opterr = 1,                      /* if error message should be printed */
  -    ap_optind = 1,                      /* index into parent argv vector */
  -    ap_optopt,                          /* character checked for validity */
  -    ap_optreset;                        /* reset getopt */
  -APR_VAR_EXPORT char *ap_optarg = "";    /* argument associated with option */
  +    apr_opterr = 1,                      /* if error message should be printed */
  +    apr_optind = 1,                      /* index into parent argv vector */
  +    apr_optopt,                          /* character checked for validity */
  +    apr_optreset;                        /* reset getopt */
  +APR_VAR_EXPORT char *apr_optarg = "";    /* argument associated with option */
   
   #define EMSG    ""
   
   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)
  +                                    const char *ostr, apr_int32_t *rv, 
  +                                    apr_pool_t *cont)
   {
       char *p;
       static char *place = EMSG;   /* option letter processing */
       char *oli;                   /* option letter list index */
   
  -    if (ap_optreset || !*place) {   /* update scanning pointer */
  -        ap_optreset = 0;
  -        if (ap_optind >= nargc || *(place = nargv[ap_optind]) != '-') {
  +    if (apr_optreset || !*place) {   /* update scanning pointer */
  +        apr_optreset = 0;
  +        if (apr_optind >= nargc || *(place = nargv[apr_optind]) != '-') {
               place = EMSG;
  -            *rv = ap_optopt;
  +            *rv = apr_optopt;
               return (APR_EOF);
           }
           if (place[1] && *++place == '-') {        /* found "--" */
  -            ++ap_optind;
  +            ++apr_optind;
               place = EMSG;
  -            *rv = ap_optopt;
  +            *rv = apr_optopt;
               return (APR_EOF);
           }
       }                                /* option letter okay? */
  -    if ((ap_optopt = (int) *place++) == (int) ':' ||
  -        !(oli = strchr(ostr, ap_optopt))) {
  +    if ((apr_optopt = (int) *place++) == (int) ':' ||
  +        !(oli = strchr(ostr, apr_optopt))) {
           /*
            * if the user didn't specify '-' as an option,
            * assume it means -1.
            */
  -        if (ap_optopt == (int) '-') {
  -            *rv = ap_optopt;
  +        if (apr_optopt == (int) '-') {
  +            *rv = apr_optopt;
               return (APR_EOF);
           }
           if (!*place)
  -            ++ap_optind;
  -        if (ap_opterr && *ostr != ':') {
  +            ++apr_optind;
  +        if (apr_opterr && *ostr != ':') {
               if (!(p = strrchr(*nargv, '/')))
                   p = *nargv;
               else
                   ++p;
               (void) fprintf(stderr,
  -                           "%s: illegal option -- %c\n", p, ap_optopt);
  +                           "%s: illegal option -- %c\n", p, apr_optopt);
           }
  -        *rv = ap_optopt;
  +        *rv = apr_optopt;
           return APR_BADCH;
       }
       if (*++oli != ':') {        /* don't need argument */
  -        ap_optarg = NULL;
  +        apr_optarg = NULL;
           if (!*place)
  -            ++ap_optind;
  +            ++apr_optind;
       }
       else {                        /* need an argument */
           if (*place)                /* no white space */
  -            ap_optarg = place;
  -        else if (nargc <= ++ap_optind) {        /* no arg */
  +            apr_optarg = place;
  +        else if (nargc <= ++apr_optind) {        /* no arg */
               place = EMSG;
               if (*ostr == ':') {
  -                *rv = ap_optopt;
  +                *rv = apr_optopt;
                   return (APR_BADARG);
               }
  -            if (ap_opterr) {
  +            if (apr_opterr) {
                   if (!(p = strrchr(*nargv, '/')))
                       p = *nargv;
                   else
                       ++p;
                   (void) fprintf(stderr,
                                  "%s: option requires an argument -- %c\n",
  -                               p, ap_optopt);
  +                               p, apr_optopt);
               }
  -            *rv = ap_optopt;
  +            *rv = apr_optopt;
               return (APR_BADCH);
           }
           else                        /* white space */
  -            ap_optarg = nargv[ap_optind];
  +            apr_optarg = nargv[apr_optind];
           place = EMSG;
  -        ++ap_optind;
  +        ++apr_optind;
       }
  -    *rv = ap_optopt;
  +    *rv = apr_optopt;
       return APR_SUCCESS;
   }
   
  
  
  
  1.22      +19 -18    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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- misc.h	2000/08/02 05:26:22	1.21
  +++ misc.h	2000/08/06 06:07:16	1.22
  @@ -115,7 +115,7 @@
           APR_WIN_NT_4_SP4 = 16,
           APR_WIN_NT_4_SP6 = 18,
           APR_WIN_2000 = 24
  -} ap_oslevel_e;
  +} apr_oslevel_e;
   
   
   typedef enum {
  @@ -124,25 +124,26 @@
       DLL_WINSOCKAPI = 2,    // mswsock  From WinSock.h
       DLL_WINSOCK2API = 3,   // ws2_32   From WinSock2.h
       DLL_defined = 4        // must define as last idx_ + 1
  -} ap_dlltoken_e;
  +} apr_dlltoken_e;
   
  -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char *fnName, int ordinal);
  +FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
   
  -/* The ap_load_dll_func call WILL fault if the function cannot be loaded */
  +/* The apr_load_dll_func call WILL fault if the function cannot be loaded */
   
  -#define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
  -    typedef rettype (calltype *ap_winapi_fpt_##fn) args; \
  -    static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \
  -    __inline rettype ap_winapi_##fn args \
  -    {   if (!ap_winapi_pfn_##fn) \
  -            ap_winapi_pfn_##fn = (ap_winapi_fpt_##fn) ap_load_dll_func(lib, #fn, ord); \
  -        return (*(ap_winapi_pfn_##fn)) names; }; \
  +#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
  +    typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
  +    static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
  +    __inline rettype apr_winapi_##fn args \
  +    {   if (!apr_winapi_pfn_##fn) \
  +            apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
  +                                      apr_load_dll_func(lib, #fn, ord); \
  +        return (*(apr_winapi_pfn_##fn)) names; }; \
   
   /* Provide late bound declarations of every API function missing from
    * one or more supported releases of the Win32 API
    *
  - * lib is the enumerated token from ap_dlltoken_e, and must correspond
  - * to the string table entry in start.c used by the ap_load_dll_func().
  + * lib is the enumerated token from apr_dlltoken_e, and must correspond
  + * to the string table entry in start.c used by the apr_load_dll_func().
    * Token names (attempt to) follow Windows.h declarations prefixed by DLL_
    * in order to facilitate comparison.  Use the exact declaration syntax
    * and names from Windows.h to prevent ambigutity and bugs.
  @@ -157,20 +158,20 @@
    * In the case of non-text functions, simply #define the original name
    */
   
  -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
  +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
       IN LPCSTR lpFileName,
       IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
       OUT LPVOID lpFileInformation),
       (lpFileName, fInfoLevelId, lpFileInformation));
   #undef GetFileAttributesEx
  -#define GetFileAttributesEx ap_winapi_GetFileAttributesExA
  +#define GetFileAttributesEx apr_winapi_GetFileAttributesExA
   
  -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
  +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
       IN HANDLE hFile),
       (hFile));
  -#define CancelIo ap_winapi_CancelIo
  +#define CancelIo apr_winapi_CancelIo
   
  -apr_status_t ap_get_oslevel(struct apr_pool_t *, ap_oslevel_e *);
  +apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *);
   #endif /* WIN32 */
   
   #endif  /* ! MISC_H */
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- misc.c	2000/08/02 05:26:24	1.2
  +++ misc.c	2000/08/06 06:07:18	1.3
  @@ -55,7 +55,7 @@
   #include "apr_private.h"
   #include "misc.h"
   
  -apr_status_t ap_get_oslevel(apr_pool_t *cont, ap_oslevel_e *level)
  +apr_status_t apr_get_oslevel(apr_pool_t *cont, apr_oslevel_e *level)
   {
       static OSVERSIONINFO oslev;
       static unsigned int servpack = 0;
  @@ -123,7 +123,7 @@
   static HMODULE lateDllHandle[DLL_defined] = {
       NULL,       NULL,       NULL,       NULL      };
   
  -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal)
  +FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
   {
       if (!lateDllHandle[fnLib]) { 
           lateDllHandle[fnLib] = LoadLibrary(lateDllName[fnLib]);
  
  
  
  1.15      +3 -3      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- names.c	2000/08/02 05:26:24	1.14
  +++ names.c	2000/08/06 06:07:18	1.15
  @@ -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(apr_pool_t *pCont, 
  +APR_EXPORT(char *) apr_os_systemcase_filename(apr_pool_t *pCont, 
                                                const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
  @@ -271,10 +271,10 @@
           char *pConvertedName, *pQstr, *pPstr;
           char buf[HUGE_STRING_LEN];
           /* We potentially have a short name.  Call 
  -         * ap_os_systemcase_filename to examine the filesystem
  +         * apr_os_systemcase_filename to examine the filesystem
            * and possibly extract the long name.
            */
  -        pConvertedName = ap_os_systemcase_filename(pCont, pNewStr);
  +        pConvertedName = apr_os_systemcase_filename(pCont, pNewStr);
   
           /* Since we want to preserve the incoming case as much
            * as we can, compare for differences in the string and
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- poll.c	2000/08/02 05:26:26	1.21
  +++ poll.c	2000/08/06 06:07:19	1.22
  @@ -112,8 +112,8 @@
           tvptr = NULL;
       }
       else {
  -        tv.tv_sec = timeout / AP_USEC_PER_SEC;
  -        tv.tv_usec = timeout % AP_USEC_PER_SEC;
  +        tv.tv_sec = timeout / APR_USEC_PER_SEC;
  +        tv.tv_usec = timeout % APR_USEC_PER_SEC;
   	tvptr = &tv;
       }
   
  
  
  
  1.15      +2 -2      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sendrecv.c	2000/08/02 05:26:26	1.14
  +++ sendrecv.c	2000/08/06 06:07:20	1.15
  @@ -71,8 +71,8 @@
               tvptr = NULL;
           }
           else {
  -            tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
  -            tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
  +            tv.tv_sec = sock->timeout / APR_USEC_PER_SEC;
  +            tv.tv_usec = sock->timeout % APR_USEC_PER_SEC;
               tvptr = &tv;
           }
           srv = select(sock->socketdes + 1,
  
  
  
  1.33      +1 -1      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- sockets.c	2000/08/02 05:26:26	1.32
  +++ sockets.c	2000/08/06 06:07:20	1.33
  @@ -104,7 +104,7 @@
       return APR_SUCCESS;
   } 
   
  -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
   {
       return shutdown(thesocket->socketdes, how);
   }
  
  
  
  1.17      +1 -1      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- poll.c	2000/08/02 05:26:27	1.16
  +++ poll.c	2000/08/06 06:07:21	1.17
  @@ -134,7 +134,7 @@
       time_t starttime;
       struct timeval tv;
   
  -    timeout /= AP_USEC_PER_SEC; /* TODO: rework for microseconds and axe this */
  +    timeout /= APR_USEC_PER_SEC; /* TODO: rework for microseconds and axe this */
   
       tv.tv_sec = timeout;
       tv.tv_usec = 0;
  
  
  
  1.26      +1 -1      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- sockets.c	2000/08/02 05:26:27	1.25
  +++ sockets.c	2000/08/06 06:07:21	1.26
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   } 
   
  -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
   {
       if (shutdown(thesocket->socketdes, how) == 0) {
           return APR_SUCCESS;
  
  
  
  1.38      +2 -2      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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- poll.c	2000/08/02 05:26:29	1.37
  +++ poll.c	2000/08/06 06:07:22	1.38
  @@ -267,8 +267,8 @@
           tvptr = NULL;
       }
       else {
  -        tv.tv_sec = timeout / AP_USEC_PER_SEC;
  -        tv.tv_usec = timeout % AP_USEC_PER_SEC;
  +        tv.tv_sec = timeout / APR_USEC_PER_SEC;
  +        tv.tv_usec = timeout % APR_USEC_PER_SEC;
           tvptr = &tv;
       }
   
  
  
  
  1.39      +2 -2      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- sendrecv.c	2000/08/04 02:48:38	1.38
  +++ sendrecv.c	2000/08/06 06:07:22	1.39
  @@ -91,8 +91,8 @@
               tvptr = NULL;
           }
           else {
  -            tv.tv_sec = sock->timeout / AP_USEC_PER_SEC;
  -            tv.tv_usec = sock->timeout % AP_USEC_PER_SEC;
  +            tv.tv_sec = sock->timeout / APR_USEC_PER_SEC;
  +            tv.tv_usec = sock->timeout % APR_USEC_PER_SEC;
               tvptr = &tv;
           }
           srv = select(sock->socketdes + 1,
  
  
  
  1.53      +1 -1      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.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- sockets.c	2000/08/02 05:26:29	1.52
  +++ sockets.c	2000/08/06 06:07:22	1.53
  @@ -100,7 +100,7 @@
       return APR_SUCCESS;
   } 
   
  -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
   {
       return (shutdown(thesocket->socketdes, how) == -1) ? errno : APR_SUCCESS;
   }
  
  
  
  1.20      +2 -2      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- poll.c	2000/08/02 05:26:31	1.19
  +++ poll.c	2000/08/06 06:07:24	1.20
  @@ -125,8 +125,8 @@
               tvptr = NULL;
           }
           else {
  -            tv.tv_sec = (long)(timeout / AP_USEC_PER_SEC);
  -            tv.tv_usec = (long)(timeout % AP_USEC_PER_SEC);
  +            tv.tv_sec = (long)(timeout / APR_USEC_PER_SEC);
  +            tv.tv_usec = (long)(timeout % APR_USEC_PER_SEC);
               tvptr = &tv;
           }
           rv = select(500, /* ignored on Windows */
  
  
  
  1.37      +1 -1      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- sockets.c	2000/08/02 05:26:31	1.36
  +++ sockets.c	2000/08/06 06:07:24	1.37
  @@ -113,7 +113,7 @@
       return APR_SUCCESS;
   } 
   
  -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how)
  +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
   {
       int winhow;
   
  
  
  
  1.3       +18 -14    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_md5.c	2000/08/02 05:26:32	1.2
  +++ apr_md5.c	2000/08/06 06:07:25	1.3
  @@ -186,7 +186,7 @@
   
   /* MD5 initialization. Begins an MD5 operation, writing a new context.
    */
  -APR_EXPORT(apr_status_t) apr_MD5Init(ap_md5_ctx_t *context)
  +APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context)
   {
       context->count[0] = context->count[1] = 0;
       /* Load magic initialization constants. */
  @@ -205,14 +205,15 @@
    * to be used for translating the content before calculating the
    * digest.
    */
  -APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate)
  +APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, 
  +                                         apr_xlate_t *xlate)
   {
       apr_status_t rv;
       int is_sb;
   
       /* TODO: remove the single-byte-only restriction from this code
        */
  -    rv = ap_xlate_get_sb(xlate, &is_sb);
  +    rv = apr_xlate_get_sb(xlate, &is_sb);
       if (rv != APR_SUCCESS) {
           return rv;
       }
  @@ -228,7 +229,7 @@
      operation, processing another message block, and updating the
      context.
    */
  -APR_EXPORT(apr_status_t) apr_MD5Update(ap_md5_ctx_t *context,
  +APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context,
                                        const unsigned char *input,
                                        unsigned int inputLen)
   {
  @@ -241,7 +242,8 @@
       idx = (unsigned int) ((context->count[0] >> 3) & 0x3F);
   
       /* Update number of bits */
  -    if ((context->count[0] += ((UINT4) inputLen << 3)) < ((UINT4) inputLen << 3))
  +    if ((context->count[0] += ((UINT4) inputLen << 3)) 
  +            < ((UINT4) inputLen << 3))
   	context->count[1]++;
       context->count[1] += (UINT4) inputLen >> 29;
   
  @@ -267,7 +269,7 @@
       if (inputLen >= partLen) {
           if (context->xlate) {
               inbytes_left = outbytes_left = partLen;
  -            ap_xlate_conv_buffer(context->xlate, input, &inbytes_left,
  +            apr_xlate_conv_buffer(context->xlate, input, &inbytes_left,
                                    &context->buffer[idx],&outbytes_left);
           }
           else {
  @@ -279,7 +281,7 @@
               if (context->xlate) {
                   unsigned char inp_tmp[64];
                   inbytes_left = outbytes_left = 64;
  -                ap_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
  +                apr_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
                                        inp_tmp, &outbytes_left);
                   MD5Transform(context->state, inp_tmp);
               }
  @@ -296,7 +298,7 @@
       /* Buffer remaining input */
       if (context->xlate) {
           inbytes_left = outbytes_left = inputLen - i;
  -        ap_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
  +        apr_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
                                &context->buffer[idx], &outbytes_left);
       }
       else {
  @@ -310,7 +312,7 @@
      the message digest and zeroizing the context.
    */
   APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE],
  -                                    ap_md5_ctx_t *context)
  +                                      apr_md5_ctx_t *context)
   {
       unsigned char bits[8];
       unsigned int idx, padLen;
  @@ -459,7 +461,7 @@
   }
   
   #ifdef CHARSET_EBCDIC
  -APR_EXPORT(apr_status_t) ap_MD5InitEBCDIC(apr_xlate_t *xlate)
  +APR_EXPORT(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
   {
       xlate_ebcdic_to_ascii = xlate;
       return APR_SUCCESS;
  @@ -502,7 +504,7 @@
       const char *sp, *ep;
       unsigned char final[MD5_DIGESTSIZE];
       int sl, pl, i;
  -    ap_md5_ctx_t ctx, ctx1;
  +    apr_md5_ctx_t ctx, ctx1;
       unsigned long l;
   
       /* 
  @@ -536,7 +538,7 @@
        */
       apr_MD5Init(&ctx);
   #ifdef CHARSET_EBCDIC
  -    ap_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii);
  +    apr_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii);
   #endif
       
       /*
  @@ -563,7 +565,8 @@
       apr_MD5Update(&ctx1, (unsigned char *)pw, strlen(pw));
       apr_MD5Final(final, &ctx1);
       for (pl = strlen(pw); pl > 0; pl -= MD5_DIGESTSIZE) {
  -	apr_MD5Update(&ctx, final, (pl > MD5_DIGESTSIZE) ? MD5_DIGESTSIZE : pl);
  +        apr_MD5Update(&ctx, final, 
  +                      (pl > MD5_DIGESTSIZE) ? MD5_DIGESTSIZE : pl);
       }
   
       /*
  @@ -649,7 +652,8 @@
    * APR_EMISMATCH if they don't.
    */
   
  -APR_EXPORT(apr_status_t) apr_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)
  
  
  
  1.3       +6 -6      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_cpystrn.c	2000/08/02 05:26:34	1.2
  +++ apr_cpystrn.c	2000/08/06 06:07:25	1.3
  @@ -108,7 +108,7 @@
    * This function provides a way to parse a generic argument string
    * into a standard argv[] form of argument list. It respects the 
    * usual "whitespace" and quoteing rules. In the future this could
  - * be expanded to include support for the ap_call_exec command line
  + * be expanded to include support for the apr_call_exec command line
    * string processing (including converting '+' to ' ' and doing the 
    * url processing. It does not currently support this function.
    *
  @@ -237,7 +237,7 @@
   APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src)
   {
       while (*src) {
  -        if (!ap_isspace(*src)) 
  +        if (!apr_isspace(*src)) 
               *dest++ = *src;
           ++src;
       }
  @@ -254,8 +254,8 @@
       if (!(sdup = (char *) malloc(len))) {
           /* ### whoops! we can't call Apache logging routines here... */
   #if 0
  -        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  -                     "Ouch! Out of memory in our strdup()!");
  +        apr_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  +                      "Ouch! Out of memory in our strdup()!");
   #endif
           return NULL;
       }
  @@ -272,7 +272,7 @@
       const char *p = a;
       const char *q = b;
       for (p = a, q = b; *p && *q; p++, q++) {
  -        int diff = ap_tolower(*p) - ap_tolower(*q);
  +        int diff = apr_tolower(*p) - apr_tolower(*q);
           if (diff)
               return diff;
       }
  @@ -297,7 +297,7 @@
               return 0;           /*   Match up to n characters */
           if (!(*p && *q))
               return *p - *q;
  -        diff = ap_tolower(*p) - ap_tolower(*q);
  +        diff = apr_tolower(*p) - apr_tolower(*q);
           if (diff)
               return diff;
       }
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_fnmatch.c	2000/08/02 05:26:34	1.2
  +++ apr_fnmatch.c	2000/08/06 06:07:26	1.3
  @@ -146,7 +146,7 @@
   	    /* FALLTHROUGH */
   	default:
   	    if (flags & FNM_CASE_BLIND) {
  -	        if (ap_tolower(c) != ap_tolower(*string)) {
  +	        if (apr_tolower(c) != apr_tolower(*string)) {
   		    return (FNM_NOMATCH);
   		}
   	    }
  @@ -193,14 +193,14 @@
   	    }
   	    if ((c <= test && test <= c2)
   		|| ((flags & FNM_CASE_BLIND)
  -		    && ((ap_tolower(c) <= ap_tolower(test))
  -			&& (ap_tolower(test) <= ap_tolower(c2))))) {
  +		    && ((apr_tolower(c) <= apr_tolower(test))
  +			&& (apr_tolower(test) <= apr_tolower(c2))))) {
   		ok = 1;
   	    }
   	}
   	else if ((c == test)
   		 || ((flags & FNM_CASE_BLIND)
  -		     && (ap_tolower(c) == ap_tolower(test)))) {
  +		     && (apr_tolower(c) == apr_tolower(test)))) {
   	    ok = 1;
   	}
       }
  
  
  
  1.4       +22 -21    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_snprintf.c	2000/08/02 05:26:34	1.3
  +++ apr_snprintf.c	2000/08/06 06:07:26	1.4
  @@ -90,12 +90,12 @@
   #ifndef TRUE
   #define TRUE			1
   #endif
  -#ifndef AP_LONGEST_LONG
  -#define AP_LONGEST_LONG		long
  +#ifndef APR_LONGEST_LONG
  +#define APR_LONGEST_LONG	long
   #endif
   #define NUL			'\0'
   #define WIDE_INT		long
  -#define WIDEST_INT		AP_LONGEST_LONG
  +#define WIDEST_INT		APR_LONGEST_LONG
   
   typedef WIDE_INT wide_int;
   typedef unsigned WIDE_INT u_wide_int;
  @@ -127,7 +127,7 @@
    */
   
   /*
  - *    ap_ecvt converts to decimal
  + *    apr_ecvt converts to decimal
    *      the number of digits is specified by ndigit
    *      decpt is set to the position of the decimal point
    *      sign is set to 0 for positive, 1 for negative
  @@ -136,7 +136,8 @@
   #define	NDIG	80
   
   /* buf must have at least NDIG bytes */
  -static char *ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag, char *buf)
  +static char *apr_cvt(double arg, int ndigits, int *decpt, int *sign, 
  +                     int eflag, char *buf)
   {
       register int r2;
       double fi, fj;
  @@ -209,29 +210,29 @@
       return (buf);
   }
   
  -static char *ap_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
  +static char *apr_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
   {
  -    return (ap_cvt(arg, ndigits, decpt, sign, 1, buf));
  +    return (apr_cvt(arg, ndigits, decpt, sign, 1, buf));
   }
   
  -static char *ap_fcvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
  +static char *apr_fcvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
   {
  -    return (ap_cvt(arg, ndigits, decpt, sign, 0, buf));
  +    return (apr_cvt(arg, ndigits, decpt, sign, 0, buf));
   }
   
   /*
  - * ap_gcvt  - Floating output conversion to
  + * apr_gcvt  - Floating output conversion to
    * minimal length string
    */
   
  -static char *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
  +static char *apr_gcvt(double number, int ndigit, char *buf, boolean_e altform)
   {
       int sign, decpt;
       register char *p1, *p2;
       register int i;
       char buf1[NDIG];
   
  -    p1 = ap_ecvt(number, ndigit, &decpt, &sign, buf1);
  +    p1 = apr_ecvt(number, ndigit, &decpt, &sign, buf1);
       p2 = buf;
       if (sign)
   	*p2++ = '-';
  @@ -310,7 +311,7 @@
   
   #define STR_TO_DEC( str, num )		\
       num = NUM( *str++ ) ;		\
  -    while ( ap_isdigit( *str ) )		\
  +    while ( apr_isdigit( *str ) )		\
       {					\
   	num *= 10 ;			\
   	num += NUM( *str++ ) ;		\
  @@ -523,14 +524,14 @@
       char buf1[NDIG];
   
       if (format == 'f')
  -	p = ap_fcvt(num, precision, &decimal_point, is_negative, buf1);
  +	p = apr_fcvt(num, precision, &decimal_point, is_negative, buf1);
       else			/* either e or E format */
  -	p = ap_ecvt(num, precision + 1, &decimal_point, is_negative, buf1);
  +	p = apr_ecvt(num, precision + 1, &decimal_point, is_negative, buf1);
   
       /*
        * Check for Infinity and NaN
        */
  -    if (ap_isalpha(*p)) {
  +    if (apr_isalpha(*p)) {
   	*len = strlen(strcpy(buf, p));
   	*is_negative = FALSE;
   	return (buf);
  @@ -721,7 +722,7 @@
   	    /*
   	     * Try to avoid checking for flags, width or precision
   	     */
  -	    if (!ap_islower(*fmt)) {
  +	    if (!apr_islower(*fmt)) {
   		/*
   		 * Recognize flags: -, #, BLANK, +
   		 */
  @@ -743,7 +744,7 @@
   		/*
   		 * Check if a width was specified
   		 */
  -		if (ap_isdigit(*fmt)) {
  +		if (apr_isdigit(*fmt)) {
   		    STR_TO_DEC(fmt, min_width);
   		    adjust_width = YES;
   		}
  @@ -769,7 +770,7 @@
   		if (*fmt == '.') {
   		    adjust_precision = YES;
   		    fmt++;
  -		    if (ap_isdigit(*fmt)) {
  +		    if (apr_isdigit(*fmt)) {
   			STR_TO_DEC(fmt, precision);
   		    }
   		    else if (*fmt == '*') {
  @@ -958,7 +959,7 @@
   		/*
   		 * * We use &num_buf[ 1 ], so that we have room for the sign
   		 */
  -		s = ap_gcvt(va_arg(ap, double), precision, &num_buf[1],
  +		s = apr_gcvt(va_arg(ap, double), precision, &num_buf[1],
   		            alternate_form);
   		if (*s == '-')
   		    prefix_char = *s++;
  @@ -1018,7 +1019,7 @@
   		     * don't handle "%p".
   		     */
   		case 'p':
  -#ifdef AP_VOID_P_IS_QUAD
  +#ifdef APR_VOID_P_IS_QUAD
   		    if (sizeof(void *) <= sizeof(u_widest_int)) {
   		    	ui_quad = (u_widest_int) va_arg(ap, void *);
   			s = conv_p2_quad(ui_quad, 4, 'x',
  
  
  
  1.3       +18 -18    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_hash.c	2000/08/02 05:26:35	1.2
  +++ apr_hash.c	2000/08/06 06:07:27	1.3
  @@ -80,10 +80,10 @@
    * isn't too bad given that pools have a low allocation overhead.
    */
   
  -typedef struct ap_hash_entry_t ap_hash_entry_t;
  +typedef struct apr_hash_entry_t apr_hash_entry_t;
   
  -struct ap_hash_entry_t {
  -    ap_hash_entry_t	*next;
  +struct apr_hash_entry_t {
  +    apr_hash_entry_t	*next;
       int			 hash;
       const void		*key;
       size_t		 klen;
  @@ -98,9 +98,9 @@
    * collision rate.
    */
   struct apr_hash_t {
  -    apr_pool_t		 *pool;
  -    ap_hash_entry_t	**array;
  -    size_t		  count, max;
  +    apr_pool_t		*pool;
  +    apr_hash_entry_t   **array;
  +    size_t		 count, max;
   };
   #define INITIAL_MAX 15 /* tunable == 2^n - 1 */
   
  @@ -112,9 +112,9 @@
    * apr_hash_next().
    */
   struct apr_hash_index_t {
  -    apr_hash_t		*ht;
  -    ap_hash_entry_t	*this, *next;
  -    int			 index;
  +    apr_hash_t	       *ht;
  +    apr_hash_entry_t   *this, *next;
  +    size_t		index;
   };
   
   
  @@ -122,7 +122,7 @@
    * Hash creation functions.
    */
   
  -static ap_hash_entry_t **alloc_array(apr_hash_t *ht)
  +static apr_hash_entry_t **alloc_array(apr_hash_t *ht)
   {
      return apr_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1));
   }
  @@ -167,9 +167,9 @@
   }
   
   APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi,
  -			      const void **key,
  -			      size_t *klen,
  -			      void **val)
  +			       const void **key,
  +			       size_t *klen,
  +			       void **val)
   {
       if (key)  *key  = hi->this->key;
       if (klen) *klen = hi->this->klen;
  @@ -184,7 +184,7 @@
   static void resize_array(apr_hash_t *ht)
   {
       apr_hash_index_t *hi;
  -    ap_hash_entry_t **new_array;
  +    apr_hash_entry_t **new_array;
       int i;
   
       new_array = alloc_array(ht);
  @@ -205,12 +205,12 @@
    * that hash entries can be removed.
    */
   
  -static ap_hash_entry_t **find_entry(apr_hash_t *ht,
  +static apr_hash_entry_t **find_entry(apr_hash_t *ht,
   				    const void *key,
   				    size_t klen,
   				    const void *val)
   {
  -    ap_hash_entry_t **hep, *he;
  +    apr_hash_entry_t **hep, *he;
       const unsigned char *p;
       int hash;
       int i;
  @@ -284,7 +284,7 @@
   			       const void *key,
   			       size_t klen)
   {
  -    ap_hash_entry_t *he;
  +    apr_hash_entry_t *he;
       he = *find_entry(ht, key, klen, NULL);
       if (he)
   	return (void *)he->val;
  @@ -297,7 +297,7 @@
   			     size_t klen,
   			     const void *val)
   {
  -    ap_hash_entry_t **hep;
  +    apr_hash_entry_t **hep;
       hep = find_entry(ht, key, klen, val);
       if (*hep) {
           if (!val) {
  
  
  
  1.4       +18 -18    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_tables.c	2000/08/02 05:26:35	1.3
  +++ apr_tables.c	2000/08/06 06:07:27	1.4
  @@ -313,7 +313,7 @@
       /* we don't copy keys and values, so it's necessary that t->a.pool
        * have a life span at least as long as p
        */
  -    if (!ap_pool_is_ancestor(t->a.cont, p)) {
  +    if (!apr_pool_is_ancestor(t->a.cont, p)) {
   	fprintf(stderr, "copy_table: t's pool is not an ancestor of p\n");
   	abort();
       }
  @@ -390,11 +390,11 @@
   
   #ifdef POOL_DEBUG
       {
  -	if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(key), t->a.cont)) {
   	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
   	    abort();
   	}
  -	if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(val), t->a.cont)) {
   	    fprintf(stderr, "table_set: val not in ancestor pool of t\n");
   	    abort();
   	}
  @@ -479,11 +479,11 @@
   
   #ifdef POOL_DEBUG
       {
  -	if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(key), t->a.cont)) {
   	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
   	    abort();
   	}
  -	if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(val), t->a.cont)) {
   	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
   	    abort();
   	}
  @@ -519,11 +519,11 @@
   
   #ifdef POOL_DEBUG
       {
  -	if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(key), t->a.cont)) {
   	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
   	    abort();
   	}
  -	if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont)) {
  +	if (!apr_pool_is_ancestor(apr_find_pool(val), t->a.cont)) {
   	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
   	    abort();
   	}
  @@ -546,12 +546,12 @@
        * overlay->a.pool and base->a.pool have a life span at least
        * as long as p
        */
  -    if (!ap_pool_is_ancestor(overlay->a.cont, p)) {
  +    if (!apr_pool_is_ancestor(overlay->a.cont, p)) {
   	fprintf(stderr,
   		"overlay_tables: overlay's pool is not an ancestor of p\n");
   	abort();
       }
  -    if (!ap_pool_is_ancestor(base->a.cont, p)) {
  +    if (!apr_pool_is_ancestor(base->a.cont, p)) {
   	fprintf(stderr,
   		"overlay_tables: base's pool is not an ancestor of p\n");
   	abort();
  @@ -593,19 +593,19 @@
    * 
    * The caching api will allow a user to walk the header values:
    *
  - * apr_status_t ap_cache_el_header_walk(ap_cache_el *el, 
  + * apr_status_t apr_cache_el_header_walk(apr_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:
    *
  - * apr_status_t (*cache_el_header_walk)(ap_cache_el *el, 
  + * apr_status_t (*cache_el_header_walk)(apr_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
  + * their headers, in the file case this is actually just an apr_table - and
    * 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
  + * can't use apr_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
  @@ -662,14 +662,14 @@
   }
   
   /* prefer to use the stack for temp storage for overlaps smaller than this */
  -#ifndef ap_OVERLAP_TABLES_ON_STACK
  -#define ap_OVERLAP_TABLES_ON_STACK	(512)
  +#ifndef APR_OVERLAP_TABLES_ON_STACK
  +#define APR_OVERLAP_TABLES_ON_STACK	(512)
   #endif
   
   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_buf[APR_OVERLAP_TABLES_ON_STACK];
       overlap_key *cat_keys;
       int nkeys;
       apr_table_entry_t *e;
  @@ -679,7 +679,7 @@
       overlap_key *last;
   
       nkeys = a->a.nelts + b->a.nelts;
  -    if (nkeys < ap_OVERLAP_TABLES_ON_STACK) {
  +    if (nkeys < APR_OVERLAP_TABLES_ON_STACK) {
   	cat_keys = cat_keys_buf;
       }
       else {
  @@ -736,7 +736,7 @@
        * appropriate.
        */
   
  -    if (flags & AP_OVERLAP_TABLES_MERGE) {
  +    if (flags & APR_OVERLAP_TABLES_MERGE) {
   	left = cat_keys;
   	last = left + nkeys;
   	while (left < last) {
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- client.c	2000/08/02 05:26:36	1.13
  +++ client.c	2000/08/06 06:07:28	1.14
  @@ -80,7 +80,7 @@
       }
   
       if (argc > 2) {
  -        read_timeout = AP_USEC_PER_SEC * atoi(argv[2]);
  +        read_timeout = APR_USEC_PER_SEC * atoi(argv[2]);
       }
   
       fprintf(stdout, "Initializing.........");
  
  
  
  1.14      +3 -3      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- testargs.c	2000/08/02 05:26:36	1.13
  +++ testargs.c	2000/08/06 06:07:28	1.14
  @@ -79,12 +79,12 @@
                   printf("option %c\n", data);
                   break;
               case 'c':
  -                printf("option %c with %s\n", data, ap_optarg);
  +                printf("option %c with %s\n", data, apr_optarg);
                   break;
               case 'd':
                   printf("option %c", data);
  -                if (ap_optarg) {
  -                    printf(" with %s\n", ap_optarg);
  +                if (apr_optarg) {
  +                    printf(" with %s\n", apr_optarg);
                   }
                   else {
                       printf("\n");
  
  
  
  1.17      +1 -1      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- testfile.c	2000/08/02 05:26:37	1.16
  +++ testfile.c	2000/08/06 06:07:28	1.17
  @@ -278,7 +278,7 @@
       apr_dir_t *temp;  
       apr_file_t *file = NULL;
       apr_ssize_t bytes;
  -    ap_filetype_e type;
  +    apr_filetype_e type;
       char *fname;
   
       fprintf(stdout, "Testing Directory functions.\n");
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testmd5.c	2000/08/02 05:26:37	1.2
  +++ testmd5.c	2000/08/06 06:07:29	1.3
  @@ -86,7 +86,7 @@
   {
       int i;
       apr_status_t rv;
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char hash[MD5_DIGESTSIZE];
   
       rv = apr_MD5Init(&context);
  @@ -94,7 +94,7 @@
   
       if (xlate) {
   #if APR_HAS_XLATE
  -        ap_MD5SetXlate(&context, xlate);
  +        apr_MD5SetXlate(&context, xlate);
   #else
           fprintf(stderr,
                   "A translation handle was unexpected.\n");
  @@ -156,11 +156,11 @@
   
       if (src) {
   #if APR_HAS_XLATE
  -        rv = ap_xlate_open(&xlate, dst, src, pool);
  +        rv = apr_xlate_open(&xlate, dst, src, pool);
           if (rv) {
               char buf[80];
   
  -            fprintf(stderr, "ap_xlate_open()->%s (%d)\n",
  +            fprintf(stderr, "apr_xlate_open()->%s (%d)\n",
                       apr_strerror(rv, buf, sizeof(buf)), rv);
               exit(1);
           }
  
  
  
  1.10      +1 -1      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- testpipe.c	2000/08/02 05:26:37	1.9
  +++ testpipe.c	2000/08/06 06:07:29	1.10
  @@ -95,7 +95,7 @@
       }
       
       fprintf(stdout, "\tSetting pipe timeout.......");
  -    if ((rv = apr_set_pipe_timeout(readp, 1 * AP_USEC_PER_SEC)) != APR_SUCCESS) {
  +    if ((rv = apr_set_pipe_timeout(readp, 1 * APR_USEC_PER_SEC)) != APR_SUCCESS) {
           fprintf(stderr, "apr_set_pipe_timeout()->%d/%s\n",
                   rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
           exit(-1);
  
  
  
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- testsf.c	2000/08/04 12:51:23	1.6
  +++ testsf.c	2000/08/06 06:07:29	1.7
  @@ -239,7 +239,7 @@
       case TIMEOUT:
           /* set a timeout */
           rv = apr_setsocketopt(sock, APR_SO_TIMEOUT, 
  -                             100 * AP_USEC_PER_SEC);
  +                             100 * APR_USEC_PER_SEC);
           if (rv != APR_SUCCESS) {
               fprintf(stderr, "apr_setsocketopt(APR_SO_NONBLOCK)->%d/%s\n", 
                       rv,
  
  
  
  1.10      +1 -1      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- testtime.c	2000/08/02 05:26:37	1.9
  +++ testtime.c	2000/08/06 06:07:29	1.10
  @@ -64,7 +64,7 @@
   int main()
   {
       apr_time_t now;
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       apr_time_t imp;
   
       fprintf(stdout, "Testing Time functions.\n");
  
  
  
  1.30      +1 -1      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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- proc.c	2000/08/02 05:26:39	1.29
  +++ proc.c	2000/08/06 06:07:31	1.30
  @@ -277,7 +277,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, apr_wait_t *status,
                                 apr_wait_how_e waithow, apr_pool_t *p)
   {
       int waitpid_options = WUNTRACED;
  
  
  
  1.29      +2 -2      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- proc.c	2000/08/02 05:26:40	1.28
  +++ proc.c	2000/08/06 06:07:31	1.29
  @@ -491,7 +491,7 @@
   
   
   
  -apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, apr_wait_t *status,
                                 apr_wait_how_e waithow, apr_pool_t *p)
   {
       RESULTCODES codes;
  @@ -542,7 +542,7 @@
   
   
   
  -apr_status_t ap_get_os_proc(apr_os_proc_t *theproc, apr_proc_t *proc)
  +apr_status_t apr_get_os_proc(apr_os_proc_t *theproc, apr_proc_t *proc)
   {
       if (proc == NULL) {
           return APR_ENOPROC;
  
  
  
  1.14      +5 -3      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- thread.c	2000/08/02 05:26:41	1.13
  +++ thread.c	2000/08/06 06:07:31	1.14
  @@ -92,7 +92,7 @@
   
   
   
  -static void ap_thread_begin(void *arg)
  +static void apr_thread_begin(void *arg)
   {
     apr_thread_t *thread = (apr_thread_t *)arg;
     thread->rv = thread->func(thread->data);
  @@ -133,9 +133,11 @@
       }
       
       if (thread->attr->attr & APR_THREADATTR_DETACHED)
  -        thread->tid = _beginthread((os2_thread_start_t)func, NULL, APR_THREAD_STACKSIZE, data);
  +        thread->tid = _beginthread((os2_thread_start_t)func, NULL, 
  +                                   APR_THREAD_STACKSIZE, data);
       else
  -        thread->tid = _beginthread(ap_thread_begin, NULL, APR_THREAD_STACKSIZE, thread);
  +        thread->tid = _beginthread(apr_thread_begin, NULL, 
  +                                   APR_THREAD_STACKSIZE, thread);
           
       if (thread->tid < 0) {
           return errno;
  
  
  
  1.36      +1 -1      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- proc.c	2000/08/02 05:26:41	1.35
  +++ proc.c	2000/08/06 06:07:32	1.36
  @@ -358,7 +358,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status,
  +apr_status_t apr_wait_all_procs(apr_proc_t *proc, apr_wait_t *status,
                                 apr_wait_how_e waithow, apr_pool_t *p)
   {
       int waitpid_options = WUNTRACED;
  
  
  
  1.36      +12 -11    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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- proc.c	2000/08/02 05:26:43	1.35
  +++ proc.c	2000/08/06 06:07:32	1.36
  @@ -110,9 +110,9 @@
               bAsyncRead = TRUE;
               bAsyncWrite = TRUE;
           }        
  -        if ((stat = ap_create_nt_pipe(&attr->child_in, &attr->parent_in, 
  -                                      bAsyncRead, bAsyncWrite,
  -                                      attr->cntxt)) != APR_SUCCESS) {
  +        if ((stat = apr_create_nt_pipe(&attr->child_in, &attr->parent_in, 
  +                                       bAsyncRead, bAsyncWrite,
  +                                       attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
       }
  @@ -133,9 +133,9 @@
               bAsyncRead = TRUE;
               bAsyncWrite = TRUE;
           }        
  -        if ((stat = ap_create_nt_pipe(&attr->parent_out, &attr->child_out,
  -                                      bAsyncRead, bAsyncWrite,
  -                                      attr->cntxt)) != APR_SUCCESS) {
  +        if ((stat = apr_create_nt_pipe(&attr->parent_out, &attr->child_out,
  +                                       bAsyncRead, bAsyncWrite,
  +                                       attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
       }
  @@ -156,9 +156,9 @@
               bAsyncRead = TRUE;
               bAsyncWrite = TRUE;
           }        
  -        if ((stat = ap_create_nt_pipe(&attr->parent_err, &attr->child_err,
  -                                      bAsyncRead, bAsyncWrite,
  -                                      attr->cntxt)) != APR_SUCCESS) {
  +        if ((stat = apr_create_nt_pipe(&attr->parent_err, &attr->child_err,
  +                                       bAsyncRead, bAsyncWrite,
  +                                       attr->cntxt)) != APR_SUCCESS) {
               return stat;
           }
       } 
  @@ -432,7 +432,8 @@
       if (!proc)
           return APR_ENOPROC;
       if (wait == APR_WAIT) {
  -        if ((stat = WaitForSingleObject(proc->pid, INFINITE)) == WAIT_OBJECT_0) {
  +        if ((stat = WaitForSingleObject((HANDLE)proc->pid, 
  +                                        INFINITE)) == WAIT_OBJECT_0) {
               return APR_CHILD_DONE;
           }
           else if (stat == WAIT_TIMEOUT) {
  @@ -440,7 +441,7 @@
           }
           return GetLastError();
       }
  -    if ((stat = WaitForSingleObject(proc->pid, 0)) == WAIT_OBJECT_0) {
  +    if ((stat = WaitForSingleObject((HANDLE)proc->pid, 0)) == WAIT_OBJECT_0) {
           return APR_CHILD_DONE;
       }
       else if (stat == WAIT_TIMEOUT) {
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- signals.c	2000/08/02 05:26:43	1.7
  +++ signals.c	2000/08/06 06:07:32	1.8
  @@ -66,7 +66,7 @@
   /* Windows only really support killing process, but that will do for now. */
   apr_status_t apr_kill(apr_proc_t *proc, int signal)
   {
  -    if (TerminateProcess(proc->pid, signal) == 0) {
  +    if (TerminateProcess((HANDLE)proc->pid, signal) == 0) {
           return GetLastError();
       }
       return APR_SUCCESS;
  
  
  
  1.32      +26 -24    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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- time.c	2000/08/02 05:26:44	1.31
  +++ time.c	2000/08/06 06:07:32	1.32
  @@ -76,9 +76,9 @@
   /* End System Headers */
   
   
  -apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input)
  +apr_status_t apr_ansi_time_to_apr_time(apr_time_t *result, time_t input)
   {
  -    *result = (apr_time_t)input * AP_USEC_PER_SEC;
  +    *result = (apr_time_t)input * APR_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
  @@ -87,11 +87,11 @@
   {
       struct timeval tv;
       gettimeofday(&tv, NULL);
  -    return tv.tv_sec * AP_USEC_PER_SEC + tv.tv_usec;
  +    return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec;
   }
   
   
  -static void tm_to_exp(ap_exploded_time_t *xt, struct tm *tm)
  +static void tm_to_exp(apr_exploded_time_t *xt, struct tm *tm)
   {
       xt->tm_sec  = tm->tm_sec;
       xt->tm_min  = tm->tm_min;
  @@ -105,14 +105,14 @@
   }
   
   
  -apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input)
  +apr_status_t apr_explode_gmt(apr_exploded_time_t *result, apr_time_t input)
   {
  -    time_t t = input / AP_USEC_PER_SEC;
  +    time_t t = input / APR_USEC_PER_SEC;
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
       struct tm banana;
   #endif
   
  -    result->tm_usec = input % AP_USEC_PER_SEC;
  +    result->tm_usec = input % APR_USEC_PER_SEC;
   
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
       gmtime_r(&t, &banana);
  @@ -124,13 +124,13 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input)
  +apr_status_t apr_explode_localtime(apr_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;
  +    time_t t = input / APR_USEC_PER_SEC;
       struct tm apricot;
   
  -    result->tm_usec = input % AP_USEC_PER_SEC;
  +    result->tm_usec = input % APR_USEC_PER_SEC;
   
       localtime_r(&t, &apricot);
       tm_to_exp(result, &apricot);
  @@ -152,10 +152,10 @@
       }
   #endif
   #else
  -    time_t t = input / AP_USEC_PER_SEC;
  +    time_t t = input / APR_USEC_PER_SEC;
       struct tm *tmx;
   
  -    result->tm_usec = input % AP_USEC_PER_SEC;
  +    result->tm_usec = input % APR_USEC_PER_SEC;
   
       tmx = localtime(&t);
       tm_to_exp(result, tmx);
  @@ -181,7 +181,7 @@
   }
   
   
  -apr_status_t apr_implode_time(apr_time_t *t, ap_exploded_time_t *xt)
  +apr_status_t apr_implode_time(apr_time_t *t, apr_exploded_time_t *xt)
   {
       int year;
       time_t days;
  @@ -211,18 +211,19 @@
           return APR_EBADDATE;
       }
       days -= xt->tm_gmtoff;
  -    *t = days * AP_USEC_PER_SEC + xt->tm_usec;
  +    *t = days * APR_USEC_PER_SEC + xt->tm_usec;
       return APR_SUCCESS;
   }
   
   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;
  +    (*ostime)->tv_usec = *aprtime % APR_USEC_PER_SEC;
  +    (*ostime)->tv_sec = *aprtime / APR_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprtime)
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, 
  +                                 apr_exploded_time_t *aprtime)
   {
       (*ostime)->tm_sec  = aprtime->tm_sec;
       (*ostime)->tm_min  = aprtime->tm_min;
  @@ -239,12 +240,12 @@
   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;
  +    *aprtime = (*ostime)->tv_sec * APR_USEC_PER_SEC + (*ostime)->tv_usec;
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime,
  -                               apr_os_exp_time_t **ostime, apr_pool_t *cont)
  +apr_status_t apr_put_os_exp_time(apr_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;
  @@ -264,14 +265,15 @@
       DosSleep(t/1000);
   #else
       struct timeval tv;
  -    tv.tv_usec = t % AP_USEC_PER_SEC;
  -    tv.tv_sec = t / AP_USEC_PER_SEC;
  +    tv.tv_usec = t % APR_USEC_PER_SEC;
  +    tv.tv_sec = t / APR_USEC_PER_SEC;
       select(0, NULL, NULL, NULL, &tv);
   #endif
   }
   
   #ifdef OS2
  -apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time)
  +apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, 
  +                                      FTIME os2time)
   {
     struct tm tmpdate;
   
  @@ -285,7 +287,7 @@
     tmpdate.tm_year  = os2date.year + 80;
     tmpdate.tm_isdst = -1;
   
  -  *result = mktime(&tmpdate) * AP_USEC_PER_SEC;
  +  *result = mktime(&tmpdate) * APR_USEC_PER_SEC;
     return APR_SUCCESS;
   }
   #endif
  
  
  
  1.18      +9 -9      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- timestr.c	2000/08/02 05:26:44	1.17
  +++ timestr.c	2000/08/06 06:07:33	1.18
  @@ -68,18 +68,18 @@
   #endif
   /* End System Headers */
   
  -APR_VAR_EXPORT const char ap_month_snames[12][4] =
  +APR_VAR_EXPORT const char apr_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_VAR_EXPORT const char ap_day_snames[7][4] =
  +APR_VAR_EXPORT const char apr_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
   
   apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
   {
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       const char *s;
       int real_year;
   
  @@ -88,7 +88,7 @@
       /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
       /*           12345678901234567890123456789  */
   
  -    s = &ap_day_snames[xt.tm_wday][0];
  +    s = &apr_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -97,7 +97,7 @@
       *date_str++ = xt.tm_mday / 10 + '0';
       *date_str++ = xt.tm_mday % 10 + '0';
       *date_str++ = ' ';
  -    s = &ap_month_snames[xt.tm_mon][0];
  +    s = &apr_month_snames[xt.tm_mon][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -127,7 +127,7 @@
   
   apr_status_t apr_ctime(char *date_str, apr_time_t t)
   {
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       const char *s;
       int real_year;
   
  @@ -135,12 +135,12 @@
       /*           123456789012345678901234  */
   
       apr_explode_localtime(&xt, t);
  -    s = &ap_day_snames[xt.tm_wday][0];
  +    s = &apr_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = ' ';
  -    s = &ap_month_snames[xt.tm_mon][0];
  +    s = &apr_month_snames[xt.tm_mon][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -168,7 +168,7 @@
   }
   
   apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
  -                        const char *format, ap_exploded_time_t *xt)
  +                        const char *format, apr_exploded_time_t *xt)
   {
       struct tm tm;
   
  
  
  
  1.11      +15 -15    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- access.c	2000/08/02 05:26:45	1.10
  +++ access.c	2000/08/06 06:07:33	1.11
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -apr_status_t ap_get_curtime(struct atime_t *time, apr_time_t *rv)
  +apr_status_t apr_get_curtime(struct atime_t *time, apr_time_t *rv)
   {
       if (time) {
           (*rv) = time->currtime;
  @@ -66,7 +66,7 @@
       return APR_ENOTIME;    
   }
   
  -apr_status_t ap_get_sec(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_sec(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wSecond;
  @@ -75,7 +75,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_min(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_min(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wMinute;
  @@ -84,7 +84,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_hour(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_hour(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wHour;
  @@ -93,7 +93,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_mday(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_mday(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wDay;
  @@ -102,7 +102,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_mon(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_mon(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wMonth;
  @@ -111,7 +111,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_year(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_year(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wYear;
  @@ -120,7 +120,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_get_wday(struct atime_t *time, apr_int32_t *rv)
  +apr_status_t apr_get_wday(struct atime_t *time, apr_int32_t *rv)
   {
       if (time) {
           (*rv) = time->explodedtime->wDayOfWeek;
  @@ -129,7 +129,7 @@
       return APR_ENOTIME;
   }
   
  -apr_status_t ap_set_sec(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_sec(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -145,7 +145,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_min(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_min(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -161,7 +161,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_hour(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_hour(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -177,7 +177,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_mday(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_mday(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -193,7 +193,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_mon(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_mon(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -209,7 +209,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_year(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_year(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  @@ -225,7 +225,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t ap_set_wday(struct atime_t *time, apr_int32_t value)
  +apr_status_t apr_set_wday(struct atime_t *time, apr_int32_t value)
   {
       if (!time) {
           return APR_ENOTIME;
  
  
  
  1.13      +14 -13    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- time.c	2000/08/02 05:26:45	1.12
  +++ time.c	2000/08/06 06:07:33	1.13
  @@ -65,7 +65,7 @@
   /* Number of micro-seconds between the beginning of the Windows epoch
    * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970) 
    */
  -#define AP_DELTA_EPOCH_IN_USEC   11644473600000000;
  +#define APR_DELTA_EPOCH_IN_USEC   11644473600000000;
   
   void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
   {
  @@ -74,20 +74,20 @@
       *result = (*result) << 32;
       *result |= input->dwLowDateTime;
       *result /= 10;    /* Convert from 100 nano-sec periods to micro-seconds. */
  -    *result -= AP_DELTA_EPOCH_IN_USEC;  /* Convert from Windows epoch to Unix epoch */
  +    *result -= APR_DELTA_EPOCH_IN_USEC;  /* Convert from Windows epoch to Unix epoch */
       return;
   }
   void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
   {
       LONGLONG ll;
  -    t += AP_DELTA_EPOCH_IN_USEC;
  +    t += APR_DELTA_EPOCH_IN_USEC;
       ll = t * 10;
       pft->dwLowDateTime = (DWORD)ll;
       pft->dwHighDateTime = (DWORD) (ll >> 32);
       return;
   }
   
  -void SystemTimeToAprExpTime(ap_exploded_time_t *xt, SYSTEMTIME *tm)
  +void SystemTimeToAprExpTime(apr_exploded_time_t *xt, SYSTEMTIME *tm)
   {
       TIME_ZONE_INFORMATION tz;
       DWORD rc;
  @@ -123,9 +123,9 @@
       return;
   }
   
  -apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input)
  +apr_status_t apr_ansi_time_to_apr_time(apr_time_t *result, time_t input)
   {
  -    *result = (apr_time_t) input * AP_USEC_PER_SEC;
  +    *result = (apr_time_t) input * APR_USEC_PER_SEC;
       return APR_SUCCESS;
   }
   
  @@ -139,7 +139,7 @@
       return aprtime; 
   }
   
  -apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input)
  +apr_status_t apr_explode_gmt(apr_exploded_time_t *result, apr_time_t input)
   {
       FILETIME ft;
       SYSTEMTIME st;
  @@ -149,7 +149,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input)
  +apr_status_t apr_explode_localtime(apr_exploded_time_t *result, apr_time_t input)
   {
       SYSTEMTIME st;
       FILETIME ft, localft;
  @@ -161,7 +161,7 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_implode_time(apr_time_t *t, ap_exploded_time_t *xt)
  +apr_status_t apr_implode_time(apr_time_t *t, apr_exploded_time_t *xt)
   {
       int year;
       time_t days;
  @@ -191,7 +191,7 @@
           return APR_EBADDATE;
       }
       days -= xt->tm_gmtoff;
  -    *t = days * AP_USEC_PER_SEC + xt->tm_usec;
  +    *t = days * APR_USEC_PER_SEC + xt->tm_usec;
       return APR_SUCCESS;
   }
   
  @@ -202,7 +202,8 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprexptime)
  +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, 
  +                                 apr_exploded_time_t *aprexptime)
   {
       (*ostime)->wYear = aprexptime->tm_year + 1900;
       (*ostime)->wMonth = aprexptime->tm_mon + 1;
  @@ -222,8 +223,8 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime,
  -                               apr_os_exp_time_t **ostime, apr_pool_t *cont)
  +apr_status_t apr_put_os_exp_time(apr_exploded_time_t *aprtime,
  +                                 apr_os_exp_time_t **ostime, apr_pool_t *cont)
   {
       SystemTimeToAprExpTime(aprtime, *ostime);
       return APR_SUCCESS;
  
  
  
  1.10      +9 -9      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- timestr.c	2000/08/02 05:26:45	1.9
  +++ timestr.c	2000/08/06 06:07:33	1.10
  @@ -55,18 +55,18 @@
   #include "atime.h"
   #include "apr_portable.h"
   
  -APR_VAR_EXPORT const char ap_month_snames[12][4] =
  +APR_VAR_EXPORT const char apr_month_snames[12][4] =
   {
       "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
  -APR_VAR_EXPORT const char ap_day_snames[7][4] =
  +APR_VAR_EXPORT const char apr_day_snames[7][4] =
   {
       "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
   };
   
   apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
   {
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       const char *s;
       int real_year;
   
  @@ -75,7 +75,7 @@
       /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
       /*           12345678901234567890123456789  */
   
  -    s = &ap_day_snames[xt.tm_wday][0];
  +    s = &apr_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -84,7 +84,7 @@
       *date_str++ = xt.tm_mday / 10 + '0';
       *date_str++ = xt.tm_mday % 10 + '0';
       *date_str++ = ' ';
  -    s = &ap_month_snames[xt.tm_mon][0];
  +    s = &apr_month_snames[xt.tm_mon][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -114,7 +114,7 @@
   
   apr_status_t apr_ctime(char *date_str, apr_time_t t)
   {
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       const char *s;
       int real_year;
   
  @@ -122,12 +122,12 @@
       /*           123456789012345678901234  */
   
       apr_explode_localtime(&xt, t);
  -    s = &ap_day_snames[xt.tm_wday][0];
  +    s = &apr_day_snames[xt.tm_wday][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = ' ';
  -    s = &ap_month_snames[xt.tm_mon][0];
  +    s = &apr_month_snames[xt.tm_mon][0];
       *date_str++ = *s++;
       *date_str++ = *s++;
       *date_str++ = *s++;
  @@ -155,7 +155,7 @@
   }
   
   apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
  -                        const char *format, ap_exploded_time_t *xt)
  +                        const char *format, apr_exploded_time_t *xt)
   {
       struct tm tm;
       memset(&tm, 0, sizeof tm);
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/pcre/pcre.dsp
  
  Index: pcre.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/pcre/pcre.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pcre.dsp	2000/05/31 16:19:59	1.6
  +++ pcre.dsp	2000/08/06 06:07:34	1.7
  @@ -67,7 +67,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/pcre/pcreposix.dsp
  
  Index: pcreposix.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/pcre/pcreposix.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pcreposix.dsp	2000/05/31 16:19:59	1.6
  +++ pcreposix.dsp	2000/08/06 06:07:34	1.7
  @@ -67,7 +67,7 @@
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "STATIC" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.5       +3 -3      apache-2.0/src/main/gen_test_char.c
  
  Index: gen_test_char.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gen_test_char.c	2000/07/26 15:31:29	1.4
  +++ gen_test_char.c	2000/08/06 06:07:34	1.5
  @@ -101,16 +101,16 @@
   	    flags |= T_ESCAPE_SHELL_CMD;
   	}
   
  -	if (!ap_isalnum(c) && !strchr("$-_.+!*'(),:@&=~", c)) {
  +	if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=~", c)) {
   	    flags |= T_ESCAPE_PATH_SEGMENT;
   	}
   
  -	if (!ap_isalnum(c) && !strchr("$-_.+!*'(),:@&=/~", c)) {
  +	if (!apr_isalnum(c) && !strchr("$-_.+!*'(),:@&=/~", c)) {
   	    flags |= T_OS_ESCAPE_PATH;
   	}
   
   	/* these are the "tspecials" from RFC2068 */
  -	if (ap_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?={}", c)) {
  +	if (apr_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?={}", c)) {
   	    flags |= T_HTTP_TOKEN_STOP;
   	}
   	printf("%u%c", flags, (c < 255) ? ',' : ' ');
  
  
  
  1.45      +1 -1      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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- http_connection.c	2000/08/02 05:26:47	1.44
  +++ http_connection.c	2000/08/06 06:07:34	1.45
  @@ -193,7 +193,7 @@
           if (rc != APR_SUCCESS || nbytes == 0) break;
   
           /* how much time has elapsed? */
  -        timeout = (int)((apr_now() - start) / AP_USEC_PER_SEC);
  +        timeout = (int)((apr_now() - start) / APR_USEC_PER_SEC);
           if (timeout >= MAX_SECS_TO_LINGER) break;
   
           /* figure out the new timeout */
  
  
  
  1.95      +2 -2      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.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- http_core.c	2000/08/02 05:26:47	1.94
  +++ http_core.c	2000/08/06 06:07:34	1.95
  @@ -584,7 +584,7 @@
   
   
   /* Code from Harald Hanche-Olsen <hanche@imf.unit.no> */
  -static ap_inline void do_double_reverse (conn_rec *conn)
  +static apr_inline void do_double_reverse (conn_rec *conn)
   {
       struct hostent *hptr;
   
  @@ -2845,7 +2845,7 @@
           apr_mmap_offset((void**)&addr, mm ,0);
   
   	if (d->content_md5 & 1) {
  -	    ap_md5_ctx_t context;
  +	    apr_md5_ctx_t context;
   	    
   	    apr_MD5Init(&context);
   #ifdef APACHE_XLATE
  
  
  
  1.68      +6 -6      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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- http_log.c	2000/08/05 17:32:08	1.67
  +++ http_log.c	2000/08/06 06:07:34	1.68
  @@ -372,9 +372,9 @@
       if (logf && ((level & APLOG_STARTUP) != APLOG_STARTUP)) {
   	errstr[0] = '[';
   	apr_ctime(errstr + 1, apr_now());
  -	errstr[1 + AP_CTIME_LEN - 1] = ']';
  -	errstr[1 + AP_CTIME_LEN    ] = ' ';
  -	len = 1 + AP_CTIME_LEN + 1;
  +	errstr[1 + APR_CTIME_LEN - 1] = ']';
  +	errstr[1 + APR_CTIME_LEN    ] = ' ';
  +	len = 1 + APR_CTIME_LEN + 1;
       } else {
   	len = 0;
       }
  @@ -534,7 +534,7 @@
   
   API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
   {
  -    char time_str[AP_CTIME_LEN];
  +    char time_str[APR_CTIME_LEN];
   
       apr_ctime(time_str, apr_now());
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  @@ -552,7 +552,7 @@
   
   #ifdef HAVE_RELIABLE_PIPED_LOGS
   /* forward declaration */
  -static void piped_log_maintenance(int reason, void *data, ap_wait_t status);
  +static void piped_log_maintenance(int reason, void *data, apr_wait_t status);
   
   static int piped_log_spawn(piped_log *pl)
   {
  @@ -599,7 +599,7 @@
   }
   
   
  -static void piped_log_maintenance(int reason, void *data, ap_wait_t status)
  +static void piped_log_maintenance(int reason, void *data, apr_wait_t status)
   {
       piped_log *pl = data;
       apr_status_t stats;
  
  
  
  1.63      +5 -5      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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- http_main.c	2000/08/02 05:26:48	1.62
  +++ http_main.c	2000/08/06 06:07:34	1.63
  @@ -323,21 +323,21 @@
           switch (c) {
    	case 'c':
   	    new = (char **)apr_push_array(ap_server_post_read_config);
  -	    *new = apr_pstrdup(pcommands, ap_optarg);
  +	    *new = apr_pstrdup(pcommands, apr_optarg);
   	    break;
   	case 'C':
   	    new = (char **)apr_push_array(ap_server_pre_read_config);
  -	    *new = apr_pstrdup(pcommands, ap_optarg);
  +	    *new = apr_pstrdup(pcommands, apr_optarg);
   	    break;
   	case 'd':
  -	    def_server_root = ap_optarg;
  +	    def_server_root = apr_optarg;
   	    break;
   	case 'D':
   	    new = (char **)apr_push_array(ap_server_config_defines);
  -	    *new = apr_pstrdup(pcommands, ap_optarg);
  +	    *new = apr_pstrdup(pcommands, apr_optarg);
   	    break;
   	case 'f':
  -	    confname = ap_optarg;
  +	    confname = apr_optarg;
   	    break;
   	case 'v':
   	    printf("Server version: %s\n", ap_get_server_version());
  
  
  
  1.101     +20 -20    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.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- http_protocol.c	2000/08/02 05:26:48	1.100
  +++ http_protocol.c	2000/08/06 06:07:34	1.101
  @@ -669,7 +669,7 @@
        * would be incorrect.
        */
       
  -    weak = ((r->request_time - r->mtime > AP_USEC_PER_SEC) && !force_weak) ? "" : "W/";
  +    weak = ((r->request_time - r->mtime > APR_USEC_PER_SEC) && !force_weak) ? "" : "W/";
   
       if (r->finfo.protection != 0) {
           etag = apr_psprintf(r->pool,
  @@ -738,7 +738,7 @@
   API_EXPORT(void) ap_set_last_modified(request_rec *r)
   {
       apr_time_t mod_time = ap_rationalize_mtime(r, r->mtime);
  -    char *datestr = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +    char *datestr = apr_palloc(r->pool, APR_RFC822_DATE_LEN);
       apr_rfc822_date(datestr, mod_time);
       apr_table_setn(r->headers_out, "Last-Modified", datestr);
   }
  @@ -1038,7 +1038,7 @@
       char *value;
       char *copy;
       int len;
  -    unsigned int fields_read = 0;
  +    int fields_read = 0;
       apr_table_t *tmp_headers;
   
       /* We'll use apr_overlap_tables later to merge these into r->headers_in. */
  @@ -1088,7 +1088,7 @@
   	apr_table_addn(tmp_headers, copy, value);
       }
   
  -    apr_overlap_tables(r->headers_in, tmp_headers, AP_OVERLAP_TABLES_MERGE);
  +    apr_overlap_tables(r->headers_in, tmp_headers, APR_OVERLAP_TABLES_MERGE);
   }
   
   request_rec *ap_read_request(conn_rec *conn)
  @@ -1527,7 +1527,7 @@
   
       (void) checked_bputstrs(r, protocol, " ", r->status_line, CRLF, NULL);
   
  -    date = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +    date = apr_palloc(r->pool, APR_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());
  @@ -1675,14 +1675,14 @@
       do {
           /* Find a non-empty fieldname */
   
  -        while (*e == ',' || ap_isspace(*e)) {
  +        while (*e == ',' || apr_isspace(*e)) {
               ++e;
           }
           if (*e == '\0') {
               break;
           }
           start = e;
  -        while (*e != '\0' && *e != ',' && !ap_isspace(*e)) {
  +        while (*e != '\0' && *e != ',' && !apr_isspace(*e)) {
               ++e;
           }
           if (*e != '\0') {
  @@ -1764,7 +1764,7 @@
        * header field tables into a single table.  If we don't do this, our
        * later attempts to set or unset a given fieldname might be bypassed.
        */
  -    if (!ap_is_empty_table(r->err_headers_out))
  +    if (!apr_is_empty_table(r->err_headers_out))
           r->headers_out = apr_overlay_tables(r->pool, r->err_headers_out,
                                           r->headers_out);
   
  @@ -1820,7 +1820,7 @@
        * some other part of the server configuration.
        */
       if (r->no_cache && !apr_table_get(r->headers_out, "Expires")) {
  -	date = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +	date = apr_palloc(r->pool, APR_RFC822_DATE_LEN);
           apr_rfc822_date(date, r->request_time);
           apr_table_addn(r->headers_out, "Expires", date);
       }
  @@ -1921,7 +1921,7 @@
   {
       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;
  +    long max_body;
   
       r->read_body = read_policy;
       r->read_chunked = 0;
  @@ -1944,7 +1944,7 @@
       else if (lenp) {
           const char *pos = lenp;
   
  -        while (ap_isdigit(*pos) || ap_isspace(*pos))
  +        while (apr_isdigit(*pos) || apr_isspace(*pos))
               ++pos;
           if (*pos != '\0') {
               ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  @@ -2016,7 +2016,7 @@
   {
       long chunksize = 0;
   
  -    while (ap_isxdigit(*b)) {
  +    while (apr_isxdigit(*b)) {
           int xvalue = 0;
   
           if (*b >= '0' && *b <= '9')
  @@ -2052,7 +2052,7 @@
       apr_size_t len_to_read;
       apr_ssize_t len_read;
       long chunk_start = 0;
  -    unsigned long max_body;
  +    long max_body;
       apr_status_t rv;
   
       if (!r->read_chunked) {     /* Content-length read */
  @@ -2098,7 +2098,7 @@
   
           chunk_start = getline(buffer, bufsiz, r->connection->client, 0);
           if ((chunk_start <= 0) || (chunk_start >= (bufsiz - 1))
  -            || !ap_isxdigit(*buffer)) {
  +            || !apr_isxdigit(*buffer)) {
               r->connection->keepalive = -1;
               return -1;
           }
  @@ -2641,7 +2641,7 @@
        * message body.  Note that being assbackwards here is not an option.
        */
       if (status == HTTP_NOT_MODIFIED) {
  -        if (!ap_is_empty_table(r->err_headers_out))
  +        if (!apr_is_empty_table(r->err_headers_out))
               r->headers_out = apr_overlay_tables(r->pool, r->err_headers_out,
                                                  r->headers_out);
           ap_basic_http_header(r);
  @@ -2757,11 +2757,11 @@
            */
           if (r->status_line != NULL
               && strlen(r->status_line) > 4       /* long enough */
  -            && ap_isdigit(r->status_line[0])
  -            && ap_isdigit(r->status_line[1])
  -            && ap_isdigit(r->status_line[2])
  -            && ap_isspace(r->status_line[3])
  -            && ap_isalnum(r->status_line[4])) {
  +            && apr_isdigit(r->status_line[0])
  +            && apr_isdigit(r->status_line[1])
  +            && apr_isdigit(r->status_line[2])
  +            && apr_isspace(r->status_line[3])
  +            && apr_isalnum(r->status_line[4])) {
               title = r->status_line;
           }
   
  
  
  
  1.39      +1 -1      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- http_request.c	2000/08/02 05:26:48	1.38
  +++ http_request.c	2000/08/06 06:07:35	1.39
  @@ -1297,7 +1297,7 @@
   
   static apr_table_t *rename_original_env(apr_pool_t *p, apr_table_t *t)
   {
  -    apr_array_header_t *env_arr = ap_table_elts(t);
  +    apr_array_header_t *env_arr = apr_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;
  
  
  
  1.26      +5 -5      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_vhost.c	2000/08/02 05:26:48	1.25
  +++ http_vhost.c	2000/08/06 06:07:35	1.26
  @@ -221,7 +221,7 @@
   	my_addr = DEFAULT_VHOST_ADDR;
   	is_an_ip_addr = 1;
       }
  -    else if ((my_addr = ap_inet_addr(w)) != INADDR_NONE) {
  +    else if ((my_addr = apr_inet_addr(w)) != INADDR_NONE) {
   	is_an_ip_addr = 1;
       }
       if (is_an_ip_addr) {
  @@ -354,7 +354,7 @@
    *
    * Hash function provided by David Hankins.
    */
  -static ap_inline unsigned hash_inaddr(unsigned key)
  +static apr_inline unsigned hash_inaddr(unsigned key)
   {
       key ^= (key >> 16);
       return ((key >> 8) ^ key) % IPHASH_TABLE_SIZE;
  @@ -388,7 +388,7 @@
   }
   
   
  -static ap_inline ipaddr_chain *find_ipaddr(struct in_addr *server_ip,
  +static apr_inline ipaddr_chain *find_ipaddr(struct in_addr *server_ip,
       unsigned port)
   {
       unsigned bucket;
  @@ -687,7 +687,7 @@
       src = r->hostname;
       dst = host;
       while (*src) {
  -	if (!ap_isalnum(*src) && *src != '.' && *src != '-') {
  +	if (!apr_isalnum(*src) && *src != '.' && *src != '-') {
   	    if (*src == ':')
   		break;
   	    else
  @@ -699,7 +699,7 @@
       /* check the port part */
       if (*src++ == ':') {
   	while (*src) {
  -	    if (!ap_isdigit(*src++)) {
  +	    if (!apr_isdigit(*src++)) {
   		goto bad;
   	    }
   	}
  
  
  
  1.21      +1 -1      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- iol_file.c	2000/08/02 05:26:48	1.20
  +++ iol_file.c	2000/08/06 06:07:35	1.21
  @@ -112,7 +112,7 @@
       switch (opt) {
       case AP_IOL_TIMEOUT:
           return apr_set_pipe_timeout(iol->file, 
  -				   *(const int*)value * AP_USEC_PER_SEC);
  +				    *(const int*)value * APR_USEC_PER_SEC);
       default:
           return APR_EINVAL;
       }
  
  
  
  1.13      +2 -2      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- iol_socket.c	2000/08/04 02:48:38	1.12
  +++ iol_socket.c	2000/08/06 06:07:35	1.13
  @@ -82,7 +82,7 @@
       switch (opt) {
       case AP_IOL_TIMEOUT:
           apr_setsocketopt(iol->sock, APR_SO_TIMEOUT, 
  -                        *(const int*)value * AP_USEC_PER_SEC);
  +                        *(const int*)value * APR_USEC_PER_SEC);
           break;
       default:
   	    return APR_EINVAL;
  @@ -97,7 +97,7 @@
       switch (opt) {
       case AP_IOL_TIMEOUT:
           apr_getsocketopt(iol->sock, APR_SO_TIMEOUT, (apr_int32_t *) value);
  -        (*(apr_int32_t *)value) /= AP_USEC_PER_SEC;
  +        (*(apr_int32_t *)value) /= APR_USEC_PER_SEC;
           break;
       default:
           return APR_EINVAL;
  
  
  
  1.32      +2 -2      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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mpm_common.c	2000/08/02 05:26:48	1.31
  +++ mpm_common.c	2000/08/06 06:07:35	1.32
  @@ -179,7 +179,7 @@
   #endif
   static int wait_or_timeout_counter;
   
  -void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p)
  +void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p)
   {
       apr_status_t rv;
   
  @@ -208,7 +208,7 @@
       return;
   }
   
  -void ap_process_child_status(apr_proc_t *pid, ap_wait_t status)
  +void ap_process_child_status(apr_proc_t *pid, apr_wait_t status)
   {
       /* Child died... if it died due to a fatal error,
           * we should simply bail out.
  
  
  
  1.66      +30 -30    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.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- util.c	2000/08/02 05:26:49	1.65
  +++ util.c	2000/08/06 06:07:35	1.66
  @@ -137,7 +137,7 @@
   	return apr_pstrdup(p, intype);
       } 
       else {
  -	while ((semi > intype) && ap_isspace(semi[-1])) {
  +	while ((semi > intype) && apr_isspace(semi[-1])) {
   	    semi--;
   	}
   	return apr_pstrndup(p, intype, semi - intype);
  @@ -149,7 +149,7 @@
       apr_size_t retcode;
       char ts[MAX_STRING_LEN];
       char tf[MAX_STRING_LEN];
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
   
       if (gmt) {
   	const char *f;
  @@ -251,7 +251,7 @@
   	    }
   	    return -1;
   	}
  -	else if ((exp[y] != '?') && (ap_tolower(str[x]) != ap_tolower(exp[y])))
  +	else if ((exp[y] != '?') && (apr_tolower(str[x]) != apr_tolower(exp[y])))
   	    return 1;
       }
       return (str[x] != '\0');
  @@ -313,12 +313,12 @@
           return((char *)s1);
       }
       while(1) {
  -	for ( ; (*s1 != '\0') && (ap_tolower(*s1) != ap_tolower(*s2)); s1++);
  +	for ( ; (*s1 != '\0') && (apr_tolower(*s1) != apr_tolower(*s2)); s1++);
   	if (*s1 == '\0') return(NULL);
   	/* found first character of s2, see if the rest matches */
           p1 = (char *)s1;
           p2 = (char *)s2;
  -        while (ap_tolower(*++p1) == ap_tolower(*++p2)) {
  +        while (apr_tolower(*++p1) == apr_tolower(*++p2)) {
               if (*p1 == '\0') {
                   /* both strings ended together */
                   return((char *)s1);
  @@ -386,7 +386,7 @@
       while ((c = *src++) != '\0') {
   	if (c == '&')
   	    no = 0;
  -	else if (c == '$' && ap_isdigit(*src))
  +	else if (c == '$' && apr_isdigit(*src))
   	    no = *src++ - '0';
   	else
   	    no = 10;
  @@ -411,7 +411,7 @@
       while ((c = *src++) != '\0') {
   	if (c == '&')
   	    no = 0;
  -	else if (c == '$' && ap_isdigit(*src))
  +	else if (c == '$' && apr_isdigit(*src))
   	    no = *src++ - '0';
   	else
   	    no = 10;
  @@ -663,7 +663,7 @@
       char *res;
   
       for (x = 0; (*line)[x]; x++) {
  -	if (ap_isspace((*line)[x])) {
  +	if (apr_isspace((*line)[x])) {
   	    pos = x;
   	    break;
   	}
  @@ -678,7 +678,7 @@
       res = apr_palloc(atrans, pos + 1);
       apr_cpystrn(res, *line, pos + 1);
   
  -    while (ap_isspace((*line)[pos]))
  +    while (apr_isspace((*line)[pos]))
   	++pos;
   
       *line += pos;
  @@ -748,7 +748,7 @@
       char *res;
       char quote;
   
  -    while (*str && ap_isspace(*str))
  +    while (*str && apr_isspace(*str))
   	++str;
   
       if (!*str) {
  @@ -771,13 +771,13 @@
       }
       else {
   	strend = str;
  -	while (*strend && !ap_isspace(*strend))
  +	while (*strend && !apr_isspace(*strend))
   	    ++strend;
   
   	res = substring_conf(p, str, strend - str, 0);
       }
   
  -    while (*strend && ap_isspace(*strend))
  +    while (*strend && apr_isspace(*strend))
   	++strend;
       *line = strend;
       return res;
  @@ -1005,11 +1005,11 @@
   	 * Leading and trailing white space is eliminated completely
   	 */
   	src = buf;
  -	while (ap_isspace(*src))
  +	while (apr_isspace(*src))
   	    ++src;
   	/* blast trailing whitespace */
   	dst = &src[strlen(src)];
  -	while (--dst >= src && ap_isspace(*dst))
  +	while (--dst >= src && apr_isspace(*dst))
   	    *dst = '\0';
           /* Zap leading whitespace by shifting */
           if (src != buf)
  @@ -1070,7 +1070,7 @@
   		     */
   		}
   		/* blast trailing whitespace */
  -		while (i > 0 && ap_isspace(buf[i - 1]))
  +		while (i > 0 && apr_isspace(buf[i - 1]))
   		    --i;
   		buf[i] = '\0';
   #ifdef DEBUG_CFG_LINES
  @@ -1099,7 +1099,7 @@
   
       /* Find first non-comma, non-whitespace byte */
   
  -    while (*ptr == ',' || ap_isspace(*ptr))
  +    while (*ptr == ',' || apr_isspace(*ptr))
           ++ptr;
   
       token = ptr;
  @@ -1138,7 +1138,7 @@
   
       /* Advance field pointer to the next non-comma, non-white byte */
   
  -    while (*ptr == ',' || ap_isspace(*ptr))
  +    while (*ptr == ',' || apr_isspace(*ptr))
   	++ptr;
   
       *field = (const char *)ptr;
  @@ -1224,7 +1224,7 @@
                   default  : if (addspace == 1)
                                  *pos++ = ' ';
                              *pos++ = (in_com || in_qstr) ? *ptr
  -                                                        : ap_tolower(*ptr);
  +                                                        : apr_tolower(*ptr);
                              addspace = 0;
                              break;
               }
  @@ -1253,7 +1253,7 @@
   
           /* Find first non-comma, non-whitespace byte */
   
  -        while (*ptr == ',' || ap_isspace(*ptr))
  +        while (*ptr == ',' || apr_isspace(*ptr))
               ++ptr;
   
           if (*ptr)
  @@ -1322,7 +1322,7 @@
                                  if (in_com || in_qstr)
                                      good = good && (*pos++ == *ptr);
                                  else
  -                                   good = good && (*pos++ == ap_tolower(*ptr));
  +                                   good = good && (*pos++ == apr_tolower(*ptr));
                                  addspace = 0;
                                  break;
                   }
  @@ -1352,7 +1352,7 @@
   
       /* Find first non-white byte */
   
  -    while (*ptr && ap_isspace(*ptr))
  +    while (*ptr && apr_isspace(*ptr))
   	++ptr;
   
       tok_start = ptr;
  @@ -1361,7 +1361,7 @@
        * (comments are already gone).
        */
   
  -    while (*ptr && (accept_white || !ap_isspace(*ptr))
  +    while (*ptr && (accept_white || !apr_isspace(*ptr))
   	   && *ptr != ';' && *ptr != ',') {
   	if (*ptr++ == '"')
   	    while (*ptr)
  @@ -1374,7 +1374,7 @@
   
       /* Advance accept_line pointer to the next non-white byte */
   
  -    while (*ptr && ap_isspace(*ptr))
  +    while (*ptr && apr_isspace(*ptr))
   	++ptr;
   
       *accept_line = ptr;
  @@ -1429,7 +1429,7 @@
       lidx = llen - tlen;
   
       if ((lidx < 0) ||
  -	((lidx > 0) && !(ap_isspace(line[lidx - 1]) || line[lidx - 1] == ',')))
  +	((lidx > 0) && !(apr_isspace(line[lidx - 1]) || line[lidx - 1] == ',')))
   	return 0;
   
       return (strncasecmp(&line[lidx], tok, tlen) == 0);
  @@ -1512,7 +1512,7 @@
   	if (*y != '%')
   	    *x = *y;
   	else {
  -	    if (!ap_isxdigit(*(y + 1)) || !ap_isxdigit(*(y + 2))) {
  +	    if (!apr_isxdigit(*(y + 1)) || !apr_isxdigit(*(y + 2))) {
   		badesc = 1;
   		*x = '%';
   	    }
  @@ -1555,7 +1555,7 @@
    */
   static const char c2x_table[] = "0123456789abcdef";
   
  -static ap_inline unsigned char *c2x(unsigned what, unsigned char *where)
  +static apr_inline unsigned char *c2x(unsigned what, unsigned char *where)
   {
   #ifdef CHARSET_EBCDIC
       what = ap_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
  @@ -1702,7 +1702,7 @@
   
       for (x = 0; u[x] != ':'; x++) {
   	if ((!u[x]) ||
  -	    ((!ap_isalpha(u[x])) && (!ap_isdigit(u[x])) &&
  +	    ((!apr_isalpha(u[x])) && (!apr_isdigit(u[x])) &&
   	     (u[x] != '+') && (u[x] != '-') && (u[x] != '.'))) {
   	    return 0;
   	}
  @@ -1767,7 +1767,7 @@
   API_EXPORT(void) ap_str_tolower(char *str)
   {
       while (*str) {
  -	*str = ap_tolower(*str);
  +	*str = apr_tolower(*str);
   	++str;
       }
   }
  @@ -1834,7 +1834,7 @@
   	return htonl(INADDR_ANY);
       }
   
  -    my_addr = ap_inet_addr((char *)w);
  +    my_addr = apr_inet_addr((char *)w);
       if (my_addr != INADDR_NONE) {
   	if (p != NULL)
   	    *p = ':';
  @@ -1979,7 +1979,7 @@
   	*semi = '\0';
       }
       while (*str) {
  -	*str = ap_tolower(*str);
  +	*str = apr_tolower(*str);
   	++str;
       }
       if (semi) {
  
  
  
  1.15      +7 -7      apache-2.0/src/main/util_date.c
  
  Index: util_date.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_date.c	2000/08/02 05:26:49	1.14
  +++ util_date.c	2000/08/06 06:07:35	1.15
  @@ -104,23 +104,23 @@
   	    return 1;
   
   	case '@':
  -	    if (!ap_isupper(d))
  +	    if (!apr_isupper(d))
   		return 0;
   	    break;
   	case '$':
  -	    if (!ap_islower(d))
  +	    if (!apr_islower(d))
   		return 0;
   	    break;
   	case '#':
  -	    if (!ap_isdigit(d))
  +	    if (!apr_isdigit(d))
   		return 0;
   	    break;
   	case '&':
  -	    if (!ap_isxdigit(d))
  +	    if (!apr_isxdigit(d))
   		return 0;
   	    break;
   	case '~':
  -	    if ((d != ' ') && !ap_isdigit(d))
  +	    if ((d != ' ') && !apr_isdigit(d))
   		return 0;
   	    break;
   	default:
  @@ -182,7 +182,7 @@
    */
   API_EXPORT(apr_time_t) ap_parseHTTPdate(const char *date)
   {
  -    ap_exploded_time_t ds;
  +    apr_exploded_time_t ds;
       apr_time_t result;
       int mint, mon;
       const char *monstr, *timstr;
  @@ -198,7 +198,7 @@
       if (!date)
   	return BAD_DATE;
   
  -    while (*date && ap_isspace(*date))	/* Find first non-whitespace char */
  +    while (*date && apr_isspace(*date))	/* Find first non-whitespace char */
   	++date;
   
       if (*date == '\0') 
  
  
  
  1.18      +4 -4      apache-2.0/src/main/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- util_md5.c	2000/08/02 05:26:49	1.17
  +++ util_md5.c	2000/08/06 06:07:35	1.18
  @@ -95,7 +95,7 @@
   API_EXPORT(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int length)
   {
       const char *hex = "0123456789abcdef";
  -    ap_md5_ctx_t my_md5;
  +    apr_md5_ctx_t my_md5;
       unsigned char hash[MD5_DIGESTSIZE];
       char *r, result[33];
       int i;
  @@ -170,7 +170,7 @@
   static char basis_64[] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   
  -API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *a, ap_md5_ctx_t *context)
  +API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *a, apr_md5_ctx_t *context)
   {
       unsigned char digest[18];
       char *encodedDigest;
  @@ -200,7 +200,7 @@
   API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile,
                                   apr_xlate_t *xlate)
   {
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char buf[1000];
       long length = 0;
       int nbytes;
  @@ -223,7 +223,7 @@
   
   API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile)
   {
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char buf[1000];
       long length = 0;
       apr_ssize_t nbytes;
  
  
  
  1.39      +14 -14    apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- util_script.c	2000/08/02 05:26:49	1.38
  +++ util_script.c	2000/08/06 06:07:35	1.39
  @@ -103,11 +103,11 @@
       char *cp = res;
   
       while (*++cp) {
  -	if (!ap_isalnum(*cp) && *cp != '_') {
  +	if (!apr_isalnum(*cp) && *cp != '_') {
   	    *cp = '_';
   	}
   	else {
  -	    *cp = ap_toupper(*cp);
  +	    *cp = apr_toupper(*cp);
   	}
       }
   
  @@ -116,7 +116,7 @@
   
   API_EXPORT(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t)
   {
  -    apr_array_header_t *env_arr = ap_table_elts(t);
  +    apr_array_header_t *env_arr = apr_table_elts(t);
       apr_table_entry_t *elts = (apr_table_entry_t *) env_arr->elts;
       char **env = (char **) apr_palloc(p, (env_arr->nelts + 2) * sizeof(char *));
       int i, j;
  @@ -136,11 +136,11 @@
   	}
   	env[j] = apr_pstrcat(p, elts[i].key, "=", elts[i].val, NULL);
   	whack = env[j];
  -	if (ap_isdigit(*whack)) {
  +	if (apr_isdigit(*whack)) {
   	    *whack++ = '_';
   	}
   	while (*whack != '=') {
  -	    if (!ap_isalnum(*whack) && *whack != '_') {
  +	    if (!apr_isalnum(*whack) && *whack != '_') {
   		*whack = '_';
   	    }
   	    ++whack;
  @@ -163,7 +163,7 @@
       char *env_temp;
   #endif
       const char *host;
  -    apr_array_header_t *hdrs_arr = ap_table_elts(r->headers_in);
  +    apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
       apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
       int i;
   
  @@ -281,7 +281,7 @@
   	}
       }
   
  -    apr_overlap_tables(r->subprocess_env, e, AP_OVERLAP_TABLES_SET);
  +    apr_overlap_tables(r->subprocess_env, e, APR_OVERLAP_TABLES_SET);
   }
   
   /* This "cute" little function comes about because the path info on
  @@ -319,15 +319,15 @@
   
       first = r->the_request;	/* use the request-line */
   
  -    while (*first && !ap_isspace(*first)) {
  +    while (*first && !apr_isspace(*first)) {
   	++first;		/* skip over the method */
       }
  -    while (ap_isspace(*first)) {
  +    while (apr_isspace(*first)) {
   	++first;		/*   and the space(s)   */
       }
   
       last = first;
  -    while (*last && !ap_isspace(*last)) {
  +    while (*last && !apr_isspace(*last)) {
   	++last;			/* end at next whitespace */
       }
   
  @@ -474,8 +474,8 @@
   		cond_status = ap_meets_conditions(r);
   	    }
   	    apr_overlap_tables(r->err_headers_out, merge,
  -		AP_OVERLAP_TABLES_MERGE);
  -	    if (!ap_is_empty_table(cookie_table)) {
  +		APR_OVERLAP_TABLES_MERGE);
  +	    if (!apr_is_empty_table(cookie_table)) {
   		/* the cookies have already been copied to the cookie_table */
   		apr_table_unset(r->err_headers_out, "Set-Cookie");
   		r->err_headers_out = apr_overlay_tables(r->pool,
  @@ -532,7 +532,7 @@
   	}
   
   	*l++ = '\0';
  -	while (*l && ap_isspace(*l)) {
  +	while (*l && apr_isspace(*l)) {
   	    ++l;
   	}
   
  @@ -542,7 +542,7 @@
   	    /* Nuke trailing whitespace */
   
   	    char *endp = l + strlen(l) - 1;
  -	    while (endp > l && ap_isspace(*endp)) {
  +	    while (endp > l && apr_isspace(*endp)) {
   		*endp-- = '\0';
   	    }
   
  
  
  
  1.17      +2 -2      apache-2.0/src/modules/dav/fs/repos.c
  
  Index: repos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/fs/repos.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- repos.c	2000/08/02 05:26:57	1.16
  +++ repos.c	2000/08/06 06:07:37	1.17
  @@ -248,8 +248,8 @@
       /* 29 chars plus null term */
       sprintf(buf,
   	    "%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
  -           ap_day_snames[tms.tm_wday],
  -           tms.tm_mday, ap_month_snames[tms.tm_mon],
  +           apr_day_snames[tms.tm_wday],
  +           tms.tm_mday, apr_month_snames[tms.tm_mon],
              tms.tm_year + 1900,
              tms.tm_hour, tms.tm_min, tms.tm_sec);
   }
  
  
  
  1.16      +2 -2      apache-2.0/src/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/mod_dav.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_dav.c	2000/08/02 05:26:59	1.15
  +++ mod_dav.c	2000/08/06 06:07:38	1.16
  @@ -191,7 +191,7 @@
   
       newconf->d_params = apr_copy_table(p, parent->d_params);
       apr_overlap_tables(newconf->d_params, child->d_params,
  -		      AP_OVERLAP_TABLES_SET);
  +		      APR_OVERLAP_TABLES_SET);
   
       return newconf;
   }
  @@ -1888,7 +1888,7 @@
       else if (lenp) {
   	const char *pos = lenp;
   
  -	while (ap_isdigit(*pos) || ap_isspace(*pos)) {
  +	while (apr_isdigit(*pos) || apr_isspace(*pos)) {
   	    ++pos;
   	}
   	if (*pos != '\0') {
  
  
  
  1.6       +2 -2      apache-2.0/src/modules/dav/main/opaquelock.c
  
  Index: opaquelock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/opaquelock.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- opaquelock.c	2000/08/02 05:26:59	1.5
  +++ opaquelock.c	2000/08/06 06:07:38	1.6
  @@ -193,7 +193,7 @@
   
       for (i = 0; i < 36; ++i) {
   	char c = char_token[i];
  -	if (!ap_isxdigit(c) &&
  +	if (!apr_isxdigit(c) &&
   	    !(c == '-' && (i == 8 || i == 13 || i == 18 || i == 23)))
   	    return 1; /* failure */
       }
  @@ -374,7 +374,7 @@
    
   static void get_random_info(unsigned char seed[16])
   {
  -    ap_md5_ctx_t c;
  +    apr_md5_ctx_t c;
   
       /* Leech & Salz use Linux-specific struct sysinfo;
        * replace with pid/tid for portability (in the spirit of mod_unique_id) */
  
  
  
  1.20      +1 -1      apache-2.0/src/modules/experimental/mod_mmap_static.c
  
  Index: mod_mmap_static.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_mmap_static.c	2000/08/02 05:27:01	1.19
  +++ mod_mmap_static.c	2000/08/06 06:07:38	1.20
  @@ -250,7 +250,7 @@
       sconf = ap_get_module_config(r->server->module_config, &mmap_static_module);
   
       /* we only operate when at least one mmapfile directive was used */
  -    if (ap_is_empty_table(sconf->files))
  +    if (apr_is_empty_table(sconf->files))
   	return DECLINED;
   
       res = ap_core_translate(r);
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/file_cache/cache_util.c
  
  Index: cache_util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/file_cache/cache_util.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cache_util.c	2000/08/02 05:27:02	1.3
  +++ cache_util.c	2000/08/06 06:07:38	1.4
  @@ -105,9 +105,9 @@
       for (i = 0, j = 0; i < sizeof(j) * 2; i++) {
           ch = x[i];
           j <<= 4;
  -        if (ap_isdigit(ch))
  +        if (apr_isdigit(ch))
               j |= ch - '0';
  -        else if (ap_isupper(ch))
  +        else if (apr_isupper(ch))
               j |= ch - ('A' - 10);
           else
               j |= ch - ('a' - 10);
  @@ -279,11 +279,11 @@
           /* XXX: RFC2068 defines only SP and HT as whitespace, this test is
            * wrong... and so are many others probably.
            */
  -        while (ap_isspace(*value))
  +        while (apr_isspace(*value))
               ++value;            /* Skip to start of value   */
   
           /* should strip trailing whitespace as well */
  -        for (end = &value[strlen(value)-1]; end > value && ap_isspace(*end); --end)
  +        for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end)
               *end = '\0';
   
           apr_table_add(cq->hdrs, buffer, value);
  @@ -327,7 +327,7 @@
           /* no date header! */
           /* add one; N.B. use the time _now_ rather than when we were checking the cache */
           cq->date = now;
  -        apr_rfc822_date(dates = apr_palloc(cq->el.cache->pool, AP_RFC822_DATE_LEN), now);
  +        apr_rfc822_date(dates = apr_palloc(cq->el.cache->pool, APR_RFC822_DATE_LEN), now);
           apr_table_set(cq->hdrs, "Date", dates);
           ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
                        "Added date header");
  @@ -407,8 +407,8 @@
           if(cq->hdrs)
           {
               int i;
  -            apr_table_entry_t *elts = (apr_table_entry_t *) ap_table_elts(cq->hdrs)->elts;
  -            for (i = 0; i < ap_table_elts(cq->hdrs)->nelts; ++i) {
  +            apr_table_entry_t *elts = (apr_table_entry_t *) apr_table_elts(cq->hdrs)->elts;
  +            for (i = 0; i < apr_table_elts(cq->hdrs)->nelts; ++i) {
                   if (elts[i].key != NULL) {
                       ap_bvputs(fp, elts[i].key, ": ", elts[i].val, CRLF, NULL);
                   }
  @@ -452,7 +452,7 @@
    */
   static void ap_cache_hash(const char *it, char *val, int ndepth, int nlength)
   {
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char digest[16];
       char tmp[26];
       int i, k, d;
  @@ -498,7 +498,7 @@
   #else
   static void ap_cache_hash(const char *it, char *val, int ndepth, int nlength)
   {
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char digest[16];
       char tmp[22];
       int i, k, d;
  
  
  
  1.4       +5 -5      apache-2.0/src/modules/file_cache/file_garbage.c
  
  Index: file_garbage.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/file_cache/file_garbage.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- file_garbage.c	2000/08/02 05:27:02	1.3
  +++ file_garbage.c	2000/08/06 06:07:38	1.4
  @@ -318,7 +318,7 @@
           close(timefd);
       }
       else {
  -        lastcheck = buf.st_mtime * AP_USEC_PER_SEC;        /* save the time */
  +        lastcheck = buf.st_mtime * APR_USEC_PER_SEC;        /* save the time */
           if (garbage_now < lastcheck + every) {
               return 0;
           }
  @@ -440,8 +440,8 @@
                                    "cache gc: stat(%s)", filename);
               }
               else if (garbage_now != -1 &&
  -                     (buf.st_atime*AP_USEC_PER_SEC) < garbage_now - MSEC_ONE_DAY &&
  -                     (buf.st_mtime*AP_USEC_PER_SEC) < garbage_now - MSEC_ONE_DAY) {
  +                     (buf.st_atime*APR_USEC_PER_SEC) < garbage_now - MSEC_ONE_DAY &&
  +                     (buf.st_mtime*APR_USEC_PER_SEC) < garbage_now - MSEC_ONE_DAY) {
                   ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
                                "GC unlink %s", filename);
                   ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  @@ -587,8 +587,8 @@
                   continue;
               /* bad file */
               if (garbage_now != -1 &&
  -                (buf.st_atime*AP_USEC_PER_SEC) > garbage_now + MSEC_ONE_DAY &&
  -                (buf.st_mtime*AP_USEC_PER_SEC) > garbage_now + MSEC_ONE_DAY) {
  +                (buf.st_atime*APR_USEC_PER_SEC) > garbage_now + MSEC_ONE_DAY &&
  +                (buf.st_mtime*APR_USEC_PER_SEC) > garbage_now + MSEC_ONE_DAY) {
                   ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r->server,
                                "cache: deleting bad cache file with future date: %s", filename);
   #if TESTING
  
  
  
  1.4       +2 -2      apache-2.0/src/modules/file_cache/mod_cache.h
  
  Index: mod_cache.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/file_cache/mod_cache.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_cache.h	2000/08/02 05:27:02	1.3
  +++ mod_cache.h	2000/08/06 06:07:39	1.4
  @@ -91,8 +91,8 @@
   #define CACHE_HEADER_SUFFIX ".header"
   #define CACHE_DATA_SUFFIX ".data"
   
  -#define    MSEC_ONE_DAY        ((apr_time_t)(86400*AP_USEC_PER_SEC))    /* one day, in microseconds */
  -#define    MSEC_ONE_HR        ((apr_time_t)(3600*AP_USEC_PER_SEC))    /* one hour, in microseconds */
  +#define MSEC_ONE_DAY ((apr_time_t)(86400*APR_USEC_PER_SEC)) /* one day, in microseconds */
  +#define MSEC_ONE_HR  ((apr_time_t)(3600*APR_USEC_PER_SEC))  /* one hour, in microseconds */
   
   #define DEFAULT_CACHE_SPACE 5
   #define DEFAULT_CACHE_MAXEXPIRE MSEC_ONE_DAY
  
  
  
  1.19      +1 -1      apache-2.0/src/modules/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/beos.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- beos.c	2000/08/02 14:44:37	1.18
  +++ beos.c	2000/08/06 06:07:39	1.19
  @@ -591,7 +591,7 @@
   static void server_main_loop(int remaining_threads_to_start)
   {
       int child_slot;
  -    ap_wait_t status;
  +    apr_wait_t status;
       apr_proc_t pid;
       int i;
   
  
  
  
  1.123     +1 -1      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- dexter.c	2000/08/02 14:44:40	1.122
  +++ dexter.c	2000/08/06 06:07:39	1.123
  @@ -903,7 +903,7 @@
   static void server_main_loop(int remaining_children_to_start)
   {
       int child_slot;
  -    ap_wait_t status;
  +    apr_wait_t status;
       apr_proc_t pid;
       int i;
   
  
  
  
  1.47      +1 -1      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mpmt_beos.c	2000/08/02 05:27:05	1.46
  +++ mpmt_beos.c	2000/08/06 06:07:40	1.47
  @@ -624,7 +624,7 @@
   static void server_main_loop(int remaining_children_to_start)
   {
       int child_slot;
  -    ap_wait_t status;
  +    apr_wait_t status;
       apr_proc_t pid;
       int i;
   
  
  
  
  1.118     +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- mpmt_pthread.c	2000/08/02 05:27:06	1.117
  +++ mpmt_pthread.c	2000/08/06 06:07:40	1.118
  @@ -937,7 +937,7 @@
   static void server_main_loop(int remaining_children_to_start)
   {
       int child_slot;
  -    ap_wait_t status;
  +    apr_wait_t status;
       apr_proc_t pid;
       int i;
   
  
  
  
  1.39      +2 -2      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- scoreboard.c	2000/08/02 05:27:06	1.38
  +++ scoreboard.c	2000/08/06 06:07:41	1.39
  @@ -153,7 +153,7 @@
    * anyway.
    */
   
  -ap_inline void ap_sync_scoreboard_image(void)
  +apr_inline void ap_sync_scoreboard_image(void)
   {
   }
   
  @@ -162,7 +162,7 @@
       return (ap_scoreboard_image ? 1 : 0);
   }
   
  -static ap_inline void put_scoreboard_info(int child_num, int thread_num, 
  +static apr_inline void put_scoreboard_info(int child_num, int thread_num, 
   				       thread_score *new_score_rec)
   {
       /* XXX - needs to be fixed to account for threads */
  
  
  
  1.22      +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- scoreboard.h	2000/08/02 05:27:06	1.21
  +++ scoreboard.h	2000/08/06 06:07:41	1.22
  @@ -217,7 +217,7 @@
   
   API_EXPORT(void) reopen_scoreboard(apr_pool_t *p);
   
  -ap_inline void ap_sync_scoreboard_image(void);
  +apr_inline void ap_sync_scoreboard_image(void);
   void increment_counts(int child_num, int thread_num, request_rec *r);
   void update_scoreboard_global(void);
   API_EXPORT(int) find_child_by_pid(apr_proc_t *pid);
  
  
  
  1.17      +1 -1      apache-2.0/src/modules/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/perchild.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- perchild.c	2000/08/04 07:07:33	1.16
  +++ perchild.c	2000/08/06 06:07:41	1.17
  @@ -1066,7 +1066,7 @@
   static void server_main_loop(int remaining_children_to_start)
   {
       int child_slot;
  -    ap_wait_t status;
  +    apr_wait_t status;
       apr_proc_t pid;
       int i;
   
  
  
  
  1.125     +5 -5      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- prefork.c	2000/08/02 14:44:46	1.124
  +++ prefork.c	2000/08/06 06:07:42	1.125
  @@ -373,7 +373,7 @@
    * since when the parent is writing an entry, it's only noting SERVER_DEAD
    * anyway.
    */
  -ap_inline void ap_sync_scoreboard_image(void)
  +apr_inline void ap_sync_scoreboard_image(void)
   {
   #ifdef SCOREBOARD_FILE
       lseek(scoreboard_fd, 0L, 0);
  @@ -392,7 +392,7 @@
       return ap_max_daemons_limit;
   }
   
  -static ap_inline void put_scoreboard_info(int child_num,
  +static apr_inline void put_scoreboard_info(int child_num,
                                          short_score *new_score_rec)
   {
   #ifdef SCOREBOARD_FILE
  @@ -534,7 +534,7 @@
      Systems without a real waitpid sometimes lose a child's exit while waiting
      for another.  Search through the scoreboard for missing children.
    */
  -int reap_children(ap_wait_t *status)
  +int reap_children(apr_wait_t *status)
   {
       int n, pid;
   
  @@ -544,7 +544,7 @@
   		kill((pid = ap_scoreboard_image->parent[n].pid), 0) == -1) {
   	    ap_update_child_status(n, SERVER_DEAD, NULL);
   	    /* just mark it as having a successful exit status */
  -	    bzero((char *) status, sizeof(ap_wait_t));
  +	    bzero((char *) status, sizeof(apr_wait_t));
   	    return(pid);
   	}
       }
  @@ -1372,7 +1372,7 @@
   
       while (!restart_pending && !shutdown_pending) {
   	int child_slot;
  -	ap_wait_t status;
  +	apr_wait_t status;
           /* this is a memory leak, but I'll fix it later. */
   	apr_proc_t pid;
   
  
  
  
  1.61      +2 -2      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- spmt_os2.c	2000/08/05 16:04:56	1.60
  +++ spmt_os2.c	2000/08/06 06:07:42	1.61
  @@ -359,7 +359,7 @@
   #endif
   static int wait_or_timeout_counter;
   
  -static int wait_or_timeout(ap_wait_t *status)
  +static int wait_or_timeout(apr_wait_t *status)
   {
       int ret;
       ULONG tid;
  @@ -1247,7 +1247,7 @@
   
       while (!restart_pending && !shutdown_pending) {
   	int child_slot;
  -	ap_wait_t status;
  +	apr_wait_t status;
   	int tid = wait_or_timeout(&status);
   
   	/* XXX: if it takes longer than 1 second for all our children
  
  
  
  1.95      +8 -8      apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- mpm_winnt.c	2000/08/02 14:44:51	1.94
  +++ mpm_winnt.c	2000/08/06 06:07:43	1.95
  @@ -390,7 +390,7 @@
    */
   static ap_listen_rec *head_listener;
   
  -static ap_inline ap_listen_rec *find_ready_listener(fd_set * main_fds)
  +static apr_inline ap_listen_rec *find_ready_listener(fd_set * main_fds)
   {
       ap_listen_rec *lr;
       SOCKET nsd;
  @@ -908,7 +908,7 @@
   
       return 0;
   }
  -static ap_inline apr_status_t reset_acceptex_context(PCOMP_CONTEXT context) 
  +static apr_inline apr_status_t reset_acceptex_context(PCOMP_CONTEXT context) 
   {
       DWORD BytesRead;
       SOCKET nsd;
  @@ -1906,10 +1906,10 @@
                        &opt, process->pool) == APR_SUCCESS) {
           switch (opt) {
           case 'n':
  -            service_named = mpm_service_set_name(process->pool, ap_optarg);
  +            service_named = mpm_service_set_name(process->pool, apr_optarg);
               break;
           case 'k':
  -            signal_arg = ap_optarg;
  +            signal_arg = apr_optarg;
               break;
           case 'i':
               /* TODO: warn of depreciated syntax, "use -k install instead" */
  @@ -1923,9 +1923,9 @@
               optbuf[1] = (char) opt;
               new_arg = (char**) apr_push_array(mpm_new_argv);
               *new_arg = apr_pstrdup(process->pool, optbuf);
  -            if (ap_optarg) {
  +            if (apr_optarg) {
                   new_arg = (char**) apr_push_array(mpm_new_argv);
  -                *new_arg = ap_optarg;
  +                *new_arg = apr_optarg;
               }
               break;
           }
  @@ -1933,8 +1933,8 @@
       /* Set optreset and optind to allow apr_getopt to work correctly
        * when called from http_main.c
        */
  -    ap_optreset = 1;
  -    ap_optind = 1;
  +    apr_optreset = 1;
  +    apr_optind = 1;
       
       /* Track the number of args actually entered by the user */
       inst_argc = mpm_new_argv->nelts - fixed_args;
  
  
  
  1.12      +1 -1      apache-2.0/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_proxy.c	2000/08/02 05:27:12	1.11
  +++ mod_proxy.c	2000/08/06 06:07:43	1.12
  @@ -609,7 +609,7 @@
         ap_get_module_config(s->module_config, &proxy_module);
       int *New;
   
  -    if (!ap_isdigit(arg[0]))
  +    if (!apr_isdigit(arg[0]))
       return "AllowCONNECT: port number must be numeric";
   
       New = apr_push_array(conf->allowed_connect_ports);
  
  
  
  1.10      +1 -1      apache-2.0/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- proxy_connect.c	2000/08/02 05:27:12	1.9
  +++ proxy_connect.c	2000/08/06 06:07:43	1.10
  @@ -144,7 +144,7 @@
       }
   
   /* check if ProxyBlock directive on this host */
  -    destaddr.s_addr = ap_inet_addr(host);
  +    destaddr.s_addr = apr_inet_addr(host);
       for (i = 0; i < conf->noproxies->nelts; i++) {
       if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
           || destaddr.s_addr == npent[i].addr.s_addr || npent[i].name[0] == '*')
  
  
  
  1.15      +11 -11    apache-2.0/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- proxy_ftp.c	2000/08/02 05:27:12	1.14
  +++ proxy_ftp.c	2000/08/06 06:07:44	1.15
  @@ -87,7 +87,7 @@
       for (i = 0, j = 0; x[i] != '\0'; i++, j++) {
   /* decode it if not already done */
       ch = x[i];
  -    if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
  +    if (ch == '%' && apr_isxdigit(x[i + 1]) && apr_isxdigit(x[i + 2])) {
           ch = ap_proxy_hex2c(&x[i + 1]);
           i += 2;
       }
  @@ -107,7 +107,7 @@
   
       for (i = 0; x[i] != '\0'; i++) {
       ch = x[i];
  -    if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
  +    if (ch == '%' && apr_isxdigit(x[i + 1]) && apr_isxdigit(x[i + 2])) {
           ch = ap_proxy_hex2c(&x[i + 1]);
           i += 2;
       }
  @@ -207,8 +207,8 @@
       if (len == -1)
       return -1;
   /* check format */
  -    if (len < 5 || !ap_isdigit(linebuff[0]) || !ap_isdigit(linebuff[1]) ||
  -    !ap_isdigit(linebuff[2]) || (linebuff[3] != ' ' && linebuff[3] != '-'))
  +    if (len < 5 || !apr_isdigit(linebuff[0]) || !apr_isdigit(linebuff[1]) ||
  +    !apr_isdigit(linebuff[2]) || (linebuff[3] != ' ' && linebuff[3] != '-'))
       status = 0;
       else
       status = 100 * linebuff[0] + 10 * linebuff[1] + linebuff[2] - 111 * '0';
  @@ -248,8 +248,8 @@
       len = ap_bgets(linebuff, sizeof linebuff, f);
       if (len == -1)
       return -1;
  -    if (len < 5 || !ap_isdigit(linebuff[0]) || !ap_isdigit(linebuff[1]) ||
  -    !ap_isdigit(linebuff[2]) || (linebuff[3] != ' ' && linebuff[3] != '-'))
  +    if (len < 5 || !apr_isdigit(linebuff[0]) || !apr_isdigit(linebuff[1]) ||
  +    !apr_isdigit(linebuff[2]) || (linebuff[3] != ' ' && linebuff[3] != '-'))
       status = 0;
       else
       status = 100 * linebuff[0] + 10 * linebuff[1] + linebuff[2] - 111 * '0';
  @@ -359,8 +359,8 @@
           apr_cpystrn(buf, buf2, sizeof(buf));
           n = strlen(buf);
       }
  -    else if (buf[0] == 'd' || buf[0] == '-' || buf[0] == 'l' || ap_isdigit(buf[0])) {
  -        if (ap_isdigit(buf[0])) {    /* handle DOS dir */
  +    else if (buf[0] == 'd' || buf[0] == '-' || buf[0] == 'l' || apr_isdigit(buf[0])) {
  +        if (apr_isdigit(buf[0])) {    /* handle DOS dir */
           searchptr = strchr(buf, '<');
           if (searchptr != NULL)
               *searchptr = '[';
  @@ -487,7 +487,7 @@
       unsigned short pport;
       int pasvmode = 0;
       char pasv[64];
  -    char *pstr, dates[AP_RFC822_DATE_LEN];
  +    char *pstr, dates[APR_RFC822_DATE_LEN];
   
       char *npaddr;
       apr_uint32_t npport;
  @@ -546,7 +546,7 @@
       }
   
   /* check if ProxyBlock directive on this host */
  -    destaddr.s_addr = ap_inet_addr(host);
  +    destaddr.s_addr = apr_inet_addr(host);
       for (i = 0; i < conf->noproxies->nelts; i++) {
       if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
           || destaddr.s_addr == npent[i].addr.s_addr || npent[i].name[0] == '*')
  @@ -936,7 +936,7 @@
                   len = 0;
               }
               else if (i == 213) { /* Size command ok */
  -                for (j = 0; j < sizeof resp && ap_isdigit(resp[j]); j++)
  +                for (j = 0; j < sizeof resp && apr_isdigit(resp[j]); j++)
                       ;
                   resp[j] = '\0';
                   if (resp[0] != '\0')
  
  
  
  1.14      +5 -5      apache-2.0/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- proxy_http.c	2000/08/02 05:27:12	1.13
  +++ proxy_http.c	2000/08/06 06:07:44	1.14
  @@ -147,9 +147,9 @@
   
       while (*next) {
           name = next;
  -        while (*next && !ap_isspace(*next) && (*next != ','))
  +        while (*next && !apr_isspace(*next) && (*next != ','))
               ++next;
  -        while (*next && (ap_isspace(*next) || (*next == ','))) {
  +        while (*next && (apr_isspace(*next) || (*next == ','))) {
               *next = '\0';
               ++next;
           }
  @@ -224,14 +224,14 @@
       strp2 = strchr(desthost, ':');
       if (strp2 != NULL) {
           *(strp2++) = '\0';
  -        if (ap_isdigit(*strp2)) {
  +        if (apr_isdigit(*strp2)) {
               destport = atoi(strp2);
               destportstr = strp2;
           }
       }
   
   /* check if ProxyBlock directive on this host */
  -    destaddr.s_addr = ap_inet_addr(desthost);
  +    destaddr.s_addr = apr_inet_addr(desthost);
       for (i = 0; i < conf->noproxies->nelts; i++) {
           if ((npent[i].name != NULL && strstr(desthost, npent[i].name) != NULL)
               || destaddr.s_addr == npent[i].addr.s_addr || npent[i].name[0] == '*')
  @@ -304,7 +304,7 @@
               );
       }
   
  -    reqhdrs_arr = ap_table_elts(r->headers_in);
  +    reqhdrs_arr = apr_table_elts(r->headers_in);
       reqhdrs = (apr_table_entry_t *) reqhdrs_arr->elts;
       for (i = 0; i < reqhdrs_arr->nelts; i++) {
           if (reqhdrs[i].key == NULL || reqhdrs[i].val == NULL
  
  
  
  1.18      +29 -29    apache-2.0/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- proxy_util.c	2000/08/02 05:27:12	1.17
  +++ proxy_util.c	2000/08/06 06:07:45	1.18
  @@ -78,18 +78,18 @@
   
   #ifndef CHARSET_EBCDIC
       ch = x[0];
  -    if (ap_isdigit(ch))
  +    if (apr_isdigit(ch))
       i = ch - '0';
  -    else if (ap_isupper(ch))
  +    else if (apr_isupper(ch))
       i = ch - ('A' - 10);
       else
       i = ch - ('a' - 10);
       i <<= 4;
   
       ch = x[1];
  -    if (ap_isdigit(ch))
  +    if (apr_isdigit(ch))
       i += ch - '0';
  -    else if (ap_isupper(ch))
  +    else if (apr_isupper(ch))
       i += ch - ('A' - 10);
       else
       i += ch - ('a' - 10);
  @@ -180,7 +180,7 @@
       }
   /* decode it if not already done */
       if (isenc && ch == '%') {
  -        if (!ap_isxdigit(x[i + 1]) || !ap_isxdigit(x[i + 2]))
  +        if (!apr_isxdigit(x[i + 1]) || !apr_isxdigit(x[i + 2]))
           return NULL;
           ch = ap_proxy_hex2c(&x[i + 1]);
           i += 2;
  @@ -191,7 +191,7 @@
           }
       }
   /* recode it, if necessary */
  -    if (!ap_isalnum(ch) && !strchr(allowed, ch)) {
  +    if (!apr_isalnum(ch) && !strchr(allowed, ch)) {
           ap_proxy_c2hex(ch, &y[j]);
           j += 2;
       }
  @@ -262,7 +262,7 @@
       *(strp++) = '\0';
   
       for (i = 0; strp[i] != '\0'; i++)
  -        if (!ap_isdigit(strp[i]))
  +        if (!apr_isdigit(strp[i]))
           break;
   
       /* if (i == 0) the no port was given; keep default */
  @@ -279,13 +279,13 @@
       return "Missing host in URL";
   /* check hostname syntax */
       for (i = 0; host[i] != '\0'; i++)
  -    if (!ap_isdigit(host[i]) && host[i] != '.')
  +    if (!apr_isdigit(host[i]) && host[i] != '.')
           break;
       /* must be an IP address */
   #ifdef WIN32
       if (host[i] == '\0' && (inet_addr(host) == -1))
   #else
  -    if (host[i] == '\0' && (ap_inet_addr(host) == -1 || inet_network(host) == -1))
  +    if (host[i] == '\0' && (apr_inet_addr(host) == -1 || inet_network(host) == -1))
   #endif
       {
       return "Bad IP address in URL";
  @@ -346,7 +346,7 @@
              &min, &sec, &year) != 7)
           return x;
       for (wk = 0; wk < 7; wk++)
  -        if (strcmp(week, ap_day_snames[wk]) == 0)
  +        if (strcmp(week, apr_day_snames[wk]) == 0)
           break;
       if (wk == 7)
           return x;
  @@ -354,14 +354,14 @@
   
   /* check date */
       for (mon = 0; mon < 12; mon++)
  -    if (strcmp(month, ap_month_snames[mon]) == 0)
  +    if (strcmp(month, apr_month_snames[mon]) == 0)
           break;
       if (mon == 12)
       return x;
   
       q = apr_palloc(p, 30);
  -    apr_snprintf(q, 30, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", ap_day_snames[wk], mday,
  -        ap_month_snames[mon], year, hour, min, sec);
  +    apr_snprintf(q, 30, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", apr_day_snames[wk], mday,
  +        apr_month_snames[mon], year, hour, min, sec);
       return q;
   }
   
  @@ -469,11 +469,11 @@
       /* XXX: RFC2068 defines only SP and HT as whitespace, this test is
        * wrong... and so are many others probably.
        */
  -        while (ap_isspace(*value))
  +        while (apr_isspace(*value))
               ++value;            /* Skip to start of value   */
   
       /* should strip trailing whitespace as well */
  -    for (end = &value[strlen(value)-1]; end > value && ap_isspace(*end); --end)
  +    for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end)
           *end = '\0';
   
           apr_table_add(resp_hdrs, buffer, value);
  @@ -607,11 +607,11 @@
   {
       int i;
       BUFF *fp = r->connection->client;
  -    apr_table_entry_t *elts = (apr_table_entry_t *) ap_table_elts(t)->elts;
  +    apr_table_entry_t *elts = (apr_table_entry_t *) apr_table_elts(t)->elts;
   
       ap_bvputs(fp, respline, CRLF, NULL);
   
  -    for (i = 0; i < ap_table_elts(t)->nelts; ++i) {
  +    for (i = 0; i < apr_table_elts(t)->nelts; ++i) {
           if (elts[i].key != NULL) {
               ap_bvputs(fp, elts[i].key, ": ", elts[i].val, CRLF, NULL);
               apr_table_addn(r->headers_out, elts[i].key, elts[i].val);
  @@ -641,12 +641,12 @@
           i = p - list;
           do
           p++;
  -        while (ap_isspace(*p));
  +        while (apr_isspace(*p));
       }
       else
           i = strlen(list);
   
  -    while (i > 0 && ap_isspace(list[i - 1]))
  +    while (i > 0 && apr_isspace(list[i - 1]))
           i--;
       if (i == len && strncasecmp(list, val, len) == 0)
           return 1;
  @@ -667,9 +667,9 @@
       for (i = 0, j = 0; i < 8; i++) {
       ch = x[i];
       j <<= 4;
  -    if (ap_isdigit(ch))
  +    if (apr_isdigit(ch))
           j |= ch - '0';
  -    else if (ap_isupper(ch))
  +    else if (apr_isupper(ch))
           j |= ch - ('A' - 10);
       else
           j |= ch - ('a' - 10);
  @@ -744,7 +744,7 @@
       static APACHE_TLS char *charpbuf[2];
   
       for (i = 0; host[i] != '\0'; i++)
  -        if (!ap_isdigit(host[i]) && host[i] != '.')
  +        if (!apr_isdigit(host[i]) && host[i] != '.')
               break;
   
       if (host[i] != '\0') {
  @@ -753,7 +753,7 @@
               return "Host not found";
       }
       else {
  -        ipaddr = ap_inet_addr(host);
  +        ipaddr = apr_inet_addr(host);
           hp = gethostbyaddr((char *) &ipaddr, sizeof(u_long), AF_INET);
           if (hp == NULL) {
               memset(&hpbuf, 0, sizeof(hpbuf));
  @@ -806,7 +806,7 @@
       long bits;
   
       /* if the address is given with an explicit netmask, use that */
  -    /* Due to a deficiency in ap_inet_addr(), it is impossible to parse */
  +    /* Due to a deficiency in apr_inet_addr(), it is impossible to parse */
       /* "partial" addresses (with less than 4 quads) correctly, i.e.  */
       /* 192.168.123 is parsed as 192.168.0.123, which is not what I want. */
       /* I therefore have to parse the IP address manually: */
  @@ -824,7 +824,7 @@
       if (*addr == '/' && quads > 0)    /* netmask starts here. */
           break;
   
  -    if (!ap_isdigit(*addr))
  +    if (!apr_isdigit(*addr))
           return 0;        /* no digit at start of quad */
   
       ip_addr[quads] = strtol(addr, &tmp, 0);
  @@ -846,7 +846,7 @@
       for (This->addr.s_addr = 0, i = 0; i < quads; ++i)
       This->addr.s_addr |= htonl(ip_addr[i] << (24 - 8 * i));
   
  -    if (addr[0] == '/' && ap_isdigit(addr[1])) {    /* net mask follows: */
  +    if (addr[0] == '/' && apr_isdigit(addr[1])) {    /* net mask follows: */
       char *tmp;
   
       ++addr;
  @@ -1004,7 +1004,7 @@
       return 0;
   
       /* rfc1035 says DNS names must consist of "[-a-zA-Z0-9]" and '.' */
  -    for (i = 0; ap_isalnum(addr[i]) || addr[i] == '-' || addr[i] == '.'; ++i)
  +    for (i = 0; apr_isalnum(addr[i]) || addr[i] == '-' || addr[i] == '.'; ++i)
       continue;
   
   #if 0
  @@ -1059,7 +1059,7 @@
       return 0;
   
       /* rfc1035 says DNS names must consist of "[-a-zA-Z0-9]" and '.' */
  -    for (i = 0; ap_isalnum(addr[i]) || addr[i] == '-' || addr[i] == '.'; ++i);
  +    for (i = 0; apr_isalnum(addr[i]) || addr[i] == '-' || addr[i] == '.'; ++i);
   
   #if 0
       if (addr[i] == ':') {
  @@ -1132,7 +1132,7 @@
   {
       int i;
       for (i = 0; host[i] != '\0'; i++)
  -        if (!ap_isdigit(host[i]) && host[i] != '.')
  +        if (!apr_isdigit(host[i]) && host[i] != '.')
               break;
   
       apr_set_remote_port(sock, port);
  
  
  
  1.19      +6 -6      apache-2.0/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_access.c	2000/08/02 05:27:14	1.18
  +++ mod_access.c	2000/08/06 06:07:46	1.19
  @@ -156,7 +156,7 @@
   
   static int is_ip(const char *host)
   {
  -    while ((*host == '.') || ap_isdigit(*host))
  +    while ((*host == '.') || apr_isdigit(*host))
   	host++;
       return (*host == '\0');
   }
  @@ -193,7 +193,7 @@
   	*s++ = '\0';
   
   	if (!is_ip(where)
  -	    || (a->x.ip.net = ap_inet_addr(where)) == INADDR_NONE) {
  +	    || (a->x.ip.net = apr_inet_addr(where)) == INADDR_NONE) {
   	    a->type = T_FAIL;
   	    return "syntax error in network portion of network/netmask";
   	}
  @@ -205,7 +205,7 @@
   	}
   	/* is it in /a.b.c.d form? */
   	if (strchr(s, '.')) {
  -	    mask = ap_inet_addr(s);
  +	    mask = apr_inet_addr(s);
   	    if (mask == INADDR_NONE) {
   		a->type = T_FAIL;
   		return "syntax error in mask portion of network/netmask";
  @@ -224,7 +224,7 @@
   	a->x.ip.mask = mask;
           a->x.ip.net  = (a->x.ip.net & mask);   /* pjr - This fixes PR 4770 */
       }
  -    else if (ap_isdigit(*where) && is_ip(where)) {
  +    else if (apr_isdigit(*where) && is_ip(where)) {
   	/* legacy syntax for ip addrs: a.b.c. ==> a.b.c.0/24 for example */
   	int shift;
   	char *t;
  @@ -238,11 +238,11 @@
   	shift = 24;
   	while (*s) {
   	    t = s;
  -	    if (!ap_isdigit(*t)) {
  +	    if (!apr_isdigit(*t)) {
   		a->type = T_FAIL;
   		return "invalid ip address";
   	    }
  -	    while (ap_isdigit(*t)) {
  +	    while (apr_isdigit(*t)) {
   		++t;
   	    }
   	    if (*t == '.') {
  
  
  
  1.17      +1 -1      apache-2.0/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_alias.c	2000/08/02 05:27:14	1.16
  +++ mod_alias.c	2000/08/06 06:07:46	1.17
  @@ -188,7 +188,7 @@
   	status = HTTP_MOVED_TEMPORARILY;
       else if (!strcasecmp(arg1, "seeother"))
   	status = HTTP_SEE_OTHER;
  -    else if (ap_isdigit(*arg1))
  +    else if (apr_isdigit(*arg1))
   	status = atoi(arg1);
       else {
   	f = arg1;
  
  
  
  1.24      +14 -14    apache-2.0/src/modules/standard/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_auth_digest.c	2000/08/02 05:27:14	1.23
  +++ mod_auth_digest.c	2000/08/06 06:07:46	1.24
  @@ -174,8 +174,8 @@
   
   #define	DFLT_ALGORITHM	"MD5"
   
  -#define	DFLT_NONCE_LIFE	(300*AP_USEC_PER_SEC)
  -#define NEXTNONCE_DELTA	(30*AP_USEC_PER_SEC)
  +#define	DFLT_NONCE_LIFE	(300*APR_USEC_PER_SEC)
  +#define NEXTNONCE_DELTA	(30*APR_USEC_PER_SEC)
   
   
   #define NONCE_TIME_LEN	(((sizeof(apr_time_t)+2)/3)*4)
  @@ -536,10 +536,10 @@
       long  lifetime;
   
       lifetime = strtol(t, &endptr, 10); 
  -    if (endptr < (t+strlen(t)) && !ap_isspace(*endptr))
  +    if (endptr < (t+strlen(t)) && !apr_isspace(*endptr))
   	return apr_pstrcat(cmd->pool, "Invalid time in AuthDigestNonceLifetime: ", t, NULL);
   
  -    ((digest_config_rec *) config)->nonce_lifetime = lifetime * AP_USEC_PER_SEC;
  +    ((digest_config_rec *) config)->nonce_lifetime = lifetime * APR_USEC_PER_SEC;
       return NULL;
   }
   
  @@ -599,7 +599,7 @@
       long  size, min;
   
       size = strtol(size_str, &endptr, 10); 
  -    while (ap_isspace(*endptr)) endptr++;
  +    while (apr_isspace(*endptr)) endptr++;
       if (*endptr == '\0' || *endptr == 'b' || *endptr == 'B')
   	;
       else if (*endptr == 'k' || *endptr == 'K')
  @@ -867,19 +867,19 @@
   
   	/* find key */
   
  -	while (ap_isspace(auth_line[0])) auth_line++;
  +	while (apr_isspace(auth_line[0])) auth_line++;
   	vk = 0;
   	while (auth_line[0] != '=' && auth_line[0] != ','
  -	       && auth_line[0] != '\0' && !ap_isspace(auth_line[0]))
  +	       && auth_line[0] != '\0' && !apr_isspace(auth_line[0]))
   	    key[vk++] = *auth_line++;
   	key[vk] = '\0';
  -	while (ap_isspace(auth_line[0])) auth_line++;
  +	while (apr_isspace(auth_line[0])) auth_line++;
   
   	/* find value */
   
   	if (auth_line[0] == '=') {
   	    auth_line++;
  -	    while (ap_isspace(auth_line[0])) auth_line++;
  +	    while (apr_isspace(auth_line[0])) auth_line++;
   
   	    vv = 0;
   	    if (auth_line[0] == '\"') {		/* quoted string */
  @@ -893,7 +893,7 @@
   	    }
   	    else {				 /* token */
   		while (auth_line[0] != ',' && auth_line[0] != '\0'
  -		       && !ap_isspace(auth_line[0]))
  +		       && !apr_isspace(auth_line[0]))
   		    value[vv++] = *auth_line++;
   	    }
   	    value[vv] = '\0';
  @@ -1369,7 +1369,7 @@
   	return OK;
   
       nc = strtol(snc, &endptr, 16);
  -    if (endptr < (snc+strlen(snc)) && !ap_isspace(*endptr)) {
  +    if (endptr < (snc+strlen(snc)) && !apr_isspace(*endptr)) {
   	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
   		      "Digest: invalid nc %s received - not a number", snc);
   	return !OK;
  @@ -1433,8 +1433,8 @@
   	if (dt > conf->nonce_lifetime) {
   	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0,r,
   			  "Digest: user %s: nonce expired (%.2lf seconds old - max lifetime %.2lf) - sending new nonce", 
  -			  r->user, ((double)dt)/AP_USEC_PER_SEC, 
  -			  ((double)(conf->nonce_lifetime))/AP_USEC_PER_SEC);
  +			  r->user, ((double)dt)/APR_USEC_PER_SEC, 
  +			  ((double)(conf->nonce_lifetime))/APR_USEC_PER_SEC);
   	    note_digest_auth_failure(r, conf, resp, 1);
   	    return HTTP_UNAUTHORIZED;
   	}
  @@ -1928,7 +1928,7 @@
   	 * Content-length is never set yet when we get here, and we can't
   	 * calc the entity hash) it's best to just leave this #def'd out.
   	 */
  -	char date[AP_RFC822_DATE_LEN];
  +	char date[APR_RFC822_DATE_LEN];
   	apr_rfc822_date(date, r->request_time);
   	char *entity_info =
   	    ap_md5(r->pool,
  
  
  
  1.41      +5 -5      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_autoindex.c	2000/08/02 05:27:14	1.40
  +++ mod_autoindex.c	2000/08/06 06:07:46	1.41
  @@ -183,7 +183,7 @@
    * matches ".." or "../").  Hopefully this one call is significantly less
    * expensive than multiple strcmp() calls.
    */
  -static ap_inline int is_parent(const char *name)
  +static apr_inline int is_parent(const char *name)
   {
       /*
        * Now, IFF the first two bytes are dots, and the third byte is either
  @@ -1128,7 +1128,7 @@
   	}
   	titlebuf[n] = '\0';
   	for (x = 0, p = 0; titlebuf[x]; x++) {
  -	    if (ap_toupper(titlebuf[x]) == find[p]) {
  +	    if (apr_toupper(titlebuf[x]) == find[p]) {
   		if (!find[++p]) {
   		    if ((p = ap_ind(&titlebuf[++x], '<')) != -1) {
   			titlebuf[x + p] = '\0';
  @@ -1179,8 +1179,8 @@
       p->alt = NULL;
       p->desc = NULL;
       p->lm = -1;
  -    p->key = ap_toupper(keyid);
  -    p->ascending = (ap_toupper(direction) == D_ASCENDING);
  +    p->key = apr_toupper(keyid);
  +    p->ascending = (apr_toupper(direction) == D_ASCENDING);
       p->version_sort = autoindex_opts & VERSION_SORT;
   
       if (autoindex_opts & FANCY_INDEXING) {
  @@ -1430,7 +1430,7 @@
   	    if (!(autoindex_opts & SUPPRESS_LAST_MOD)) {
   		if (ar[x]->lm != -1) {
   		    char time_str[MAX_STRING_LEN];
  -		    ap_exploded_time_t ts;
  +		    apr_exploded_time_t ts;
                       apr_explode_localtime(&ts, ar[x]->lm);
   		    apr_strftime(time_str, &rv, MAX_STRING_LEN, 
                                   "%d-%b-%Y %H:%M  ", &ts);
  
  
  
  1.19      +3 -3      apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_cern_meta.c	2000/08/02 05:27:15	1.18
  +++ mod_cern_meta.c	2000/08/06 06:07:46	1.19
  @@ -267,7 +267,7 @@
   	}
   
   	*l++ = '\0';
  -	while (*l && ap_isspace(*l))
  +	while (*l && apr_isspace(*l))
   	    ++l;
   
   	if (!strcasecmp(w, "Content-type")) {
  @@ -275,7 +275,7 @@
   	    /* Nuke trailing whitespace */
   
   	    char *endp = l + strlen(l) - 1;
  -	    while (endp > l && ap_isspace(*endp))
  +	    while (endp > l && apr_isspace(*endp))
   		*endp-- = '\0';
   
   	    tmp = apr_pstrdup(r->pool, l);
  @@ -290,7 +290,7 @@
   	    apr_table_set(tmp_headers, w, l);
   	}
       }
  -    apr_overlap_tables(r->headers_out, tmp_headers, AP_OVERLAP_TABLES_SET);
  +    apr_overlap_tables(r->headers_out, tmp_headers, APR_OVERLAP_TABLES_SET);
       return OK;
   }
   
  
  
  
  1.56      +4 -4      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_cgi.c	2000/08/02 05:27:15	1.55
  +++ mod_cgi.c	2000/08/06 06:07:46	1.56
  @@ -181,7 +181,7 @@
   {
       apr_file_t *f = NULL;
       apr_finfo_t finfo;
  -    char time_str[AP_CTIME_LEN];
  +    char time_str[APR_CTIME_LEN];
   
       ap_log_rerror(APLOG_MARK, show_errno|APLOG_ERR, errno, r, 
   		"%s: %s", error, r->filename);
  @@ -227,13 +227,13 @@
   static int log_script(request_rec *r, cgi_server_conf * conf, int ret,
   		  char *dbuf, const char *sbuf, BUFF *script_in, BUFF *script_err)
   {
  -    apr_array_header_t *hdrs_arr = ap_table_elts(r->headers_in);
  +    apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
       apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
       char argsbuffer[HUGE_STRING_LEN];
       apr_file_t *f = NULL;
       int i;
       apr_finfo_t finfo;
  -    char time_str[AP_CTIME_LEN];
  +    char time_str[APR_CTIME_LEN];
   
       if (!conf->logname ||
           ((apr_stat(&finfo, ap_server_root_relative(r->pool, conf->logname), r->pool) == APR_SUCCESS)
  @@ -267,7 +267,7 @@
       }
   
       apr_puts("%response\n", f);
  -    hdrs_arr = ap_table_elts(r->err_headers_out);
  +    hdrs_arr = apr_table_elts(r->err_headers_out);
       hdrs = (apr_table_entry_t *) hdrs_arr->elts;
   
       for (i = 0; i < hdrs_arr->nelts; ++i) {
  
  
  
  1.35      +3 -3      apache-2.0/src/modules/standard/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_cgid.c	2000/08/02 23:47:58	1.34
  +++ mod_cgid.c	2000/08/06 06:07:47	1.35
  @@ -312,7 +312,7 @@
       return (pid);
   }
   
  -static void cgid_maint(int reason, void *data, ap_wait_t status)
  +static void cgid_maint(int reason, void *data, apr_wait_t status)
   {
   #if APR_HAS_OTHER_CHILD
       int *sd = data;
  @@ -739,7 +739,7 @@
   static int log_script(request_rec *r, cgid_server_conf * conf, int ret, 
                     char *dbuf, const char *sbuf, BUFF *script_in, BUFF *script_err) 
   { 
  -    apr_array_header_t *hdrs_arr = ap_table_elts(r->headers_in); 
  +    apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in); 
       apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts; 
       char argsbuffer[HUGE_STRING_LEN]; 
       apr_file_t *f = NULL; 
  @@ -781,7 +781,7 @@
       } 
   
       apr_puts("%response\n", f); 
  -    hdrs_arr = ap_table_elts(r->err_headers_out); 
  +    hdrs_arr = apr_table_elts(r->err_headers_out); 
       hdrs = (apr_table_entry_t *) hdrs_arr->elts; 
   
       for (i = 0; i < hdrs_arr->nelts; ++i) { 
  
  
  
  1.19      +1 -1      apache-2.0/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_dir.c	2000/08/02 05:27:15	1.18
  +++ mod_dir.c	2000/08/06 06:07:47	1.19
  @@ -181,7 +181,7 @@
           if (ap_is_HTTP_REDIRECT(rr->status) ||
               (rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
   
  -            ap_pool_join(r->pool, rr->pool);
  +            apr_pool_join(r->pool, rr->pool);
               error_notfound = rr->status;
               r->notes = apr_overlay_tables(r->pool, r->notes, rr->notes);
               r->headers_out = apr_overlay_tables(r->pool, r->headers_out,
  
  
  
  1.15      +1 -1      apache-2.0/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_env.c	2000/08/02 05:27:15	1.14
  +++ mod_env.c	2000/08/06 06:07:47	1.15
  @@ -152,7 +152,7 @@
   
       new_table = apr_copy_table(p, base->vars);
   
  -    arr = ap_table_elts(add->vars);
  +    arr = apr_table_elts(add->vars);
       elts = (apr_table_entry_t *)arr->elts;
   
       for (i = 0; i < arr->nelts; ++i) {
  
  
  
  1.21      +3 -3      apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_expires.c	2000/08/02 05:27:15	1.20
  +++ mod_expires.c	2000/08/06 06:07:47	1.21
  @@ -290,7 +290,7 @@
       while (word[0]) {
           /* <num>
            */
  -        if (ap_isdigit(word[0])) {
  +        if (apr_isdigit(word[0])) {
               num = atoi(word);
           }
           else {
  @@ -487,8 +487,8 @@
       apr_table_mergen(r->headers_out, "Cache-Control",
   		    apr_psprintf(r->pool, "max-age=%qd",
   				(expires - r->request_time)
  -				    / AP_USEC_PER_SEC));
  -    timestr = apr_palloc(r->pool, AP_RFC822_DATE_LEN);
  +				    / APR_USEC_PER_SEC));
  +    timestr = apr_palloc(r->pool, APR_RFC822_DATE_LEN);
       apr_rfc822_date(timestr, expires);
       apr_table_setn(r->headers_out, "Expires", timestr);
       return OK;
  
  
  
  1.22      +1 -1      apache-2.0/src/modules/standard/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_file_cache.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_file_cache.c	2000/08/02 05:27:15	1.21
  +++ mod_file_cache.c	2000/08/06 06:07:47	1.22
  @@ -360,7 +360,7 @@
       sconf = ap_get_module_config(r->server->module_config, &file_cache_module);
   
       /* we only operate when at least one cachefile directive was used */
  -    if (ap_is_empty_table(sconf->files))
  +    if (apr_is_empty_table(sconf->files))
   	return DECLINED;
   
       res = ap_core_translate(r);
  
  
  
  1.21      +12 -12    apache-2.0/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_imap.c	2000/08/02 05:27:16	1.20
  +++ mod_imap.c	2000/08/06 06:07:47	1.21
  @@ -274,7 +274,7 @@
           return (-1);            /* in case we aren't passed anything */
       }
   
  -    while (*args && !ap_isdigit(*args) && *args != ',') {
  +    while (*args && !apr_isdigit(*args) && *args != ',') {
           args++;                 /* jump to the first digit, but not past
                                      a comma or end */
       }
  @@ -306,7 +306,7 @@
           start_of_y++;           /* start looking at the character after
                                      the comma */
   
  -        while (*start_of_y && !ap_isdigit(*start_of_y)) {
  +        while (*start_of_y && !apr_isdigit(*start_of_y)) {
               start_of_y++;       /* jump to the first digit, but not
                                      past the end */
   	}
  @@ -337,7 +337,7 @@
       /* assume there's no quoted part */
       *quoted_part = NULL;
   
  -    while (ap_isspace(*strp)) {
  +    while (apr_isspace(*strp)) {
           strp++;               	/* go along string until non-whitespace */
       }
   
  @@ -396,7 +396,7 @@
       }
   
       string_pos_const = value;
  -    while (ap_isalpha(*string_pos_const)) {
  +    while (apr_isalpha(*string_pos_const)) {
   	string_pos_const++;           /* go along the URL from the map
                                            until a non-letter */
       }
  @@ -705,7 +705,7 @@
   	}
   
   	directive = string_pos;
  -	while (*string_pos && !ap_isspace(*string_pos)) {	/* past directive */
  +	while (*string_pos && !apr_isspace(*string_pos)) {	/* past directive */
   	    ++string_pos;
   	}
   	if (!*string_pos) {		/* need at least two fields */
  @@ -716,15 +716,15 @@
   	if (!*string_pos) {		/* need at least two fields */
   	    goto need_2_fields;
   	}
  -	while(*string_pos && ap_isspace(*string_pos)) { /* past whitespace */
  +	while(*string_pos && apr_isspace(*string_pos)) { /* past whitespace */
   	    ++string_pos;
   	}
   
   	value = string_pos;
  -	while (*string_pos && !ap_isspace(*string_pos)) {	/* past value */
  +	while (*string_pos && !apr_isspace(*string_pos)) {	/* past value */
   	    ++string_pos;
   	}
  -	if (ap_isspace(*string_pos)) {
  +	if (apr_isspace(*string_pos)) {
   	    *string_pos++ = '\0';
   	}
   	else {
  @@ -763,17 +763,17 @@
                  sscanf(string_pos, "%lf%*[, ]%lf",
                         &pointarray[vertex][X], &pointarray[vertex][Y]) == 2) {
               /* Now skip what we just read... we can't use ANSIism %n */
  -            while (ap_isspace(*string_pos)) {      /* past whitespace */
  +            while (apr_isspace(*string_pos)) {      /* past whitespace */
                   string_pos++;
   	    }
  -            while (ap_isdigit(*string_pos)) {      /* and the 1st number */
  +            while (apr_isdigit(*string_pos)) {      /* and the 1st number */
                   string_pos++;
   	    }
               string_pos++;       /* skip the ',' */
  -            while (ap_isspace(*string_pos)) {      /* past any more whitespace */
  +            while (apr_isspace(*string_pos)) {      /* past any more whitespace */
                   string_pos++;
   	    }
  -            while (ap_isdigit(*string_pos)) {      /* 2nd number */
  +            while (apr_isdigit(*string_pos)) {      /* 2nd number */
                   string_pos++;
   	    }
               vertex++;
  
  
  
  1.50      +15 -15    apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- mod_include.c	2000/08/02 05:27:16	1.49
  +++ mod_include.c	2000/08/06 06:07:47	1.50
  @@ -329,7 +329,7 @@
   
           /* is it numeric ? */
           if (s[1] == '#') {
  -            for (j = 2, val = 0; j < i && ap_isdigit(s[j]); j++) {
  +            for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) {
                   val = val * 10 + s[j] - '0';
               }
               s += i;
  @@ -382,7 +382,7 @@
   
       do {                        /* skip whitespace */
           GET_CHAR(in, c, NULL, p);
  -    } while (ap_isspace(c));
  +    } while (apr_isspace(c));
   
       /* tags can't start with - */
       if (c == '-') {
  @@ -390,7 +390,7 @@
           if (c == '-') {
               do {
                   GET_CHAR(in, c, NULL, p);
  -            } while (ap_isspace(c));
  +            } while (apr_isspace(c));
               if (c == '>') {
                   apr_cpystrn(tag, "done", tagbuf_len);
                   return tag;
  @@ -405,17 +405,17 @@
               *t = '\0';
               return NULL;
           }
  -        if (c == '=' || ap_isspace(c)) {
  +        if (c == '=' || apr_isspace(c)) {
               break;
           }
  -        *(t++) = ap_tolower(c);
  +        *(t++) = apr_tolower(c);
           GET_CHAR(in, c, NULL, p);
       }
   
       *t++ = '\0';
       tag_val = t;
   
  -    while (ap_isspace(c)) {
  +    while (apr_isspace(c)) {
           GET_CHAR(in, c, NULL, p);       /* space before = */
       }
       if (c != '=') {
  @@ -425,7 +425,7 @@
   
       do {
           GET_CHAR(in, c, NULL, p);       /* space after = */
  -    } while (ap_isspace(c));
  +    } while (apr_isspace(c));
   
       /* we should allow a 'name' as a value */
   
  @@ -470,7 +470,7 @@
       /* skip initial whitespace */
       while (1) {
           GET_CHAR(in, c, 1, p);
  -        if (!ap_isspace(c)) {
  +        if (!apr_isspace(c)) {
               break;
           }
       }
  @@ -479,9 +479,9 @@
   	if (d - dest == (int)len) {
   	    return 1;
   	}
  -        *d++ = ap_tolower(c);
  +        *d++ = apr_tolower(c);
           GET_CHAR(in, c, 1, p);
  -        if (ap_isspace(c)) {
  +        if (apr_isspace(c)) {
               break;
           }
       }
  @@ -544,7 +544,7 @@
   		}
   		else {
   		    start_of_var_name = in;
  -		    while (ap_isalnum(*in) || *in == '_') {
  +		    while (apr_isalnum(*in) || *in == '_') {
   			++in;
   		    }
   		    end_of_var_name = in;
  @@ -1281,7 +1281,7 @@
           return (char *) NULL;
       }
       while ((ch = *string++)) {
  -        if (!ap_isspace(ch)) {
  +        if (!apr_isspace(ch)) {
               break;
           }
       }
  @@ -1370,7 +1370,7 @@
               continue;
           }
           if (!qs) {
  -            if (ap_isspace(ch)) {
  +            if (apr_isspace(ch)) {
                   goto TOKEN_DONE;
               }
               switch (ch) {
  @@ -2179,7 +2179,7 @@
   {
       char tag[MAX_STRING_LEN];
       char *tag_val;
  -    apr_array_header_t *arr = ap_table_elts(r->subprocess_env);
  +    apr_array_header_t *arr = apr_table_elts(r->subprocess_env);
       apr_table_entry_t *elts = (apr_table_entry_t *)arr->elts;
       int i;
   
  @@ -2452,7 +2452,7 @@
   	 * destroyed, that's dealt with in handle_include().
   	 */
   	r->subprocess_env = parent->subprocess_env;
  -	ap_pool_join(parent->pool, r->pool);
  +	apr_pool_join(parent->pool, r->pool);
   	r->finfo.mtime = parent->finfo.mtime;
       }
       else {
  
  
  
  1.32      +5 -4      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_log_config.c	2000/08/02 05:27:16	1.31
  +++ mod_log_config.c	2000/08/06 06:07:47	1.32
  @@ -386,7 +386,7 @@
   
   static const char *log_request_time(request_rec *r, char *a)
   {
  -    ap_exploded_time_t xt;
  +    apr_exploded_time_t xt;
       apr_size_t retcode;
       char tstr[MAX_STRING_LEN];
   
  @@ -423,7 +423,7 @@
   	}
   
           apr_snprintf(tstr, sizeof(tstr), "[%02d/%s/%d:%02d:%02d:%02d %c%.2d%.2d]",
  -                xt.tm_mday, ap_month_snames[xt.tm_mon], xt.tm_year+1900,
  +                xt.tm_mday, apr_month_snames[xt.tm_mon], xt.tm_year+1900,
                   xt.tm_hour, xt.tm_min, xt.tm_sec,
                   sign, timz / (60*60), timz % (60*60));
       }
  @@ -433,7 +433,8 @@
   
   static const char *log_request_duration(request_rec *r, char *a)
   {
  -    return apr_psprintf(r->pool, "%lld", (apr_now() - r->request_time) / AP_USEC_PER_SEC);
  +    return apr_psprintf(r->pool, "%lld", (apr_now() - r->request_time) 
  +                                             / APR_USEC_PER_SEC);
   }
   
   /* These next two routines use the canonical name:port so that log
  @@ -667,7 +668,7 @@
           case '8':
           case '9':
               i = *s - '0';
  -            while (ap_isdigit(*++s)) {
  +            while (apr_isdigit(*++s)) {
                   i = i * 10 + (*s) - '0';
               }
               if (!it->conditions) {
  
  
  
  1.24      +6 -6      apache-2.0/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_mime.c	2000/08/02 05:27:16	1.23
  +++ mod_mime.c	2000/08/06 06:07:47	1.24
  @@ -78,14 +78,14 @@
   
   /* XXXX - fix me / EBCDIC
    *        there was a cludge here which would use its
  - *	  own version ap_isascii(). Indicating that
  + *	  own version apr_isascii(). Indicating that
    *	  on some platforms that might be needed. 
    *
    *	  #define OS_ASC(c) (c)		    -- for mere mortals 
    *     or
    *        #define OS_ASC(c) (ebcdic2ascii[c]) -- for dino's
    *
  - *        #define ap_isascii(c) ((OS_ASC(c) & 0x80) == 0)
  + *        #define apr_isascii(c) ((OS_ASC(c) & 0x80) == 0)
    */
   
   /* XXXXX - fix me - See note with NOT_PROXY 
  @@ -313,7 +313,7 @@
    */
   
   #define MIME_HASHSIZE (32)
  -#define hash(i) (ap_tolower(i) % MIME_HASHSIZE)
  +#define hash(i) (apr_tolower(i) % MIME_HASHSIZE)
   
   static apr_table_t *hash_buckets[MIME_HASHSIZE];
   
  @@ -381,7 +381,7 @@
   {
       int res;
   
  -    res = (ap_isascii(c) && ap_isgraph(c)
  +    res = (apr_isascii(c) && apr_isgraph(c)
   	   && (strchr(tspecial, c) == NULL)) ? 1 : -1;
       return res;
   }
  @@ -390,7 +390,7 @@
   {
       int res;
   
  -    res = (ap_isascii(c) && (c != '"') && (c != '\\') && (c != '\n'))
  +    res = (apr_isascii(c) && (c != '"') && (c != '\\') && (c != '\n'))
   	? 1 : -1;
       return res;
   }
  @@ -402,7 +402,7 @@
   
       if (((s + 1) != NULL) && (*s == '\\')) {
   	c = (int) *(s + 1);
  -	if (ap_isascii(c)) {
  +	if (apr_isascii(c)) {
   	    res = 1;
   	}
       }
  
  
  
  1.26      +28 -28    apache-2.0/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mod_mime_magic.c	2000/08/02 05:27:17	1.25
  +++ mod_mime_magic.c	2000/08/06 06:07:47	1.26
  @@ -728,7 +728,7 @@
   	 frag = frag->next, cur_frag++) {
   	/* loop through the characters in the fragment */
   	for (cur_pos = 0; frag->str[cur_pos]; cur_pos++) {
  -	    if (ap_isspace(frag->str[cur_pos])) {
  +	    if (apr_isspace(frag->str[cur_pos])) {
   		/* process whitespace actions for each state */
   		if (state == rsl_leading_space) {
   		    /* eat whitespace in this state */
  @@ -933,7 +933,7 @@
       magic_rsl_puts(r, MIME_BINARY_UNKNOWN);
   }
   
  -#define    EATAB {while (ap_isspace((unsigned char) *l))  ++l;}
  +#define    EATAB {while (apr_isspace((unsigned char) *l))  ++l;}
   
   /*
    * apprentice - load configuration from the magic file r
  @@ -975,7 +975,7 @@
   
   	/* skip leading whitespace */
   	ws_offset = 0;
  -	while (line[ws_offset] && ap_isspace(line[ws_offset])) {
  +	while (line[ws_offset] && apr_isspace(line[ws_offset])) {
   	    ws_offset++;
   	}
   
  @@ -1018,10 +1018,10 @@
       ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
   		MODNAME ": apprentice test");
       for (m = conf->magic; m; m = m->next) {
  -	if (ap_isprint((((unsigned long) m) >> 24) & 255) &&
  -	    ap_isprint((((unsigned long) m) >> 16) & 255) &&
  -	    ap_isprint((((unsigned long) m) >> 8) & 255) &&
  -	    ap_isprint(((unsigned long) m) & 255)) {
  +	if (apr_isprint((((unsigned long) m) >> 24) & 255) &&
  +	    apr_isprint((((unsigned long) m) >> 16) & 255) &&
  +	    apr_isprint((((unsigned long) m) >> 8) & 255) &&
  +	    apr_isprint(((unsigned long) m) & 255)) {
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
   			MODNAME ": apprentice: POINTER CLOBBERED! "
   			"m=\"%c%c%c%c\" line=%d",
  @@ -1149,7 +1149,7 @@
   	s = l;
   	if (*l == '+' || *l == '-')
   	    l++;
  -	if (ap_isdigit((unsigned char) *l)) {
  +	if (apr_isdigit((unsigned char) *l)) {
   	    m->in.offset = strtol(l, &t, 0);
   	    if (*s == '-')
   		m->in.offset = -m->in.offset;
  @@ -1164,7 +1164,7 @@
       }
   
   
  -    while (ap_isdigit((unsigned char) *l))
  +    while (apr_isdigit((unsigned char) *l))
   	++l;
       EATAB;
   
  @@ -1262,7 +1262,7 @@
   	}
   	/* FALL THROUGH */
       default:
  -	if (*l == 'x' && ap_isspace((unsigned char) l[1])) {
  +	if (*l == 'x' && apr_isspace((unsigned char) l[1])) {
   	    m->reln = *l;
   	    ++l;
   	    goto GetDesc;	/* Bill The Cat */
  @@ -1334,7 +1334,7 @@
       register int val;
   
       while ((c = *s++) != '\0') {
  -	if (ap_isspace((unsigned char) c))
  +	if (apr_isspace((unsigned char) c))
   	    break;
   	if (p >= pmax) {
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  @@ -1437,7 +1437,7 @@
   /* Single hex char to int; -1 if not a hex char. */
   static int hextoint(int c)
   {
  -    if (ap_isdigit((unsigned char) c))
  +    if (apr_isdigit((unsigned char) c))
   	return c - '0';
       if ((c >= 'a') && (c <= 'f'))
   	return c + 10 - 'a';
  @@ -1570,10 +1570,10 @@
   
   #if MIME_MAGIC_DEBUG
       for (m = conf->magic; m; m = m->next) {
  -	if (ap_isprint((((unsigned long) m) >> 24) & 255) &&
  -	    ap_isprint((((unsigned long) m) >> 16) & 255) &&
  -	    ap_isprint((((unsigned long) m) >> 8) & 255) &&
  -	    ap_isprint(((unsigned long) m) & 255)) {
  +	if (apr_isprint((((unsigned long) m) >> 24) & 255) &&
  +	    apr_isprint((((unsigned long) m) >> 16) & 255) &&
  +	    apr_isprint((((unsigned long) m) >> 8) & 255) &&
  +	    apr_isprint(((unsigned long) m) & 255)) {
   	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
   			MODNAME ": match: POINTER CLOBBERED! "
   			"m=\"%c%c%c%c\"",
  @@ -2008,15 +2008,15 @@
       if (*buf == '.') {
   	unsigned char *tp = buf + 1;
   
  -	while (ap_isspace(*tp))
  +	while (apr_isspace(*tp))
   	    ++tp;		/* skip leading whitespace */
  -	if ((ap_isalnum(*tp) || *tp == '\\') &&
  -	     (ap_isalnum(*(tp + 1)) || *tp == '"')) {
  +	if ((apr_isalnum(*tp) || *tp == '\\') &&
  +	     (apr_isalnum(*(tp + 1)) || *tp == '"')) {
   	    magic_rsl_puts(r, "application/x-troff");
   	    return 1;
   	}
       }
  -    if ((*buf == 'c' || *buf == 'C') && ap_isspace(*(buf + 1))) {
  +    if ((*buf == 'c' || *buf == 'C') && apr_isspace(*(buf + 1))) {
   	/* Fortran */
   	magic_rsl_puts(r, "text/plain");
   	return 1;
  @@ -2299,7 +2299,7 @@
   {
       register long value;
   
  -    while (ap_isspace(*where)) {	/* Skip spaces */
  +    while (apr_isspace(*where)) {	/* Skip spaces */
   	where++;
   	if (--digs <= 0)
   	    return -1;		/* All blank field */
  @@ -2310,7 +2310,7 @@
   	--digs;
       }
   
  -    if (digs > 0 && *where && !ap_isspace(*where))
  +    if (digs > 0 && *where && !apr_isspace(*where))
   	return -1;		/* Ended on non-space/nul */
   
       return value;
  @@ -2339,10 +2339,10 @@
   
       /* check for recognized revision suffix */
       suffix_pos = strlen(r->filename) - 1;
  -    if (!ap_isdigit(r->filename[suffix_pos])) {
  +    if (!apr_isdigit(r->filename[suffix_pos])) {
   	return 0;
       }
  -    while (suffix_pos >= 0 && ap_isdigit(r->filename[suffix_pos]))
  +    while (suffix_pos >= 0 && apr_isdigit(r->filename[suffix_pos]))
   	suffix_pos--;
       if (suffix_pos < 0 || r->filename[suffix_pos] != '@') {
   	return 0;
  @@ -2409,10 +2409,10 @@
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
   			MODNAME ": magic_init 1 test");
   	    for (m = conf->magic; m; m = m->next) {
  -		if (ap_isprint((((unsigned long) m) >> 24) & 255) &&
  -		    ap_isprint((((unsigned long) m) >> 16) & 255) &&
  -		    ap_isprint((((unsigned long) m) >> 8) & 255) &&
  -		    ap_isprint(((unsigned long) m) & 255)) {
  +		if (apr_isprint((((unsigned long) m) >> 24) & 255) &&
  +		    apr_isprint((((unsigned long) m) >> 16) & 255) &&
  +		    apr_isprint((((unsigned long) m) >> 8) & 255) &&
  +		    apr_isprint(((unsigned long) m) & 255)) {
   		    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
   				MODNAME ": magic_init 1: POINTER CLOBBERED! "
   				"m=\"%c%c%c%c\" line=%d",
  
  
  
  1.38      +11 -11    apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_negotiation.c	2000/08/02 05:27:17	1.37
  +++ mod_negotiation.c	2000/08/06 06:07:47	1.38
  @@ -372,8 +372,8 @@
   
           /* Look for 'var = value' --- and make sure the var is in lcase. */
   
  -        for (cp = parm; (*cp && !ap_isspace(*cp) && *cp != '='); ++cp) {
  -            *cp = ap_tolower(*cp);
  +        for (cp = parm; (*cp && !apr_isspace(*cp) && *cp != '='); ++cp) {
  +            *cp = apr_tolower(*cp);
           }
   
           if (!*cp) {
  @@ -381,7 +381,7 @@
           }
   
           *cp++ = '\0';           /* Delimit var */
  -        while (*cp && (ap_isspace(*cp) || *cp == '=')) {
  +        while (*cp && (apr_isspace(*cp) || *cp == '=')) {
               ++cp;
           }
   
  @@ -392,7 +392,7 @@
                    end++);
           }
           else {
  -            for (end = cp; (*end && !ap_isspace(*end)); end++);
  +            for (end = cp; (*end && !apr_isspace(*end)); end++);
           }
           if (*end) {
               *end = '\0';        /* strip ending quote or return */
  @@ -559,7 +559,7 @@
           if (strcmp(tok, "trans") == 0 ||
               strcmp(tok, "vlist") == 0 ||
               strcmp(tok, "guess-small") == 0 ||
  -            ap_isdigit(tok[0]) ||
  +            apr_isdigit(tok[0]) ||
               strcmp(tok, "*") == 0) {
   
               /* The user agent supports transparent negotiation */
  @@ -665,7 +665,7 @@
   
       /* If blank, just return it --- this ends information on this variant */
   
  -    for (cp = buffer; (*cp && ap_isspace(*cp)); ++cp) {
  +    for (cp = buffer; (*cp && apr_isspace(*cp)); ++cp) {
           continue;
       }
   
  @@ -686,13 +686,13 @@
                   continue;
               }
           }
  -        else if (ap_isspace(c)) {
  +        else if (apr_isspace(c)) {
               /* Leading whitespace.  POSSIBLE continuation line
                * Also, possibly blank --- if so, we ungetc() the final newline
                * so that we will pick up the blank line the next time 'round.
                */
   
  -            while (c != '\n' && ap_isspace(c)) {
  +            while (c != '\n' && apr_isspace(c)) {
                   if(apr_getc(&c, map) != APR_SUCCESS)
   		    break;
               }
  @@ -761,7 +761,7 @@
       char *cp = header;
   
       for ( ; *cp && *cp != ':' ; ++cp) {
  -        *cp = ap_tolower(*cp);
  +        *cp = apr_tolower(*cp);
       }
   
       if (!*cp) {
  @@ -772,7 +772,7 @@
   
       do {
           ++cp;
  -    } while (*cp && ap_isspace(*cp));
  +    } while (*cp && apr_isspace(*cp));
   
       if (!*cp) {
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  @@ -2648,7 +2648,7 @@
        * some values in this request will be allocated in r->pool, and others in
        * sub_req->pool.
        */
  -    ap_pool_join(r->pool, sub_req->pool);
  +    apr_pool_join(r->pool, sub_req->pool);
       r->mtime = 0; /* reset etag info for subrequest */
       r->filename = sub_req->filename;
       r->handler = sub_req->handler;
  
  
  
  1.38      +6 -6      apache-2.0/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_rewrite.c	2000/08/03 03:09:31	1.37
  +++ mod_rewrite.c	2000/08/06 06:07:47	1.38
  @@ -891,7 +891,7 @@
               else if (strcasecmp(val, "seeother") == 0) {
                   status = HTTP_SEE_OTHER;
               }
  -            else if (ap_isdigit(*val)) {
  +            else if (apr_isdigit(*val)) {
                   status = atoi(val);
               }
               if (!ap_is_HTTP_REDIRECT(status)) {
  @@ -3064,7 +3064,7 @@
   
       for (cp = value = apr_pstrdup(r->pool, key); cp != NULL && *cp != '\0';
            cp++) {
  -        *cp = ap_toupper(*cp);
  +        *cp = apr_toupper(*cp);
       }
       return value;
   }
  @@ -3075,7 +3075,7 @@
   
       for (cp = value = apr_pstrdup(r->pool, key); cp != NULL && *cp != '\0';
            cp++) {
  -        *cp = ap_tolower(*cp);
  +        *cp = apr_tolower(*cp);
       }
       return value;
   }
  @@ -3300,7 +3300,7 @@
   
   static char *current_logtime(request_rec *r)
   {
  -    ap_exploded_time_t t;
  +    apr_exploded_time_t t;
       char tstr[80];
       apr_size_t len;
   
  @@ -3535,7 +3535,7 @@
   {
       const char *result;
       char resultbuf[LONG_STRING_LEN];
  -    ap_exploded_time_t tm;
  +    apr_exploded_time_t tm;
       request_rec *rsub;
   #ifndef WIN32
       struct passwd *pw;
  @@ -3781,7 +3781,7 @@
       apr_table_entry_t *hdrs;
       int i;
   
  -    hdrs_arr = ap_table_elts(r->headers_in);
  +    hdrs_arr = apr_table_elts(r->headers_in);
       hdrs = (apr_table_entry_t *)hdrs_arr->elts;
       for (i = 0; i < hdrs_arr->nelts; ++i) {
           if (hdrs[i].key == NULL) {
  
  
  
  1.18      +1 -1      apache-2.0/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_setenvif.c	2000/08/02 05:27:17	1.17
  +++ mod_setenvif.c	2000/08/06 06:07:47	1.18
  @@ -435,7 +435,7 @@
           }
   
           if (!ap_regexec(b->preg, val, 0, NULL, 0)) {
  -	    apr_array_header_t *arr = ap_table_elts(b->features);
  +	    apr_array_header_t *arr = apr_table_elts(b->features);
               elts = (apr_table_entry_t *) arr->elts;
   
               for (j = 0; j < arr->nelts; ++j) {
  
  
  
  1.19      +3 -3      apache-2.0/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_speling.c	2000/08/02 05:27:17	1.18
  +++ mod_speling.c	2000/08/06 06:07:48	1.19
  @@ -197,15 +197,15 @@
   
   static sp_reason spdist(const char *s, const char *t)
   {
  -    for (; ap_tolower(*s) == ap_tolower(*t); t++, s++) {
  +    for (; apr_tolower(*s) == apr_tolower(*t); t++, s++) {
           if (*t == '\0') {
               return SP_MISCAPITALIZED;   /* exact match (sans case) */
   	}
       }
       if (*s) {
           if (*t) {
  -            if (s[1] && t[1] && ap_tolower(*s) == ap_tolower(t[1])
  -		&& ap_tolower(*t) == ap_tolower(s[1])
  +            if (s[1] && t[1] && apr_tolower(*s) == apr_tolower(t[1])
  +		&& apr_tolower(*t) == apr_tolower(s[1])
   		&& strcasecmp(s + 2, t + 2) == 0) {
                   return SP_TRANSPOSITION;        /* transposition */
   	    }
  
  
  
  1.18      +2 -2      apache-2.0/src/modules/standard/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_unique_id.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_unique_id.c	2000/08/02 05:27:18	1.17
  +++ mod_unique_id.c	2000/08/06 06:07:48	1.18
  @@ -244,7 +244,7 @@
        * But protecting against it is relatively cheap.  We just sleep into the
        * next second.
        */
  -    pause = (apr_interval_time_t)(1000000 - (apr_now() % AP_USEC_PER_SEC));
  +    pause = (apr_interval_time_t)(1000000 - (apr_now() % APR_USEC_PER_SEC));
       apr_sleep(pause);
   }
   
  @@ -287,7 +287,7 @@
       /* Some systems have very low variance on the low end of their system
        * counter, defend against that.
        */
  -    cur_unique_id.counter = tv % AP_USEC_PER_SEC / 10;
  +    cur_unique_id.counter = tv % APR_USEC_PER_SEC / 10;
   
       /*
        * We must always use network ordering for these bytes, so that
  
  
  
  1.19      +6 -6      apache-2.0/src/modules/standard/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_usertrack.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_usertrack.c	2000/08/02 05:27:18	1.18
  +++ mod_usertrack.c	2000/08/06 06:07:48	1.19
  @@ -140,15 +140,15 @@
       apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%qd", rname, apr_now());
   
       if (cls->expires) {
  -	ap_exploded_time_t tms;
  +	apr_exploded_time_t tms;
   
  -	apr_explode_gmt(&tms, r->request_time + cls->expires * AP_USEC_PER_SEC);
  +	apr_explode_gmt(&tms, r->request_time + cls->expires * APR_USEC_PER_SEC);
   
           /* Cookie with date; as strftime '%a, %d-%h-%y %H:%M:%S GMT' */
           new_cookie = apr_psprintf(r->pool,
                   "%s=%s; path=/; expires=%s, %.2d-%s-%.2d %.2d:%.2d:%.2d GMT",
  -                    dcfg->cookie_name, cookiebuf, ap_day_snames[tms.tm_wday],
  -                    tms.tm_mday, ap_month_snames[tms.tm_mon],
  +                    dcfg->cookie_name, cookiebuf, apr_day_snames[tms.tm_wday],
  +                    tms.tm_mday, apr_month_snames[tms.tm_mon],
                       tms.tm_year % 100,
                       tms.tm_hour, tms.tm_min, tms.tm_sec);
       }
  @@ -229,7 +229,7 @@
       char *word;
   
       /* The simple case first - all numbers (we assume) */
  -    if (ap_isdigit(arg[0]) && ap_isdigit(arg[strlen(arg) - 1])) {
  +    if (apr_isdigit(arg[0]) && apr_isdigit(arg[strlen(arg) - 1])) {
           cls->expires = atol(arg);
           return NULL;
       }
  @@ -248,7 +248,7 @@
       /* {<num> <type>}* */
       while (word[0]) {
           /* <num> */
  -	if (ap_isdigit(word[0]))
  +	if (apr_isdigit(word[0]))
               num = atoi(word);
           else
               return "bad expires code, numeric value expected.";
  
  
  
  1.14      +4 -4      apache-2.0/src/modules/standard/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_vhost_alias.c	2000/08/06 02:13:15	1.13
  +++ mod_vhost_alias.c	2000/08/06 06:07:48	1.14
  @@ -212,7 +212,7 @@
   	    ++p;
   	}
   	/* digit N */
  -	if (ap_isdigit(*p)) {
  +	if (apr_isdigit(*p)) {
   	    ++p;
   	}
   	else {
  @@ -232,7 +232,7 @@
   	    ++p;
   	}
   	/* digit M */
  -	if (ap_isdigit(*p)) {
  +	if (apr_isdigit(*p)) {
   	    ++p;
   	}
   	else {
  @@ -270,7 +270,7 @@
    * This really wants to be a nested function
    * but C is too feeble to support them.
    */
  -static ap_inline void vhost_alias_checkspace(request_rec *r, char *buf,
  +static apr_inline void vhost_alias_checkspace(request_rec *r, char *buf,
   					     char **pdest, int size)
   {
       /* XXX: what if size > HUGE_STRING_LEN? */
  @@ -399,7 +399,7 @@
   	}
   	vhost_alias_checkspace(r, buf, &dest, end - start);
   	for (p = start; p < end; ++p) {
  -	    *dest++ = ap_tolower(*p);
  +	    *dest++ = apr_tolower(*p);
   	}
       }
       *dest = '\0';
  
  
  
  1.8       +1 -1      apache-2.0/src/os/bs2000/bs2login.c
  
  Index: bs2login.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/bs2000/bs2login.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- bs2login.c	2000/08/02 05:27:26	1.7
  +++ bs2login.c	2000/08/06 06:07:51	1.8
  @@ -93,7 +93,7 @@
   static void ap_str_toupper(char *str)
   {
       while (*str) {
  -	*str = ap_toupper(*str);
  +	*str = apr_toupper(*str);
   	++str;
       }
   }
  
  
  
  1.5       +1 -1      apache-2.0/src/os/bs2000/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/bs2000/os.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.h	2000/03/31 09:17:10	1.4
  +++ os.h	2000/08/06 06:07:51	1.5
  @@ -71,7 +71,7 @@
   /* Compiler supports inline, so include the inlineable functions as
    * part of the header
    */
  -#define INLINE extern ap_inline
  +#define INLINE extern apr_inline
   
   INLINE int ap_os_is_path_absolute(const char *file);
   
  
  
  
  1.9       +1 -1      apache-2.0/src/os/tpf/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/tpf/os.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- os.c	2000/08/02 05:27:28	1.8
  +++ os.c	2000/08/06 06:07:52	1.9
  @@ -223,7 +223,7 @@
      int                      fd_flags_out, fd_flags_in, fd_flags_err;
      struct tpf_fork_input    fork_input;
      TPF_FORK_CHILD           *cld = (TPF_FORK_CHILD *) data;
  -   apr_array_header_t             *env_arr = ap_table_elts ((array_header *) cld->subprocess_env);
  +   apr_array_header_t       *env_arr = apr_table_elts ((array_header *) cld->subprocess_env);
      table_entry              *elts = (table_entry *) env_arr->elts;
   
   
  
  
  
  1.5       +1 -1      apache-2.0/src/os/tpf/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/tpf/os.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.h	2000/03/31 09:17:15	1.4
  +++ os.h	2000/08/06 06:07:52	1.5
  @@ -77,7 +77,7 @@
   /* Compiler supports inline, so include the inlineable functions as
    * part of the header
    */
  -#define INLINE extern ap_inline
  +#define INLINE extern apr_inline
   #include "os-inline.c"
   #endif
   
  
  
  
  1.11      +1 -1      apache-2.0/src/os/unix/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/os.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- os.h	2000/05/15 23:02:57	1.10
  +++ os.h	2000/08/06 06:07:52	1.11
  @@ -75,7 +75,7 @@
   /* Compiler supports inline, so include the inlineable functions as
    * part of the header
    */
  -#define INLINE extern ap_inline
  +#define INLINE extern apr_inline
   
   INLINE int ap_os_is_path_absolute(const char *file);
   
  
  
  
  1.2       +1 -1      apache-2.0/src/os/win32/apache.ico
  
  	<<Binary file>>
  
  
  1.20      +10 -10    apache-2.0/src/os/win32/main_win32.c
  
  Index: main_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- main_win32.c	2000/08/02 05:27:29	1.19
  +++ main_win32.c	2000/08/06 06:07:53	1.20
  @@ -327,7 +327,7 @@
       while (apr_getopt(argc, argv, "n:k:iuC:c:d:f:vVlLth?", &c, pwincmd) == APR_SUCCESS) {
           switch (c) {
           case 'k':
  -            signal = ap_optarg;
  +            signal = apr_optarg;
               break;
           case 'i':
               install = TRUE;
  @@ -336,25 +336,25 @@
               uninstall = TRUE;
               break;
           case 'n':
  -            service_name = apr_pstrdup(pwincmd, ap_optarg);
  -            if (isValidService(pwincmd, ap_optarg)) {
  -                ap_registry_get_service_conf(pwincmd, &server_confname, ap_optarg);
  +            service_name = apr_pstrdup(pwincmd, apr_optarg);
  +            if (isValidService(pwincmd, apr_optarg)) {
  +                ap_registry_get_service_conf(pwincmd, &server_confname, apr_optarg);
               }
               break;
           case 'f':
  -            server_confname = ap_optarg; 
  +            server_confname = apr_optarg; 
               break;    
           case 'd':
  -            server_root = ap_os_canonical_filename(pwincmd, ap_optarg);
  +            server_root = ap_os_canonical_filename(pwincmd, apr_optarg);
               break;
           default:
               new = (char **) apr_push_array(cmdtbl);
               ch = apr_pstrndup(pwincmd, (char*)&c, 1);
               *new = apr_pstrcat(pwincmd,"-", ch, NULL);
               new_argc++;
  -            if (ap_optarg) {
  +            if (apr_optarg) {
                   new = (char **) apr_push_array(cmdtbl);
  -                *new = ap_optarg;
  +                *new = apr_optarg;
                   new_argc++;
               }
               break;
  @@ -364,8 +364,8 @@
       /* Set optreset and optind to allow apr_getopt to work correctly
        * when called from http_main.c
        */
  -    ap_optreset = 1;
  -    ap_optind = 1;
  +    apr_optreset = 1;
  +    apr_optind = 1;
   
       /* Determine server_confname. 
        * server_confname is found in this order:
  
  
  
  1.17      +2 -2      apache-2.0/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/mod_isapi.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_isapi.c	2000/08/02 05:27:29	1.16
  +++ mod_isapi.c	2000/08/06 06:07:53	1.17
  @@ -534,7 +534,7 @@
           }
   
           *value++ = '\0';
  -        while (*value && ap_isspace(*value)) ++value;
  +        while (*value && apr_isspace(*value)) ++value;
   
           /* Check all the special-case headers. Similar to what
            * ap_scan_script_header_err() does (see that function for
  @@ -546,7 +546,7 @@
               /* Nuke trailing whitespace */    
               char *tmp;
               char *endp = value + strlen(value) - 1;
  -            while (endp > value && ap_isspace(*endp)) 
  +            while (endp > value && apr_isspace(*endp)) 
                   *endp-- = '\0';
   
               tmp = apr_pstrdup (r->pool, value);
  
  
  
  1.22      +26 -26    apache-2.0/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ab.c	2000/08/02 05:27:36	1.21
  +++ ab.c	2000/08/06 06:07:53	1.22
  @@ -190,7 +190,7 @@
           			 * authentification */
        hdrs[4096];        	/* optional arbitrary headers */
   int port = 80;        		/* port number */
  -time_t aprtimeout = 30 * AP_USEC_PER_SEC; /* timeout value */
  +time_t aprtimeout = 30 * APR_USEC_PER_SEC; /* timeout value */
   
   int use_html = 0;        	/* use html in the report */
   char *tablestring;
  @@ -259,7 +259,7 @@
   {
       apr_ssize_t len = reqlen;
       c->connect = apr_now();
  -    apr_setsocketopt(c->aprsock, APR_SO_TIMEOUT, 30 * AP_USEC_PER_SEC);
  +    apr_setsocketopt(c->aprsock, APR_SO_TIMEOUT, 30 * APR_USEC_PER_SEC);
       if (apr_send(c->aprsock, request, &reqlen) != APR_SUCCESS ||
           reqlen != len) {
           printf("Send request failed!\n");
  @@ -815,12 +815,12 @@
   
           /* check for time limit expiry */
           now = apr_now();
  -        timed = (now - start) / AP_USEC_PER_SEC;
  +        timed = (now - start) / APR_USEC_PER_SEC;
           if (tlimit && timed > (tlimit * 1000)) {
               requests = done;   /* so stats are correct */
           }
           /* Timeout of 30 seconds. */
  -        timeout = 30 * AP_USEC_PER_SEC;
  +        timeout = 30 * APR_USEC_PER_SEC;
   
           n = concurrency;
           status = apr_poll(readbits, &n, timeout);
  @@ -862,14 +862,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.21 $> apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.22 $> apache-2.0");
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
           printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
           printf("\n");
       }
       else {
           printf("<p>\n");
  -        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.21 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.22 $");
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
           printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
  @@ -1006,11 +1006,11 @@
       }
   #endif
   
  -    ap_optind = 1;
  +    apr_optind = 1;
       while (apr_getopt(argc, argv, "n:c:t:T:p:v:kVhwix:y:z:C:H:P:A:", &c, cntxt) == APR_SUCCESS) {
           switch (c) {
           case 'n':
  -            requests = atoi(ap_optarg);
  +            requests = atoi(apr_optarg);
               if (!requests) {
                  err("Invalid number of requests\n");
               }
  @@ -1019,7 +1019,7 @@
               keepalive = 1;
               break;
           case 'c':
  -            concurrency = atoi(ap_optarg);
  +            concurrency = atoi(apr_optarg);
               break;
           case 'i':
               if (posting == 1)
  @@ -1030,7 +1030,7 @@
               if (posting != 0)
                   err("Cannot mix POST and HEAD\n");
   
  -            if (0 == (r = open_postfile(ap_optarg))) {
  +            if (0 == (r = open_postfile(apr_optarg))) {
                  posting = 1;
               }
               else if (postdata) {
  @@ -1038,27 +1038,27 @@
               }
               break;
           case 'v':
  -            verbosity = atoi(ap_optarg);
  +            verbosity = atoi(apr_optarg);
               break;
           case 't':
  -            tlimit = atoi(ap_optarg);
  +            tlimit = atoi(apr_optarg);
               requests = MAX_REQUESTS;  /* need to size data array on something */
               break;
           case 'T':
  -            strcpy(content_type, ap_optarg);
  +            strcpy(content_type, apr_optarg);
               break;
           case 'C':
               strncat(cookie, "Cookie: ", sizeof(cookie));
  -            strncat(cookie, ap_optarg, sizeof(cookie));
  +            strncat(cookie, apr_optarg, sizeof(cookie));
               strncat(cookie, "\r\n", sizeof(cookie));
               break;
           case 'A':
               /* assume username passwd already to be in colon separated form. 
                * Ready to be uu-encoded.
                */
  -            while(isspace(*ap_optarg))
  -                ap_optarg++;
  -            l=ap_base64encode(tmp, ap_optarg, strlen(ap_optarg));
  +            while(isspace(*apr_optarg))
  +                apr_optarg++;
  +            l=ap_base64encode(tmp, apr_optarg, strlen(apr_optarg));
               tmp[l]='\0';
    
               strncat(auth, "Authorization: basic ", sizeof(auth));
  @@ -1069,9 +1069,9 @@
               /*
                * assume username passwd already to be in colon separated form.
                */
  -            while(isspace(*ap_optarg))
  -                ap_optarg++;
  -            l=ap_base64encode(tmp, ap_optarg, strlen(ap_optarg));
  +            while(isspace(*apr_optarg))
  +                apr_optarg++;
  +            l=ap_base64encode(tmp, apr_optarg, strlen(apr_optarg));
               tmp[l]='\0';
    
               strncat(auth, "Proxy-Authorization: basic ", sizeof(auth));
  @@ -1079,7 +1079,7 @@
               strncat(auth, "\r\n", sizeof(auth));
               break;
           case 'H':
  -            strncat(hdrs, ap_optarg, sizeof(hdrs));
  +            strncat(hdrs, apr_optarg, sizeof(hdrs));
               strncat(hdrs, "\r\n", sizeof(hdrs));
               break;
   	case 'w':
  @@ -1091,15 +1091,15 @@
   	     */
   	case 'x':
   	    use_html = 1;
  -	    tablestring = ap_optarg;
  +	    tablestring = apr_optarg;
   	    break;
   	case 'y':
   	    use_html = 1;
  -	    trstring = ap_optarg;
  +	    trstring = apr_optarg;
   	    break;
   	case 'z':
   	    use_html = 1;
  -	    tdstring = ap_optarg;
  +	    tdstring = apr_optarg;
   	    break;
   	case 'h':
   	    usage(argv[0]);
  @@ -1110,12 +1110,12 @@
           }
       }
   
  -    if (ap_optind != argc - 1) {
  +    if (apr_optind != argc - 1) {
           fprintf(stderr, "%s: wrong number of arguments\n", argv[0]);
           usage(argv[0]);
       }
   
  -    if (parse_url(argv[ap_optind++])) {
  +    if (parse_url(argv[apr_optind++])) {
           fprintf(stderr, "%s: invalid URL\n", argv[0]);
           usage(argv[0]);
       }
  
  
  
  1.11      +1 -1      apache-2.0/src/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- htdigest.c	2000/08/02 05:27:37	1.10
  +++ htdigest.c	2000/08/06 06:07:53	1.11
  @@ -157,7 +157,7 @@
   static void add_password(char *user, char *realm, apr_file_t *f)
   {
       char *pw;
  -    ap_md5_ctx_t context;
  +    apr_md5_ctx_t context;
       unsigned char digest[16];
       char string[MAX_STRING_LEN];
       char pwin[MAX_STRING_LEN];
  
  
  

Mime
View raw message