prefix libapr functions and types with apr_

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 81 insertions, 81 deletions

diff --git a/os/beos/beosd.c b/os/beos/beosd.c
index 5cadf5a247..e86314b82e 100644
--- a/os/beos/beosd.c
+++ b/os/beos/beosd.c
@@ -85,7 +85,7 @@ void beosd_detach(void)
         char buf[120];
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                      "%s: unable to replace stdin with /dev/null: %s",
-		ap_server_argv0, ap_strerror(errno, buf, sizeof(buf)));
+		ap_server_argv0, apr_strerror(errno, buf, sizeof(buf)));
 	/* continue anyhow -- note we can't close out descriptor 0 because we
 	 * have nothing to replace it with, and if we didn't have a descriptor
 	 * 0 the next file would be created with that value ... leading to
@@ -96,7 +96,7 @@ void beosd_detach(void)
         char buf[120];
 	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                      "%s: unable to replace stdout with /dev/null: %s",
-		ap_server_argv0, ap_strerror(errno, buf, sizeof(buf)));
+		ap_server_argv0, apr_strerror(errno, buf, sizeof(buf)));
     }
     /* stderr is a tricky one, we really want it to be the error_log,
      * but we haven't opened that yet.  So leave it alone for now and it'll
diff --git a/os/bs2000/bs2login.c b/os/bs2000/bs2login.c
index 38ef902747..8edad89ef2 100644
--- a/os/bs2000/bs2login.c
+++ b/os/bs2000/bs2login.c
@@ -169,11 +169,11 @@ static bs2_ForkType os_forktype(void)
 
 /* This routine is called by http_core for the BS2000Account directive */
 /* It stores the account name for later use */
-const char *os_set_account(ap_pool_t *p, const char *account)
+const char *os_set_account(apr_pool_t *p, const char *account)
 {
     char account_temp[ACCT_LEN+1];
 
-    ap_cpystrn(account_temp, account, sizeof account_temp);
+    apr_cpystrn(account_temp, account, sizeof account_temp);
 
     /* Make account all upper case */
     ap_str_toupper(account_temp);
@@ -181,7 +181,7 @@ const char *os_set_account(ap_pool_t *p, const char *account)
     /* Pad to length 8 */
     ap_pad(account_temp, sizeof account_temp, ' ');
 
-    bs2000_account = ap_pstrdup(p, account_temp);
+    bs2000_account = apr_pstrdup(p, account_temp);
     return NULL;
 }
 
@@ -226,7 +226,7 @@ int os_init_job_environment(server_rec *server, const char *user_name, int one_p
 	exit(APEXIT_CHILDFATAL);
     }
 
-    ap_cpystrn(username, user_name, sizeof username);
+    apr_cpystrn(username, user_name, sizeof username);
 
     /* Make user name all upper case */
     ap_str_toupper(username);
@@ -269,7 +269,7 @@ pid_t os_fork(const char *user)
 	break;
 
       case bs2_UFORK:
-	ap_cpystrn(username, user, sizeof username);
+	apr_cpystrn(username, user, sizeof username);
 
 	/* Make user name all upper case - for some versions of ufork() */
 	ap_str_toupper(username);
diff --git a/os/bs2000/ebcdic.c b/os/bs2000/ebcdic.c
index 82bb52a60b..70b6f15014 100644
--- a/os/bs2000/ebcdic.c
+++ b/os/bs2000/ebcdic.c
@@ -67,7 +67,7 @@ Within the POSIX subsystem, the same character set was chosen as in
 "native BS2000", namely EBCDIC.
 
 EBCDIC Table. (Yes, in EBCDIC, the letters 'a'..'z' are not contiguous!)
-This ap_table_t is bijective, i.e. there are no ambigous or duplicate characters
+This apr_table_t is bijective, i.e. there are no ambigous or duplicate characters
 00    00 01 02 03 85 09 86 7f  87 8d 8e 0b 0c 0d 0e 0f  *................*
 10    10 11 12 13 8f 0a 08 97  18 19 9c 9d 1c 1d 1e 1f  *................*
 20    80 81 82 83 84 92 17 1b  88 89 8a 8b 8c 05 06 07  *................*
@@ -122,17 +122,17 @@ const unsigned char os_toascii_strictly[256] = {
        0x38, 0x39, 0xb3, 0x7b, 0xdc, 0x7d, 0xda, 0x7e  /*0123456789.{.}.~*/
 };
 
-/* This ap_table_t is (almost) identical to the previous one. The only difference
+/* This apr_table_t is (almost) identical to the previous one. The only difference
  * is the fact that it maps every EBCDIC *except 0x0A* to its ASCII
- * equivalent. The reason for this ap_table_t is simple: Throughout the
+ * equivalent. The reason for this apr_table_t is simple: Throughout the
  * server, protocol strings are used in the form
  *  "Content-Type: text/plain\015\012". Now all the characters in the string
  * are stored as EBCDIC, only the semantics of \012 is completely
- * different from LF (look it up in the ap_table_t above). \015 happens to be
+ * different from LF (look it up in the apr_table_t above). \015 happens to be
  * mapped to \015 anyway, so there's no special case for it.
  * 
  * In THIS table, EBCDIC-\012 is mapped to ASCII-\012.
- * This ap_table_t is therefore used wherever an EBCDIC to ASCII conversion is
+ * This apr_table_t is therefore used wherever an EBCDIC to ASCII conversion is
  * needed in the server.
  */
 /* ebcdic-to-ascii with \012 mapped to ASCII-\n */
diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index 591d96414c..2ad3a49669 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -89,7 +89,7 @@ int ap_checkconv(struct request_rec *r)
 		 strncasecmp(type, "message/", 8) == 0)) {
 	if (strncasecmp(type, ASCIITEXT_MAGIC_TYPE_PREFIX,
 			sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1) == 0)
-	    r->content_type = ap_pstrcat(r->pool, "text/",
+	    r->content_type = apr_pstrcat(r->pool, "text/",
 					 type+sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1,
 					 NULL);
         else
diff --git a/os/os2/os.h b/os/os2/os.h
index db354dccb6..e67f072de7 100644
--- a/os/os2/os.h
+++ b/os/os2/os.h
@@ -89,9 +89,9 @@ INLINE int ap_os_is_path_absolute(const char *file);
 extern int ap_os_is_path_absolute(const char *file);
 #endif
 
-char *ap_os_canonical_filename(ap_pool_t *p, const char *file);
-char *ap_os_case_canonical_filename(ap_pool_t *p, const char *szFile);
-char *ap_os_systemcase_filename(ap_pool_t *p, const char *szFile);
+char *ap_os_canonical_filename(apr_pool_t *p, const char *file);
+char *ap_os_case_canonical_filename(apr_pool_t *p, const char *szFile);
+char *ap_os_systemcase_filename(apr_pool_t *p, const char *szFile);
 /* FIXME: the following should be implemented on this platform */
 #define ap_os_is_filename_valid(f)         (1)
 
diff --git a/os/os2/util_os2.c b/os/os2/util_os2.c
index 1f813e7de4..3fbae4bf66 100644
--- a/os/os2/util_os2.c
+++ b/os/os2/util_os2.c
@@ -69,7 +69,7 @@
 #include <string.h>
 
 
-API_EXPORT(char *)ap_os_case_canonical_filename(ap_pool_t *pPool, const char *szFile)
+API_EXPORT(char *)ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile)
 {
     char buf[HUGE_STRING_LEN];
     char buf2[HUGE_STRING_LEN];
@@ -88,9 +88,9 @@ API_EXPORT(char *)ap_os_case_canonical_filename(ap_pool_t *pPool, const char *sz
     if (rc) {
         if ( rc != ERROR_INVALID_NAME ) {
             ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL, "OS/2 error %d for file %s", rc, szFile);
-            return ap_pstrdup(pPool, "");
+            return apr_pstrdup(pPool, "");
         } else {
-            return ap_pstrdup(pPool, szFile);
+            return apr_pstrdup(pPool, szFile);
         }
     }
 
@@ -99,7 +99,7 @@ API_EXPORT(char *)ap_os_case_canonical_filename(ap_pool_t *pPool, const char *sz
         if (*pos == '\\')
             *pos = '/';
     
-    return ap_pstrdup(pPool, buf2);
+    return apr_pstrdup(pPool, buf2);
 }
 
 
@@ -119,7 +119,7 @@ static void fix_component(char *path, char *lastcomp)
 
 
 
-char *ap_os_systemcase_canonical_filename(ap_pool_t *pPool, const char *szFile)
+char *ap_os_systemcase_canonical_filename(apr_pool_t *pPool, const char *szFile)
 {
     char *szCanonicalFile = ap_os_case_canonical_filename(pPool, szFile);
     int startslash = 2, slashnum=0;
@@ -149,7 +149,7 @@ char *ap_os_systemcase_canonical_filename(ap_pool_t *pPool, const char *szFile)
 
 
 
-char *ap_os_canonical_filename(ap_pool_t *pPool, const char *szFile)
+char *ap_os_canonical_filename(apr_pool_t *pPool, const char *szFile)
 {
     char *szCanonicalFile = ap_os_systemcase_canonical_filename(pPool, szFile);
     strlwr(szCanonicalFile);
diff --git a/os/tpf/ebcdic.c b/os/tpf/ebcdic.c
index 0fad41ebc8..c266f644a2 100644
--- a/os/tpf/ebcdic.c
+++ b/os/tpf/ebcdic.c
@@ -67,7 +67,7 @@ the BS2000 (apache/src/os/bs2000/ebcdic.c).
 
 /*
 Bijective EBCDIC (character set IBM-1047) to US-ASCII table:
-This ap_table_t is bijective - there are no ambigous or duplicate characters.
+This apr_table_t is bijective - there are no ambigous or duplicate characters.
 */
 const unsigned char os_toascii_strictly[256] = {
     0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f:           */
@@ -106,7 +106,7 @@ const unsigned char os_toascii_strictly[256] = {
 
 /*
 Server EBCDIC (character set IBM-1047) to US-ASCII table:
-This ap_table_t is a copy of the os_toascii_strictly bijective ap_table_t above.
+This apr_table_t is a copy of the os_toascii_strictly bijective apr_table_t above.
 The only change is that hex 0a (\012 octal) is mapped to hex 0a
 (ASCII's line feed) instead of hex 8e.  This is done because throughout
 Apache, protocol string definitions hardcode the linefeed as \012 (octal):
@@ -150,7 +150,7 @@ const unsigned char os_toascii[256] = {
 
 /*
 The US-ASCII to EBCDIC (character set IBM-1047) table:
-This ap_table_t is bijective (no ambiguous or duplicate characters)
+This apr_table_t is bijective (no ambiguous or duplicate characters)
 */
 const unsigned char os_toebcdic[256] = {
     0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, /* 00-0f:           */
diff --git a/os/tpf/os.c b/os/tpf/os.c
index 246b0a4f06..d48d2432db 100644
--- a/os/tpf/os.c
+++ b/os/tpf/os.c
@@ -94,7 +94,7 @@ int ap_checkconv(struct request_rec *r)
 		 strncasecmp(type, "message/", 8) == 0)) {
 	if (strncasecmp(type, ASCIITEXT_MAGIC_TYPE_PREFIX,
                         sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1) == 0){
-	    r->content_type = ap_pstrcat(r->pool, "text/",
+	    r->content_type = apr_pstrcat(r->pool, "text/",
                    type+sizeof(ASCIITEXT_MAGIC_TYPE_PREFIX)-1, NULL);
             if (r->method_number == M_PUT)
                    ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, 0);
@@ -212,7 +212,7 @@ int execvp(const char *file, char *const argv[])
 
 
 
-int ap_tpf_spawn_child(ap_pool_t *p, int (*func) (void *, child_info *),
+int ap_tpf_spawn_child(apr_pool_t *p, int (*func) (void *, child_info *),
                        void *data, enum kill_conditions kill_how,
                        int *pipe_in, int *pipe_out, int *pipe_err,
                        int out_fds[], int in_fds[], int err_fds[])
@@ -223,7 +223,7 @@ int ap_tpf_spawn_child(ap_pool_t *p, int (*func) (void *, child_info *),
    int                      fd_flags_out, fd_flags_in, fd_flags_err;
    struct tpf_fork_input    fork_input;
    TPF_FORK_CHILD           *cld = (TPF_FORK_CHILD *) data;
-   ap_array_header_t             *env_arr = ap_table_elts ((array_header *) cld->subprocess_env);
+   apr_array_header_t             *env_arr = ap_table_elts ((array_header *) cld->subprocess_env);
    table_entry              *elts = (table_entry *) env_arr->elts;
 
 
@@ -323,7 +323,7 @@ int ap_tpf_spawn_child(ap_pool_t *p, int (*func) (void *, child_info *),
 
    if (pid) {
 
-       ap_note_subprocess(p, pid, kill_how);
+       apr_note_subprocess(p, pid, kill_how);
 
        if (pipe_out) {
           *pipe_out = out_fds[0];
@@ -396,7 +396,7 @@ int os_check_server(char *server) {
     return 0;
 }
 
-void os_note_additional_cleanups(ap_pool_t *p, int sd) {
+void os_note_additional_cleanups(apr_pool_t *p, int sd) {
     char sockfilename[50];
     /* write the socket to file so that TPF socket device driver will close socket in case
        we happen to abend. */
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 0253fda0d4..15081f0d5b 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -349,7 +349,7 @@ API_EXPORT(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
     rlim_t cur = 0;
     rlim_t max = 0;
 
-    *plimit = (struct rlimit *)ap_pcalloc(cmd->pool, sizeof(**plimit));
+    *plimit = (struct rlimit *)apr_pcalloc(cmd->pool, sizeof(**plimit));
     limit = *plimit;
     if ((getrlimit(type, limit)) != 0)  {
         *plimit = NULL;
diff --git a/os/win32/mod_isapi.c b/os/win32/mod_isapi.c
index 592643c452..e61cb476af 100644
--- a/os/win32/mod_isapi.c
+++ b/os/win32/mod_isapi.c
@@ -144,12 +144,12 @@ typedef struct {
     PFN_HSE_IO_COMPLETION completion;
     PVOID  completion_arg;
     HANDLE complete;
-    ap_status_t retval;
+    apr_status_t retval;
 } isapi_cid;
 
-ap_status_t isapi_handler (request_rec *r)
+apr_status_t isapi_handler (request_rec *r)
 {
-    ap_table_t *e = r->subprocess_env;
+    apr_table_t *e = r->subprocess_env;
     isapi_loaded *isa;
     isapi_cid *cid;
 
@@ -177,8 +177,8 @@ ap_status_t isapi_handler (request_rec *r)
      * should only be performed on the first isapi dll invocation, 
      * not with every HttpExtensionProc()
      */
-    isa = ap_pcalloc(r->pool, sizeof(isapi_module));
-    isa->pVer = ap_pcalloc(r->pool, sizeof(HSE_VERSION_INFO));
+    isa = apr_pcalloc(r->pool, sizeof(isapi_module));
+    isa->pVer = apr_pcalloc(r->pool, sizeof(HSE_VERSION_INFO));
     isa->refcount = 0;
 
     /* TODO: These may need to become overrideable, so that we
@@ -239,8 +239,8 @@ ap_status_t isapi_handler (request_rec *r)
     ap_add_cgi_vars(r);
 
     /* Set up connection structure and ecb */
-    cid = ap_pcalloc(r->pool, sizeof(isapi_cid));
-    cid->ecb = ap_pcalloc(r->pool, sizeof(struct _EXTENSION_CONTROL_BLOCK));
+    cid = apr_pcalloc(r->pool, sizeof(isapi_cid));
+    cid->ecb = apr_pcalloc(r->pool, sizeof(struct _EXTENSION_CONTROL_BLOCK));
     cid->ecb->ConnID = (HCONN)cid;
     /* TODO: Critical section */
     ++isa->refcount;
@@ -256,15 +256,15 @@ ap_status_t isapi_handler (request_rec *r)
     cid->ecb->dwHttpStatusCode = 0;
     strcpy(cid->ecb->lpszLogData, "");
     // TODO: are copies really needed here?
-    cid->ecb->lpszMethod = ap_pstrdup(r->pool, (char*) r->method);
-    cid->ecb->lpszQueryString = ap_pstrdup(r->pool, 
-                                (char*) ap_table_get(e, "QUERY_STRING"));
-    cid->ecb->lpszPathInfo = ap_pstrdup(r->pool, 
-                             (char*) ap_table_get(e, "PATH_INFO"));
-    cid->ecb->lpszPathTranslated = ap_pstrdup(r->pool, 
-                                   (char*) ap_table_get(e, "PATH_TRANSLATED"));
-    cid->ecb->lpszContentType = ap_pstrdup(r->pool, 
-                                (char*) ap_table_get(e, "CONTENT_TYPE"));
+    cid->ecb->lpszMethod = apr_pstrdup(r->pool, (char*) r->method);
+    cid->ecb->lpszQueryString = apr_pstrdup(r->pool, 
+                                (char*) apr_table_get(e, "QUERY_STRING"));
+    cid->ecb->lpszPathInfo = apr_pstrdup(r->pool, 
+                             (char*) apr_table_get(e, "PATH_INFO"));
+    cid->ecb->lpszPathTranslated = apr_pstrdup(r->pool, 
+                                   (char*) apr_table_get(e, "PATH_TRANSLATED"));
+    cid->ecb->lpszContentType = apr_pstrdup(r->pool, 
+                                (char*) apr_table_get(e, "CONTENT_TYPE"));
     /* Set up the callbacks */
     cid->ecb->GetServerVariable = &GetServerVariable;
     cid->ecb->WriteClient = &WriteClient;
@@ -291,7 +291,7 @@ ap_status_t isapi_handler (request_rec *r)
          * But we can be smarter and read up to our 48k and then allow
          * the ISAPI app to read further blocks as desired.
          */
-        long to_read = atol(ap_table_get(e, "CONTENT_LENGTH"));
+        long to_read = atol(apr_table_get(e, "CONTENT_LENGTH"));
         long read;
 
         /* Actually, let's cap it at 48k, until we figure out what
@@ -306,7 +306,7 @@ ap_status_t isapi_handler (request_rec *r)
             return HTTP_REQUEST_ENTITY_TOO_LARGE;
         }
 
-        cid->ecb->lpbData = ap_pcalloc(r->pool, 1 + to_read);
+        cid->ecb->lpbData = apr_pcalloc(r->pool, 1 + to_read);
 
         if ((read = ap_get_client_block(r, cid->ecb->lpbData, to_read)) < 0) {
             if (isa->TerminateExtension) 
@@ -417,7 +417,7 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
                                LPVOID lpvBuffer, LPDWORD lpdwSizeofBuffer)
 {
     request_rec *r = ((isapi_cid *)hConn)->r;
-    ap_table_t *e = r->subprocess_env;
+    apr_table_t *e = r->subprocess_env;
     const char *result;
 
     /* Mostly, we just grab it from the environment, but there are
@@ -428,7 +428,7 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
         /* We don't support NT users, so this is always the same as
          * REMOTE_USER
          */
-        result = ap_table_get(e, "REMOTE_USER");
+        result = apr_table_get(e, "REMOTE_USER");
     }
     else if (!strcasecmp(lpszVariableName, "SERVER_PORT_SECURE")) {
         /* Apache doesn't support secure requests inherently, so
@@ -441,7 +441,7 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
         result = r->uri;
     }
     else {
-        result = ap_table_get(e, lpszVariableName);
+        result = apr_table_get(e, lpszVariableName);
     }
 
     if (result) {
@@ -549,21 +549,21 @@ static char* ComposeHeaders(request_rec *r, char* data)
             while (endp > value && ap_isspace(*endp)) 
                 *endp-- = '\0';
 
-            tmp = ap_pstrdup (r->pool, value);
+            tmp = apr_pstrdup (r->pool, value);
             ap_str_tolower(tmp);
             r->content_type = tmp;
         }
         else if (!strcasecmp(data, "Content-Length")) {
-            ap_table_set(r->headers_out, data, value);
+            apr_table_set(r->headers_out, data, value);
         }
         else if (!strcasecmp(data, "Transfer-Encoding")) {
-            ap_table_set(r->headers_out, data, value);
+            apr_table_set(r->headers_out, data, value);
         }
         else if (!strcasecmp(data, "Set-Cookie")) {
-            ap_table_add(r->err_headers_out, data, value);
+            apr_table_add(r->err_headers_out, data, value);
         }
         else {
-            ap_table_merge(r->err_headers_out, data, value);
+            apr_table_merge(r->err_headers_out, data, value);
         }
 
         /* Reset data */
@@ -594,7 +594,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             /* Set the status to be returned when the HttpExtensionProc()
              * is done.
              */
-            ap_table_set (r->headers_out, "Location", lpvBuffer);
+            apr_table_set (r->headers_out, "Location", lpvBuffer);
             cid->r->status = cid->ecb->dwHttpStatusCode 
                                                    = HTTP_MOVED_TEMPORARILY;
             return TRUE;
@@ -609,17 +609,17 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             }
 
             /* Reset the method to GET */
-            r->method = ap_pstrdup(r->pool, "GET");
+            r->method = apr_pstrdup(r->pool, "GET");
             r->method_number = M_GET;
 
             /* Don't let anyone think there's still data */
-            ap_table_unset(r->headers_in, "Content-Length");
+            apr_table_unset(r->headers_in, "Content-Length");
 
             ap_internal_redirect((char *)lpvBuffer, r);
             return TRUE;
 
         case HSE_REQ_SEND_RESPONSE_HEADER:
-            r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
+            r->status_line = lpvBuffer ? lpvBuffer : apr_pstrdup(r->pool, "200 OK");
             sscanf(r->status_line, "%d", &r->status);
             cid->ecb->dwHttpStatusCode = r->status;
 
@@ -636,7 +636,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             }
                         
             /* Make a copy - don't disturb the original */
-            data = ap_pstrdup(r->pool, (char *)lpdwDataType);
+            data = apr_pstrdup(r->pool, (char *)lpdwDataType);
             
             /* Parse them out, or die trying */
             data = ComposeHeaders(r, data);
@@ -661,7 +661,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
 
         case HSE_REQ_MAP_URL_TO_PATH:
             /* Map a URL to a filename */
-            subreq = ap_sub_req_lookup_uri(ap_pstrndup(r->pool, (char *)lpvBuffer,
+            subreq = ap_sub_req_lookup_uri(apr_pstrndup(r->pool, (char *)lpvBuffer,
                                            *lpdwSize), r);
 
             GetFullPathName(subreq->filename, *lpdwSize - 1, (char *)lpvBuffer, NULL);
@@ -738,7 +738,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
             /* TODO: Not quite ready for prime time yet */
 
             /* Map a URL to a filename */
-            subreq = ap_sub_req_lookup_uri(ap_pstrndup(r->pool, (char *)lpvBuffer,
+            subreq = ap_sub_req_lookup_uri(apr_pstrndup(r->pool, (char *)lpvBuffer,
                                            *lpdwSize), r);
 
             GetFullPathName(subreq->filename, *lpdwSize - 1, (char *)lpvBuffer, NULL);
@@ -752,7 +752,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
                 ((char *)lpvBuffer)[l + 1] = '\0';
             }
 
-            lpdwDataType = (LPDWORD) ap_palloc(r->pool, sizeof(HSE_URL_MAPEX_INFO));
+            lpdwDataType = (LPDWORD) apr_palloc(r->pool, sizeof(HSE_URL_MAPEX_INFO));
             strncpy(((LPHSE_URL_MAPEX_INFO)lpdwDataType)->lpszPath,
                     (char *) lpvBuffer, MAX_PATH);
             ((LPHSE_URL_MAPEX_INFO)lpdwDataType)->dwFlags = 0;
@@ -790,12 +790,12 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
 
             if (((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszStatus
                 && ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchStatus) {
-                r->status_line = ap_pstrndup(r->pool, 
+                r->status_line = apr_pstrndup(r->pool, 
                            ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszStatus,
                            ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchStatus);
             }
             else {
-                r->status_line = ap_pstrdup(r->pool, "200 OK");
+                r->status_line = apr_pstrdup(r->pool, "200 OK");
             }
             sscanf(r->status_line, "%d", &r->status);
             cid->ecb->dwHttpStatusCode = r->status;
@@ -804,7 +804,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
                 && ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader)
             {
                 /* Make a copy - don't disturb the original */
-                data = ap_pstrndup(r->pool, 
+                data = apr_pstrndup(r->pool, 
                            ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->pszHeader,
                            ((LPHSE_SEND_HEADER_EX_INFO)lpvBuffer)->cchHeader);
                 
@@ -864,7 +864,7 @@ module isapi_module = {
    NULL,                        /* merge per-dir config */
    NULL,                        /* server config */
    NULL,                        /* merge server config */
-   NULL,                        /* command ap_table_t */
+   NULL,                        /* command apr_table_t */
    isapi_handlers,              /* handlers */
    NULL                         /* register hooks */
 };
diff --git a/os/win32/os.h b/os/win32/os.h
index cb82e7adfe..22488864e4 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -143,9 +143,9 @@ __inline int ap_os_is_path_absolute(const char *file)
 }
 
 /* OS-dependent filename routines in util_win32.c */
-API_EXPORT(char *) ap_os_canonical_filename(ap_pool_t *p, const char *file);
-API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool, const char *szFile);
-API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool, const char *szFile);
+API_EXPORT(char *) ap_os_canonical_filename(apr_pool_t *p, const char *file);
+API_EXPORT(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
+API_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
 API_EXPORT(int) ap_os_is_filename_valid(const char *file);
 
 #define ap_os_dso_error()   ""	/* for now */
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index 8dd410bd80..66d1263eae 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -86,7 +86,7 @@ static BOOL OnlyDots(char *pString)
  * is present on the existing path.  This routine also
  * converts alias names to long names.
  */
-API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool, 
+API_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pPool, 
                                              const char *szFile)
 {
     char buf[HUGE_STRING_LEN];
@@ -98,10 +98,10 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
     WIN32_FIND_DATA wfd;
 
     if (!szFile || strlen(szFile) == 0 || strlen(szFile) >= sizeof(buf))
-        return ap_pstrdup(pPool, "");
+        return apr_pstrdup(pPool, "");
 
     buf[0] = '\0';
-    pInputName = ap_pstrdup(pPool, szFile);
+    pInputName = apr_pstrdup(pPool, szFile);
 
     /* First convert all slashes to \ so Win32 calls work OK */
     for (p = pInputName; *p; p++) {
@@ -199,14 +199,14 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
             *p = '/';
     }
 
-    return ap_pstrdup(pPool, buf);
+    return apr_pstrdup(pPool, buf);
 }
 
 
 /*  Perform canonicalization with the exception that the
  *  input case is preserved.
  */
-API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool, 
+API_EXPORT(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, 
                                                  const char *szFile)
 {
     char *pNewStr;
@@ -215,9 +215,9 @@ API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool,
     char *q;
 
     if (szFile == NULL || strlen(szFile) == 0)
-        return ap_pstrdup(pPool, "");
+        return apr_pstrdup(pPool, "");
 
-    pNewStr = ap_pstrdup(pPool, szFile);
+    pNewStr = apr_pstrdup(pPool, szFile);
 
     /*  Change all '\' characters to '/' characters.
      *  While doing this, remove any trailing '.'.
@@ -315,7 +315,7 @@ API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool,
 
             } while (p != NULL); 
 
-            pNewStr = ap_pstrdup(pPool, buf);
+            pNewStr = apr_pstrdup(pPool, buf);
         }
     }
 
@@ -325,7 +325,7 @@ API_EXPORT(char *) ap_os_case_canonical_filename(ap_pool_t *pPool,
 
 /*  Perform complete canonicalization.
  */
-API_EXPORT(char *) ap_os_canonical_filename(ap_pool_t *pPool, const char *szFile)
+API_EXPORT(char *) ap_os_canonical_filename(apr_pool_t *pPool, const char *szFile)
 {
     char *pNewName;
     pNewName = ap_os_case_canonical_filename(pPool, szFile);