martin 99/10/11 15:40:20
Modified: src/ap ap_getpass.c src/lib/apr/lib apr_pools.c apr_tables.c src/lib/apr/locks/unix crossproc.c src/modules/example mod_example.c src/modules/mpm/dexter acceptlock.c src/modules/mpm/mpmt_pthread acceptlock.c src/modules/mpm/prefork prefork.c src/modules/mpm/spmt_os2 spmt_os2.c src/modules/proxy proxy_ftp.c proxy_util.c src/modules/standard mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_autoindex.c mod_imap.c mod_info.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_so.c src/os/win32/installer/installdll install.c src/os/win32 mod_dll.c mod_isapi.c registry.c src/test time-sem.c Log: 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. Revision Changes Path 1.3 +1 -1 apache-2.0/src/ap/ap_getpass.c Index: ap_getpass.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/ap/ap_getpass.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ap_getpass.c 1999/08/31 05:32:07 1.2 +++ ap_getpass.c 1999/10/11 22:39:35 1.3 @@ -106,7 +106,7 @@ #ifdef WIN32 /* - * Windows lacks getpass(). So we'll re ap_context_t mplement it here. + * Windows lacks getpass(). So we'll reimplement it here. */ static char *getpass(const char *prompt) 1.17 +4 -4 apache-2.0/src/lib/apr/lib/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- apr_pools.c 1999/10/11 15:31:48 1.16 +++ apr_pools.c 1999/10/11 22:39:36 1.17 @@ -117,7 +117,7 @@ /* * Pool debugging support: This is intended to detect cases where the - * wrong ap_context_t is used when assigning data to an object in another pool. + * wrong pool is used when assigning data to an object in another pool. * In particular, it causes the table_{set,add,merge}n routines to check * that their arguments are safe for the ap_table_t they're being placed in. * It currently only works with the unix multiprocess model, but could @@ -460,7 +460,7 @@ static ap_pool_t *permanent_pool; -/* Each ap_context_t structure is allocated in the start of its own first block, +/* Each pool structure is allocated in the start of its own first block, * so we need to know how many bytes that is (once properly aligned...). * This also means that when a pool's sub-pool is destroyed, the storage * associated with it is *completely* gone, so we have to make sure it @@ -653,7 +653,7 @@ (((unsigned long)(ptr) - (unsigned long)(lo)) \ < (unsigned long)(hi) - (unsigned long)(lo)) -/* Find the ap_context_t that ts belongs to, return NULL if it doesn't +/* Find the pool that ts belongs to, return NULL if it doesn't * belong to any pool. */ API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts) @@ -990,7 +990,7 @@ ps->blok = nblok; ps->got_a_new_block = 1; /* note that we've deliberately not linked the new block onto - * the ap_context_t yet... because we may need to flush again later, and + * the pool yet... because we may need to flush again later, and * we'd have to spend more effort trying to unlink the block. */ return 0; 1.4 +10 -10 apache-2.0/src/lib/apr/lib/apr_tables.c Index: apr_tables.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apr_tables.c 1999/08/31 05:32:36 1.3 +++ apr_tables.c 1999/10/11 22:39:36 1.4 @@ -315,7 +315,7 @@ * have a life span at least as long as p */ if (!ap_pool_is_ancestor(t->a.pool, p)) { - fprintf(stderr, "copy_table: t's ap_context_t is not an ancestor of p\n"); + fprintf(stderr, "copy_table: t's pool is not an ancestor of p\n"); abort(); } #endif @@ -392,11 +392,11 @@ #ifdef POOL_DEBUG { if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) { - fprintf(stderr, "table_set: key not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: key not in ancestor pool of t\n"); abort(); } if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) { - fprintf(stderr, "table_set: val not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: val not in ancestor pool of t\n"); abort(); } } @@ -481,11 +481,11 @@ #ifdef POOL_DEBUG { if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) { - fprintf(stderr, "table_set: key not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: key not in ancestor pool of t\n"); abort(); } if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) { - fprintf(stderr, "table_set: key not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: key not in ancestor pool of t\n"); abort(); } } @@ -521,11 +521,11 @@ #ifdef POOL_DEBUG { if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) { - fprintf(stderr, "table_set: key not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: key not in ancestor pool of t\n"); abort(); } if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) { - fprintf(stderr, "table_set: key not in ancestor ap_context_t of t\n"); + fprintf(stderr, "table_set: key not in ancestor pool of t\n"); abort(); } } @@ -549,12 +549,12 @@ */ if (!ap_pool_is_ancestor(overlay->a.pool, p->pool)) { fprintf(stderr, - "overlay_tables: overlay's ap_context_t is not an ancestor of p\n"); + "overlay_tables: overlay's pool is not an ancestor of p\n"); abort(); } if (!ap_pool_is_ancestor(base->a.pool, p->pool)) { fprintf(stderr, - "overlay_tables: base's ap_context_t is not an ancestor of p\n"); + "overlay_tables: base's pool is not an ancestor of p\n"); abort(); } #endif @@ -662,7 +662,7 @@ cat_keys = cat_keys_buf; } else { - /* XXX: could use scratch free space in a or b's ap_context_t instead... + /* XXX: could use scratch free space in a or b's pool instead... * which could save an allocation in b's pool. */ cat_keys = ap_palloc(b->a.cont, sizeof(overlap_key) * nkeys); 1.6 +2 -2 apache-2.0/src/lib/apr/locks/unix/crossproc.c Index: crossproc.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- crossproc.c 1999/10/04 16:36:58 1.5 +++ crossproc.c 1999/10/11 22:39:39 1.6 @@ -87,7 +87,7 @@ lock_cleanup(new); return errno; } - /* pre ap_context_t nitialize these */ + /* preinitialize these */ new->op_on.sem_num = 0; new->op_on.sem_op = -1; new->op_on.sem_flg = SEM_UNDO; @@ -251,7 +251,7 @@ lock_cleanup(new); return errno; } - /* pre ap_context_t nitialize these */ + /* preinitialize these */ new->lock_it.l_whence = SEEK_SET; /* from current point */ new->lock_it.l_start = 0; /* -"- */ new->lock_it.l_len = 0; /* until end of file */ 1.4 +5 -5 apache-2.0/src/modules/example/mod_example.c Index: mod_example.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/example/mod_example.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_example.c 1999/08/31 05:33:13 1.3 +++ mod_example.c 1999/10/11 22:39:42 1.4 @@ -624,7 +624,7 @@ */ /* - * 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 @@ /* * 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 @@ /* * 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 @@ 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)); /* 1.11 +1 -1 apache-2.0/src/modules/mpm/dexter/acceptlock.c Index: acceptlock.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- acceptlock.c 1999/10/06 23:04:11 1.10 +++ acceptlock.c 1999/10/11 22:39:42 1.11 @@ -448,7 +448,7 @@ } 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; 1.13 +1 -1 apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c Index: acceptlock.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/acceptlock.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- acceptlock.c 1999/10/10 17:08:06 1.12 +++ acceptlock.c 1999/10/11 22:39:43 1.13 @@ -446,7 +446,7 @@ } 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; 1.42 +2 -2 apache-2.0/src/modules/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- prefork.c 1999/10/10 20:35:05 1.41 +++ prefork.c 1999/10/11 22:39:44 1.42 @@ -486,7 +486,7 @@ } 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 @@ 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); 1.13 +1 -1 apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c Index: spmt_os2.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- spmt_os2.c 1999/10/07 20:48:23 1.12 +++ spmt_os2.c 1999/10/11 22:39:45 1.13 @@ -902,7 +902,7 @@ 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); 1.4 +1 -1 apache-2.0/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- proxy_ftp.c 1999/08/31 05:33:32 1.3 +++ proxy_ftp.c 1999/10/11 22:39:45 1.4 @@ -415,7 +415,7 @@ * 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://[EMAIL PROTECTED] part of the reqest (sans password ap_context_t f supplied but invalid-) + * ftp://[EMAIL PROTECTED] part of the reqest (sans password if supplied but invalid-) */ static int ftp_unauthorized (request_rec *r, int log_it) { 1.5 +2 -2 apache-2.0/src/modules/proxy/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proxy_util.c 1999/08/31 21:54:51 1.4 +++ proxy_util.c 1999/10/11 22:39:46 1.5 @@ -273,7 +273,7 @@ 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 @@ /* - * 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. 1.8 +1 -1 apache-2.0/src/modules/standard/mod_asis.c Index: mod_asis.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_asis.c 1999/10/06 23:04:15 1.7 +++ mod_asis.c 1999/10/11 22:39:47 1.8 @@ -124,7 +124,7 @@ static const handler_rec asis_handlers[] = { {ASIS_MAGIC_TYPE, asis_handler}, - {"send-as ap_context_t s", asis_handler}, + {"send-asis", asis_handler}, {NULL} }; 1.8 +1 -1 apache-2.0/src/modules/standard/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_auth.c 1999/10/04 16:38:15 1.7 +++ mod_auth.c 1999/10/11 22:39:47 1.8 @@ -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. 1.5 +1 -1 apache-2.0/src/modules/standard/mod_auth_anon.c Index: mod_auth_anon.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_auth_anon.c 1999/08/31 05:33:43 1.4 +++ mod_auth_anon.c 1999/10/11 22:39:47 1.5 @@ -72,7 +72,7 @@ * * Just add the following tokes to your <directory> 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 1.4 +1 -1 apache-2.0/src/modules/standard/mod_auth_db.c Index: mod_auth_db.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_auth_db.c 1999/08/31 05:33:44 1.3 +++ mod_auth_db.c 1999/10/11 22:39:48 1.4 @@ -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. 1.4 +1 -1 apache-2.0/src/modules/standard/mod_auth_dbm.c Index: mod_auth_dbm.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_auth_dbm.c 1999/08/31 05:33:44 1.3 +++ mod_auth_dbm.c 1999/10/11 22:39:48 1.4 @@ -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. 1.9 +2 -2 apache-2.0/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_autoindex.c 1999/10/06 23:04:15 1.8 +++ mod_autoindex.c 1999/10/11 22:39:49 1.9 @@ -615,7 +615,7 @@ } 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 @@ } 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;; 1.5 +1 -1 apache-2.0/src/modules/standard/mod_imap.c Index: mod_imap.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_imap.c 1999/08/31 05:33:52 1.4 +++ mod_imap.c 1999/10/11 22:39:49 1.5 @@ -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 1.5 +7 -7 apache-2.0/src/modules/standard/mod_info.c Index: mod_info.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_info.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_info.c 1999/08/31 05:33:53 1.4 +++ mod_info.c 1999/10/11 22:39:50 1.5 @@ -59,14 +59,14 @@ * Info Module. Display configuration information for the server and * all included modules. * - * <Location /server ap_context_t nfo> - * SetHandler server ap_context_t nfo + * <Location /server-info> + * SetHandler server-info * </Location> * - * 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 <[EMAIL PROTECTED]>, May 1996 * @@ -660,7 +660,7 @@ static const handler_rec info_handlers[] = { - {"server ap_context_t nfo", display_info}, + {"server-info", display_info}, {NULL} }; 1.5 +1 -1 apache-2.0/src/modules/standard/mod_mime_magic.c Index: mod_mime_magic.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_mime_magic.c 1999/08/31 21:54:52 1.4 +++ mod_mime_magic.c 1999/10/11 22:39:50 1.5 @@ -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 1.9 +2 -2 apache-2.0/src/modules/standard/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_negotiation.c 1999/10/06 23:04:16 1.8 +++ mod_negotiation.c 1999/10/11 22:39:52 1.9 @@ -329,8 +329,8 @@ */ 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 1.4 +2 -2 apache-2.0/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_rewrite.c 1999/08/31 05:33:58 1.3 +++ mod_rewrite.c 1999/10/11 22:39:52 1.4 @@ -605,7 +605,7 @@ } /* 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 @@ * 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); } 1.4 +1 -1 apache-2.0/src/modules/standard/mod_so.c Index: mod_so.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_so.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_so.c 1999/08/31 05:34:01 1.3 +++ mod_so.c 1999/10/11 22:39:53 1.4 @@ -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 1.3 +1 -1 apache-2.0/src/os/win32/installer/installdll/install.c Index: install.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/os/win32/installer/installdll/install.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- install.c 1999/08/31 05:35:24 1.2 +++ install.c 1999/10/11 22:40:03 1.3 @@ -334,7 +334,7 @@ } else { /* The sequence did not exist in the replace table, so copy - * it as ap_context_t s to the output. + * it as is to the output. */ pos++; } 1.3 +1 -1 apache-2.0/src/os/win32/mod_dll.c Index: mod_dll.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/os/win32/mod_dll.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_dll.c 1999/08/31 05:35:09 1.2 +++ mod_dll.c 1999/10/11 22:40:05 1.3 @@ -85,7 +85,7 @@ * compiled with both Windows and Unix, you may wish to use an #ifdef * WIN32 * - * Note that your module should still work just fine compiled ap_context_t n + * Note that your module should still work just fine compiled-in * with this code bit there. It only activates when using the module * as a DLL. * 1.4 +2 -2 apache-2.0/src/os/win32/mod_isapi.c Index: mod_isapi.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/os/win32/mod_isapi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_isapi.c 1999/08/31 15:26:45 1.3 +++ mod_isapi.c 1999/10/11 22:40:07 1.4 @@ -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 @@ } handler_rec isapi_handlers[] = { -{ "isapi ap_context_t sa", isapi_handler }, +{ "isapi-isa", isapi_handler }, { NULL} }; 1.3 +1 -1 apache-2.0/src/os/win32/registry.c Index: registry.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/os/win32/registry.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- registry.c 1999/08/31 05:35:12 1.2 +++ registry.c 1999/10/11 22:40:10 1.3 @@ -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 1.3 +1 -1 apache-2.0/src/test/time-sem.c Index: time-sem.c =================================================================== RCS file: /export/home/cvs/apache-2.0/src/test/time-sem.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- time-sem.c 1999/08/31 05:35:52 1.2 +++ time-sem.c 1999/10/11 22:40:18 1.3 @@ -494,7 +494,7 @@ 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); }