brian 96/11/03 12:52:15
Modified: src http_config.c http_main.c http_request.c rfc1413.c util_script.c Log: Converted references to Shambhala (early apache prototype by rob thau) to Apache. Revision Changes Path 1.30 +2 -2 apache/src/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C3 -r1.29 -r1.30 *** http_config.c 1996/11/03 20:36:34 1.29 --- http_config.c 1996/11/03 20:52:09 1.30 *************** *** 56,65 **** * * Rob McCool * ! * Wall-to-wall rewrite for Shambhala... commands which are part of the * server core can now be found next door in "http_core.c". Now contains * general command loop, and functions which do bookkeeping for the new ! * Shambhala config stuff (modules and configuration vectors). * * rst * --- 56,65 ---- * * Rob McCool * ! * Wall-to-wall rewrite for Apache... commands which are part of the * server core can now be found next door in "http_core.c". Now contains * general command loop, and functions which do bookkeeping for the new ! * Apache config stuff (modules and configuration vectors). * * rst * 1.83 +2 -2 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.82 retrieving revision 1.83 diff -C3 -r1.82 -r1.83 *** http_main.c 1996/11/03 20:36:36 1.82 --- http_main.c 1996/11/03 20:52:10 1.83 *************** *** 70,76 **** * Apache server, and also to have child processes do accept() directly. * * April-July '95 rst ! * Extensive rework for Shambhala. */ --- 70,76 ---- * Apache server, and also to have child processes do accept() directly. * * April-July '95 rst ! * Extensive rework for Apache. */ *************** *** 155,161 **** * which is a pretty nice debugging environment. (You'll get a SIGHUP * early in standalone_main; just continue through. This is the server * trying to kill off any child processes which it might have lying ! * around --- Shambhala doesn't keep track of their pids, it just sends * SIGHUP to the process group, ignoring it in the root process. * Continue through and you'll be fine.). */ --- 155,161 ---- * which is a pretty nice debugging environment. (You'll get a SIGHUP * early in standalone_main; just continue through. This is the server * trying to kill off any child processes which it might have lying ! * around --- Apache doesn't keep track of their pids, it just sends * SIGHUP to the process group, ignoring it in the root process. * Continue through and you'll be fine.). */ 1.27 +2 -2 apache/src/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C3 -r1.26 -r1.27 *** http_request.c 1996/11/03 20:36:36 1.26 --- http_request.c 1996/11/03 20:52:11 1.27 *************** *** 55,61 **** * * Rob McCool 3/21/93 * ! * Thoroughly revamped by rst for Shambhala. NB this file reads * best from the bottom up. * */ --- 55,61 ---- * * Rob McCool 3/21/93 * ! * Thoroughly revamped by rst for Apache. NB this file reads * best from the bottom up. * */ *************** *** 497,503 **** * These do all access checks, etc., but don't actually run the transaction * ... use run_sub_req below for that. Also, be sure to use destroy_sub_req * as appropriate if you're likely to be creating more than a few of these. ! * (An early Shambhala version didn't destroy the sub_reqs used in directory * indexing. The result, when indexing a directory with 800-odd files in * it, was massively excessive storage allocation). * --- 497,503 ---- * These do all access checks, etc., but don't actually run the transaction * ... use run_sub_req below for that. Also, be sure to use destroy_sub_req * as appropriate if you're likely to be creating more than a few of these. ! * (An early Apache version didn't destroy the sub_reqs used in directory * indexing. The result, when indexing a directory with 800-odd files in * it, was massively excessive storage allocation). * 1.5 +2 -2 apache/src/rfc1413.c Index: rfc1413.c =================================================================== RCS file: /export/home/cvs/apache/src/rfc1413.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** rfc1413.c 1996/08/20 11:51:21 1.4 --- rfc1413.c 1996/11/03 20:52:11 1.5 *************** *** 50,56 **** * */ ! /* $Id: rfc1413.c,v 1.4 1996/08/20 11:51:21 paul Exp $ */ /* * rfc1413() speaks a common subset of the RFC 1413, AUTH, TAP and IDENT --- 50,56 ---- * */ ! /* $Id: rfc1413.c,v 1.5 1996/11/03 20:52:11 brian Exp $ */ /* * rfc1413() speaks a common subset of the RFC 1413, AUTH, TAP and IDENT *************** *** 64,70 **** * The Netherlands. */ ! /* Some small additions for Shambhala --- ditch the "sccsid" var if * compiling with gcc (it *has* changed), include conf.h for the * prototypes it defines on at least one system (SunlOSs) which has * them missing from the standard header files, and one minor change --- 64,70 ---- * The Netherlands. */ ! /* Some small additions for Apache --- ditch the "sccsid" var if * compiling with gcc (it *has* changed), include conf.h for the * prototypes it defines on at least one system (SunlOSs) which has * them missing from the standard header files, and one minor change 1.25 +1 -1 apache/src/util_script.c Index: util_script.c =================================================================== RCS file: /export/home/cvs/apache/src/util_script.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C3 -r1.24 -r1.25 *** util_script.c 1996/10/20 20:45:53 1.24 --- util_script.c 1996/11/03 20:52:12 1.25 *************** *** 175,181 **** table_set (e, "REMOTE_ADDR", c->remote_ip); table_set (e, "DOCUMENT_ROOT", document_root(r)); /* Apache */ table_set (e, "SERVER_ADMIN", s->server_admin); /* Apache */ ! table_set (e, "SCRIPT_FILENAME", r->filename); /* Shambhala */ if (c->user) table_set(e, "REMOTE_USER", c->user); if (c->auth_type) table_set(e, "AUTH_TYPE", c->auth_type); --- 175,181 ---- table_set (e, "REMOTE_ADDR", c->remote_ip); table_set (e, "DOCUMENT_ROOT", document_root(r)); /* Apache */ table_set (e, "SERVER_ADMIN", s->server_admin); /* Apache */ ! table_set (e, "SCRIPT_FILENAME", r->filename); /* Apache */ if (c->user) table_set(e, "REMOTE_USER", c->user); if (c->auth_type) table_set(e, "AUTH_TYPE", c->auth_type);