From: Martin Kraemer Date: Mon, 11 Oct 1999 22:40:18 +0000 (+0000) Subject: Remove most of the annoying "re ap_context_t mplement" mis-replacements X-Git-Tag: 1.3.10~277 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c18eee13a50473a7f08767a73404652406ad3a0;p=thirdparty%2Fapache%2Fhttpd.git Remove most of the annoying "re ap_context_t mplement" mis-replacements by what I think is their real meaning. Guys, I didn't verify all of this, please have a close look at my "fixes". Thanks. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83970 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c index 590a1e32b57..aedef1d509d 100644 --- a/modules/aaa/mod_auth.c +++ b/modules/aaa/mod_auth.c @@ -63,7 +63,7 @@ * Adapted to Apache by rst. * * dirkx - Added Authoritative control to allow passing on to lower - * modules if and only if the user ap_context_t d is not known to this + * modules if and only if the userid is not known to this * module. A known user with a faulty or absent password still * causes an AuthRequired. The default is 'Authoritative', i.e. * no control is passed along. diff --git a/modules/aaa/mod_auth_anon.c b/modules/aaa/mod_auth_anon.c index e03c7e1d1c4..1ff06fc7a85 100644 --- a/modules/aaa/mod_auth_anon.c +++ b/modules/aaa/mod_auth_anon.c @@ -72,7 +72,7 @@ * * Just add the following tokes to your setup: * - * Anonymous magic-user ap_context_t d [magic-user ap_context_t d]... + * Anonymous magic-userid [magic-userid]... * * Anonymous_MustGiveEmail [ on | off ] default = off * Anonymous_LogEmail [ on | off ] default = on diff --git a/modules/aaa/mod_auth_db.c b/modules/aaa/mod_auth_db.c index 18bf14e7d9f..bc18fb8944d 100644 --- a/modules/aaa/mod_auth_db.c +++ b/modules/aaa/mod_auth_db.c @@ -84,7 +84,7 @@ * can also be used when compatibility mode is enabled. * * dirkx - Added Authoritative control to allow passing on to lower - * modules if and only if the user ap_context_t d is not known to this + * modules if and only if the userid is not known to this * module. A known user with a faulty or absent password still * causes an AuthRequired. The default is 'Authoritative', i.e. * no control is passed along. diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c index 7f31f6b8115..eeb3c8f77cc 100644 --- a/modules/aaa/mod_auth_dbm.c +++ b/modules/aaa/mod_auth_dbm.c @@ -63,7 +63,7 @@ * Adapted to Apache by rst. * * dirkx - Added Authoritative control to allow passing on to lower - * modules if and only if the user ap_context_t d is not known to this + * modules if and only if the userid is not known to this * module. A known user with a faulty or absent password still * causes an AuthRequired. The default is 'Authoritative', i.e. * no control is passed along. diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c index c35c22ea845..86aee515580 100644 --- a/modules/arch/win32/mod_isapi.c +++ b/modules/arch/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 ap_context_t sa dll" into your config file. + * Then add an "AddHandler isapi-isa 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. @@ -546,7 +546,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest, } handler_rec isapi_handlers[] = { -{ "isapi ap_context_t sa", isapi_handler }, +{ "isapi-isa", isapi_handler }, { NULL} }; diff --git a/modules/experimental/mod_example.c b/modules/experimental/mod_example.c index 2d68d62f706..dfa252516f3 100644 --- a/modules/experimental/mod_example.c +++ b/modules/experimental/mod_example.c @@ -624,7 +624,7 @@ static int example_handler(request_rec *r) */ /* - * All our module ap_context_t nitialiser does is add its trace to the log. + * All our module initialiser does is add its trace to the log. */ static void example_init(server_rec *s, ap_context_t *p) { @@ -648,14 +648,14 @@ static void example_init(server_rec *s, ap_context_t *p) /* * This function is called during server initialisation when an heavy-weight * process (such as a child) is being initialised. As with the - * module ap_context_t nitialisation function, any information that needs to be recorded + * module initialisation function, any information that needs to be recorded * must be in static cells, since there's no configuration record. * * There is no return value. */ /* - * All our process ap_context_t nitialiser does is add its trace to the log. + * All our process initialiser does is add its trace to the log. */ static void example_child_init(server_rec *s, ap_context_t *p) { @@ -678,7 +678,7 @@ static void example_child_init(server_rec *s, ap_context_t *p) /* * This function is called when an heavy-weight process (such as a child) is - * being run down or destroyed. As with the child ap_context_t nitialisation function, + * being run down or destroyed. As with the child initialisation function, * any information that needs to be recorded must be in static cells, since * there's no configuration record. * @@ -722,7 +722,7 @@ static void *example_create_dir_config(ap_context_t *p, char *dirspec) char *dname = dirspec; /* - * Allocate the space for our record from the ap_context_t supplied. + * Allocate the space for our record from the pool supplied. */ cfg = (excfg *) ap_pcalloc(p, sizeof(excfg)); /* diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c index f305b4a95a0..cebc4c7f55a 100644 --- a/modules/generators/mod_asis.c +++ b/modules/generators/mod_asis.c @@ -124,7 +124,7 @@ static int asis_handler(request_rec *r) static const handler_rec asis_handlers[] = { {ASIS_MAGIC_TYPE, asis_handler}, - {"send-as ap_context_t s", asis_handler}, + {"send-asis", asis_handler}, {NULL} }; diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 660565d2e36..4e91acd839e 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -615,7 +615,7 @@ static void *merge_autoindex_configs(ap_context_t *p, void *basev, void *addv) } else { /* - * If there were any non ap_context_t ncremental options selected for + * If there were any nonincremental options selected for * this directory, they dominate and we don't inherit *anything.* * Contrariwise, we *do* inherit if the only settings here are * incremental ones. @@ -634,7 +634,7 @@ static void *merge_autoindex_configs(ap_context_t *p, void *basev, void *addv) } else { /* - * There are local non ap_context_t ncremental settings, which clear + * There are local nonincremental settings, which clear * all inheritance from above. They *are* the new base settings. */ new->opts = add->opts;; diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index f683af1ca82..03a899e1874 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -59,14 +59,14 @@ * Info Module. Display configuration information for the server and * all included modules. * - * - * SetHandler server ap_context_t nfo + * + * SetHandler server-info * * - * GET /server ap_context_t nfo - Returns full configuration page for server and all modules - * GET /server ap_context_t nfo?server - Returns server configuration only - * GET /server ap_context_t nfo?module_name - Returns configuration for a single module - * GET /server ap_context_t nfo?list - Returns quick list of included modules + * GET /server-info - Returns full configuration page for server and all modules + * GET /server-info?server - Returns server configuration only + * GET /server-info?module_name - Returns configuration for a single module + * GET /server-info?list - Returns quick list of included modules * * Rasmus Lerdorf , May 1996 * @@ -660,7 +660,7 @@ static const command_rec info_cmds[] = static const handler_rec info_handlers[] = { - {"server ap_context_t nfo", display_info}, + {"server-info", display_info}, {NULL} }; diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c index f2bb73af9d0..37d9705a4ed 100644 --- a/modules/mappers/mod_imap.c +++ b/modules/mappers/mod_imap.c @@ -100,7 +100,7 @@ #include "http_log.h" #include "util_script.h" -#define IMAP_MAGIC_TYPE "application/x-httpd ap_context_t map" +#define IMAP_MAGIC_TYPE "application/x-httpd-imap" #define MAXVERTS 100 #define X 0 #define Y 1 diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 5b6beab74e9..21bfdb3f5a9 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -329,8 +329,8 @@ static const char *get_entry(ap_context_t *p, accept_rec *result, */ result->name = ap_get_token(p, &accept_line, 0); - ap_str_tolower(result->name); /* You want case ap_context_t nsensitive, - * you'll *get* case ap_context_t nsensitive. + ap_str_tolower(result->name); /* You want case insensitive, + * you'll *get* case insensitive. */ /* KLUDGE!!! Default HTML to level 2.0 unless the browser diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index 48839993cd3..10a2ccb459c 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -605,7 +605,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf, } /* now be careful: Under the POSIX regex library - we can compile the pattern for case ap_context_t nsensitive matching, + we can compile the pattern for case insensitive matching, under the old V8 library we have to do it self via a hack */ if (new->flags & CONDFLAG_NOCASE) { rc = ((regexp = ap_pregcomp(cmd->pool, cp, REG_EXTENDED|REG_ICASE)) @@ -1758,7 +1758,7 @@ static int apply_rewrite_rule(request_rec *r, rewriterule_entry *p, * make sure we really match against the complete URL. */ if (perdir != NULL && r->path_info != NULL && r->path_info[0] != '\0') { - rewritelog(r, 3, "[per-dir %s] add path ap_context_t nfo postfix: %s -> %s%s", + rewritelog(r, 3, "[per-dir %s] add path info postfix: %s -> %s%s", perdir, uri, uri, r->path_info); uri = ap_pstrcat(r->pool, uri, r->path_info, NULL); } diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c index 1c8cbff4559..51e44b03fe0 100644 --- a/modules/mappers/mod_so.c +++ b/modules/mappers/mod_so.c @@ -101,7 +101,7 @@ * You can use this to dynamically change the capability of your server * without bringing it down. * - * Because currently there is only limited built ap_context_t n support in the Configure + * Because currently there is only limited builtin support in the Configure * script for creating the shared library files (`.so'), please consult your * vendors cc(1), ld(1) and dlopen(3) manpages to find out the appropriate * compiler and linker flags and insert them manually into the Configuration diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index dd2b2ac4462..be3a18aec19 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -93,7 +93,7 @@ * * For compliance with Mr Darwin's terms: this has been very significantly * modified from the free "file" command. - * - all ap_context_t n-one file for compilation convenience when moving from one + * - all-in-one file for compilation convenience when moving from one * version of Apache to the next. * - Memory allocation is done through the Apache API's ap_context_t structure. * - All functions have had necessary Apache API request or server diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index 9df66448664..ae9030dd19e 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -415,7 +415,7 @@ static long int send_dir(BUFF *f, request_rec *r, cache_req *c, char *cwd) * with username and password (which was presumably queried from the user) * supplied in the Authorization: header. * Note that we "invent" a realm name which consists of the - * ftp://user@host part of the reqest (sans password ap_context_t f supplied but invalid-) + * ftp://user@host part of the reqest (sans password if supplied but invalid-) */ static int ftp_unauthorized (request_rec *r, int log_it) { diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 66f87c11770..7a21e0680a3 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -273,7 +273,7 @@ char * return "Port number in URL > 65535"; } } - ap_str_tolower(host); /* DNS names are case ap_context_t nsensitive */ + ap_str_tolower(host); /* DNS names are case insensitive */ if (*host == '\0') return "Missing host in URL"; /* check hostname syntax */ @@ -626,7 +626,7 @@ void ap_proxy_send_headers(request_rec *r, const char *respline, ap_table_t *t) /* - * list is a comma-separated list of case ap_context_t nsensitive tokens, with + * list is a comma-separated list of case insensitive tokens, with * optional whitespace around the tokens. * The return returns 1 if the token val is found in the list, or 0 * otherwise. diff --git a/os/win32/mod_isapi.c b/os/win32/mod_isapi.c index c35c22ea845..86aee515580 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 ap_context_t sa dll" into your config file. + * Then add an "AddHandler isapi-isa 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. @@ -546,7 +546,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest, } handler_rec isapi_handlers[] = { -{ "isapi ap_context_t sa", isapi_handler }, +{ "isapi-isa", isapi_handler }, { NULL} }; diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 41e8f033d52..41983f34c4d 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -486,7 +486,7 @@ static void accept_mutex_init(ap_context_t *p) } ap_register_cleanup(p, NULL, accept_mutex_cleanup, ap_null_cleanup); - /* pre ap_context_t nitialize these */ + /* preinitialize these */ op_on.sem_num = 0; op_on.sem_op = -1; op_on.sem_flg = SEM_UNDO; @@ -1954,7 +1954,7 @@ static void child_main(int child_num_arg) requests_this_child = 0; last_lr = NULL; - /* Get a sub ap_context_t for global allocations in this child, so that + /* Get a sub context for global allocations in this child, so that * we can have cleanups occur when the child exits. */ ap_create_context(&pchild, pconf); diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c index fab65929466..8ed71dcd416 100644 --- a/server/mpm/spmt_os2/spmt_os2.c +++ b/server/mpm/spmt_os2/spmt_os2.c @@ -902,7 +902,7 @@ static void child_main(void *child_num_arg) signal(SIGUSR1, just_die); signal(SIGTERM, just_die); - /* Get a sub ap_context_t for global allocations in this child, so that + /* Get a sub pool for global allocations in this child, so that * we can have cleanups occur when the child exits. */ pchild = ap_make_sub_pool(pconf); diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c index 5030f1ba37c..71d7e1c0c9b 100644 --- a/server/mpm/winnt/registry.c +++ b/server/mpm/winnt/registry.c @@ -59,7 +59,7 @@ /* * Get the data for registry key value. This is a generic function that * can either get a value into a caller-supplied buffer, or it can - * allocate space for the value from the pass ap_context_t n pool. It will normally + * allocate space for the value from the pass in pool. It will normally * be used by other functions within this file to get specific key values * (e.g. registry_get_server_root()). This function returns a number of * different error statuses, allowing the caller to differentiate diff --git a/test/time-sem.c b/test/time-sem.c index 73b4f8ab778..7800844ed20 100644 --- a/test/time-sem.c +++ b/test/time-sem.c @@ -494,7 +494,7 @@ void main (int argc, char **argv) unsigned long *shared_counter; if (argc != 3) { - fprintf (stderr, "Usage: time-sem num-child num ap_context_t ter\n"); + fprintf (stderr, "Usage: time-sem num-child num iter\n"); exit (1); }