summaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/beos/os.c2
-rw-r--r--os/beos/os.h2
-rw-r--r--os/bs2000/bs2login.c2
-rw-r--r--os/bs2000/ebcdic.c10
-rw-r--r--os/bs2000/os.c2
-rw-r--r--os/bs2000/os.h4
-rw-r--r--os/os2/os.h4
-rw-r--r--os/os2/util_os2.c2
-rw-r--r--os/tpf/ebcdic.c6
-rw-r--r--os/tpf/os.c8
-rw-r--r--os/tpf/os.h4
-rw-r--r--os/unix/os.h2
-rw-r--r--os/win32/mod_isapi.c10
-rw-r--r--os/win32/os.h2
-rw-r--r--os/win32/util_win32.c6
15 files changed, 33 insertions, 33 deletions
diff --git a/os/beos/os.c b/os/beos/os.c
index 72281c296e..0eb63fc5f9 100644
--- a/os/beos/os.c
+++ b/os/beos/os.c
@@ -1,6 +1,6 @@
/*
* This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os-inline.c instead.
+ * Any inlineable functions should be defined in os ap_context_t nline.c instead.
*/
#include "ap_config.h"
diff --git a/os/beos/os.h b/os/beos/os.h
index a4af416269..57a2ad1e44 100644
--- a/os/beos/os.h
+++ b/os/beos/os.h
@@ -68,7 +68,7 @@
/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os-inline.c
+ * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
*/
extern int ap_os_is_path_absolute(const char *file);
diff --git a/os/bs2000/bs2login.c b/os/bs2000/bs2login.c
index 32eb1aecb0..3bbf03f7b7 100644
--- a/os/bs2000/bs2login.c
+++ b/os/bs2000/bs2login.c
@@ -168,7 +168,7 @@ 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(pool *p, const char *account)
+const char *os_set_account(ap_context_t *p, const char *account)
{
char account_temp[ACCT_LEN+1];
diff --git a/os/bs2000/ebcdic.c b/os/bs2000/ebcdic.c
index 0303fc6dbb..36f3ca5e08 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 table is bijective, i.e. there are no ambigous or duplicate characters
+This ap_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 table is (almost) identical to the previous one. The only difference
+/* This ap_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 table is simple: Throughout the
+ * equivalent. The reason for this ap_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 table above). \015 happens to be
+ * different from LF (look it up in the ap_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 table is therefore used wherever an EBCDIC to ASCII conversion is
+ * This ap_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 c33810a2f0..942a06aa7f 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -57,7 +57,7 @@
/*
* This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os-inline.c instead.
+ * Any inlineable functions should be defined in os ap_context_t nline.c instead.
*/
#include "httpd.h"
diff --git a/os/bs2000/os.h b/os/bs2000/os.h
index 1ede0813f2..fb66b6155e 100644
--- a/os/bs2000/os.h
+++ b/os/bs2000/os.h
@@ -6,7 +6,7 @@
/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os-inline.c
+ * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
*/
#if !defined(INLINE) && defined(USE_GNU_INLINE)
@@ -17,7 +17,7 @@
INLINE int ap_os_is_path_absolute(const char *file);
-#include "os-inline.c"
+#include "os ap_context_t nline.c"
#endif
#ifndef INLINE
diff --git a/os/os2/os.h b/os/os2/os.h
index d717f1f8ca..dbca54b217 100644
--- a/os/os2/os.h
+++ b/os/os2/os.h
@@ -8,7 +8,7 @@
/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os-inline.c
+ * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
*/
#if defined(__GNUC__) && !defined(INLINE)
@@ -19,7 +19,7 @@
INLINE int ap_os_is_path_absolute(const char *file);
-#include "os-inline.c"
+#include "os ap_context_t nline.c"
#endif
#ifndef INLINE
diff --git a/os/os2/util_os2.c b/os/os2/util_os2.c
index 86128412cf..165c5f1fef 100644
--- a/os/os2/util_os2.c
+++ b/os/os2/util_os2.c
@@ -5,7 +5,7 @@
#include "http_log.h"
-API_EXPORT(char *)ap_os_canonical_filename(pool *pPool, const char *szFile)
+API_EXPORT(char *)ap_os_canonical_filename(ap_context_t *pPool, const char *szFile)
{
char buf[HUGE_STRING_LEN];
char buf2[HUGE_STRING_LEN];
diff --git a/os/tpf/ebcdic.c b/os/tpf/ebcdic.c
index be029f4259..479ace1de5 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 table is bijective - there are no ambigous or duplicate characters.
+This ap_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 table is a copy of the os_toascii_strictly bijective table above.
+This ap_table_t is a copy of the os_toascii_strictly bijective ap_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 table is bijective (no ambiguous or duplicate characters)
+This ap_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 e4682324cd..dabe414f0f 100644
--- a/os/tpf/os.c
+++ b/os/tpf/os.c
@@ -57,7 +57,7 @@
/*
* This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os-inline.c instead.
+ * Any inlineable functions should be defined in os ap_context_t nline.c instead.
*/
#include "httpd.h"
@@ -211,7 +211,7 @@ int execvp(const char *file, char *const argv[])
-int ap_tpf_spawn_child(pool *p, int (*func) (void *, child_info *),
+int ap_tpf_spawn_child(ap_context_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[])
@@ -222,7 +222,7 @@ int ap_tpf_spawn_child(pool *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;
- array_header *env_arr = ap_table_elts ((array_header *) cld->subprocess_env);
+ ap_array_header_t *env_arr = ap_table_elts ((array_header *) cld->subprocess_env);
table_entry *elts = (table_entry *) env_arr->elts;
@@ -395,7 +395,7 @@ int os_check_server(char *server) {
return 0;
}
-void os_note_additional_cleanups(pool *p, int sd) {
+void os_note_additional_cleanups(ap_context_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/tpf/os.h b/os/tpf/os.h
index ff65322902..916ef109fe 100644
--- a/os/tpf/os.h
+++ b/os/tpf/os.h
@@ -10,7 +10,7 @@
/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os-inline.c
+ * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
*/
#include "ap_config.h"
@@ -20,7 +20,7 @@
* part of the header
*/
#define INLINE extern ap_inline
-#include "os-inline.c"
+#include "os ap_context_t nline.c"
#endif
#ifndef INLINE
diff --git a/os/unix/os.h b/os/unix/os.h
index 54124c77fc..683f735326 100644
--- a/os/unix/os.h
+++ b/os/unix/os.h
@@ -67,7 +67,7 @@
/*
* This file in included in all Apache source code. It contains definitions
* of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os-inline.c
+ * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
*/
#if !defined(INLINE) && defined(USE_GNU_INLINE)
diff --git a/os/win32/mod_isapi.c b/os/win32/mod_isapi.c
index fa002708ba..1b874a87e8 100644
--- a/os/win32/mod_isapi.c
+++ b/os/win32/mod_isapi.c
@@ -68,7 +68,7 @@
* function as well).
*
* To load, simply place the ISA in a location in the document tree.
- * Then add an "AddHandler isapi-isa dll" into your config file.
+ * Then add an "AddHandler isapi ap_context_t sa dll" into your config file.
* You should now be able to load ISAPI DLLs just be reffering to their
* URLs. Make sure the ExecCGI option is active in the directory
* the ISA is in.
@@ -129,7 +129,7 @@ int isapi_handler (request_rec *r) {
BOOL (*isapi_term)(DWORD); /* optional entry point 3 */
isapi_cid *cid = ap_pcalloc(r->pool, sizeof(isapi_cid));
- table *e = r->subprocess_env;
+ ap_table_t *e = r->subprocess_env;
int retval;
/* Use similar restrictions as CGIs */
@@ -296,7 +296,7 @@ int isapi_handler (request_rec *r) {
BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
LPVOID lpvBuffer, LPDWORD lpdwSizeofBuffer) {
request_rec *r = ((isapi_cid *)hConn)->r;
- table *e = r->subprocess_env;
+ ap_table_t *e = r->subprocess_env;
const char *result;
/* Mostly, we just grab it from the environment, but there are
@@ -546,7 +546,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
}
handler_rec isapi_handlers[] = {
-{ "isapi-isa", isapi_handler },
+{ "isapi ap_context_t sa", isapi_handler },
{ NULL}
};
@@ -557,7 +557,7 @@ module isapi_module = {
NULL, /* merge per-dir config */
NULL, /* server config */
NULL, /* merge server config */
- NULL, /* command table */
+ NULL, /* command ap_table_t */
isapi_handlers, /* handlers */
NULL, /* filename translation */
NULL, /* check_user_id */
diff --git a/os/win32/os.h b/os/win32/os.h
index c034f7d8a5..d1f3f53b8a 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -13,7 +13,7 @@
/* char *crypt(const char *pw, const char *salt); */
#define crypt(buf,salt) (buf)
-/* Use the Windows built-in spawnvp */
+/* Use the Windows built ap_context_t n spawnvp */
#define ap_spawnvp(file, argv) (spawnvp(file, argv))
/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index 348e0f9e2a..1ec908f9a4 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -29,7 +29,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(pool *pPool,
+API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pPool,
const char *szFile)
{
char buf[HUGE_STRING_LEN];
@@ -149,7 +149,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(pool *pPool,
/* Perform canonicalization with the exception that the
* input case is preserved.
*/
-API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool,
+API_EXPORT(char *) ap_os_case_canonical_filename(ap_context_t *pPool,
const char *szFile)
{
char *pNewStr;
@@ -268,7 +268,7 @@ API_EXPORT(char *) ap_os_case_canonical_filename(pool *pPool,
/* Perform complete canonicalization.
*/
-API_EXPORT(char *) ap_os_canonical_filename(pool *pPool, const char *szFile)
+API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *pPool, const char *szFile)
{
char *pNewName;
pNewName = ap_os_case_canonical_filename(pPool, szFile);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 02:12:06 +0100