Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 15703 invoked by uid 6000); 17 Mar 1998 08:21:15 -0000 Received: (qmail 15697 invoked by alias); 17 Mar 1998 08:21:12 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 15695 invoked by uid 143); 17 Mar 1998 08:21:12 -0000 Date: 17 Mar 1998 08:21:12 -0000 Message-ID: <19980317082112.15694.qmail@hyperreal.org> From: dgaudet@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3/src/main alloc.c http_config.c http_core.c http_main.c http_protocol.c rfc1413.c util_date.c Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org dgaudet 98/03/17 00:21:11 Modified: src/helpers UpdateHide src/include http_config.h http_protocol.h http_request.h util_date.h src/main alloc.c http_config.c http_core.c http_main.c http_protocol.c rfc1413.c util_date.c Log: more cleanups, more statics, more exports Revision Changes Path 1.8 +1 -0 apache-1.3/src/helpers/UpdateHide Index: UpdateHide =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- UpdateHide 1998/03/12 13:52:05 1.7 +++ UpdateHide 1998/03/17 08:20:48 1.8 @@ -88,6 +88,7 @@ T:find_pool T:pool_is_ancestor T:pool_join + T:check_alarm ); # determine os-dependend stuff 1.76 +1 -2 apache-1.3/src/include/http_config.h Index: http_config.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- http_config.h 1998/03/17 07:54:11 1.75 +++ http_config.h 1998/03/17 08:20:50 1.76 @@ -325,7 +325,6 @@ void *create_request_config(pool *p); CORE_EXPORT(void *) create_per_dir_config(pool *p); void *merge_per_dir_configs(pool *p, void *base, void *new); -void *create_empty_config(pool *p); /* For http_core.c... ( command and virtual hosts) */ @@ -337,7 +336,7 @@ void process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp); /* check_cmd_context() definitions: */ -extern const char *check_cmd_context(cmd_parms *cmd, unsigned forbidden); +API_EXPORT(const char *) check_cmd_context(cmd_parms *cmd, unsigned forbidden); /* check_cmd_context(): Forbidden in: */ #define NOT_IN_VIRTUALHOST 0x01 /* */ 1.36 +1 -11 apache-1.3/src/include/http_protocol.h Index: http_protocol.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/http_protocol.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- http_protocol.h 1998/03/17 07:54:12 1.35 +++ http_protocol.h 1998/03/17 08:20:51 1.36 @@ -105,7 +105,7 @@ */ API_EXPORT(int) set_content_length(request_rec *r, long length); -int set_keepalive(request_rec *r); +API_EXPORT(int) set_keepalive(request_rec *r); API_EXPORT(time_t) rationalize_mtime(request_rec *r, time_t mtime); API_EXPORT(void) set_etag(request_rec *r); API_EXPORT(void) set_last_modified(request_rec *r); @@ -161,16 +161,6 @@ API_EXPORT(int) set_byterange(request_rec *r); API_EXPORT(int) each_byterange(request_rec *r, long *offset, long *length); - -/* Finally, this charming little number is here to encapsulate the - * degree to which nph- scripts completely escape from any discipline - * the protocol code might care to impose (this as opposed to other - * scripts, which *partially* escape to the extent that they may try - * to explicitly set the status line). - */ - -API_EXPORT(void) client_to_stdout(conn_rec *c); - /* Support for the Basic authentication protocol. Note that there's * nothing that prevents these from being in mod_auth.c, except that other 1.21 +0 -1 apache-1.3/src/include/http_request.h Index: http_request.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/http_request.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- http_request.h 1998/01/21 19:17:39 1.20 +++ http_request.h 1998/03/17 08:20:52 1.21 @@ -96,7 +96,6 @@ #ifdef CORE_PRIVATE /* Function called by main.c to handle first-level request */ void process_request(request_rec *); -int default_handler(request_rec *); void die(int type, request_rec *r); #endif 1.10 +1 -1 apache-1.3/src/include/util_date.h Index: util_date.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/util_date.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- util_date.h 1998/01/21 19:17:44 1.9 +++ util_date.h 1998/03/17 08:20:52 1.10 @@ -67,7 +67,7 @@ #define BAD_DATE (time_t)0 API_EXPORT(int) checkmask(const char *data, const char *mask); -time_t tm2sec(const struct tm *t); +API_EXPORT(time_t) tm2sec(const struct tm *t); API_EXPORT(time_t) parseHTTPdate(const char *date); #endif /* !APACHE_UTIL_DATE_H */ 1.79 +1 -1 apache-1.3/src/main/alloc.c Index: alloc.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- alloc.c 1998/03/17 07:54:16 1.78 +++ alloc.c 1998/03/17 08:20:55 1.79 @@ -376,7 +376,7 @@ #endif }; -pool *permanent_pool; +static pool *permanent_pool; /* 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...). 1.109 +1 -2 apache-1.3/src/main/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- http_config.c 1998/03/17 07:54:17 1.108 +++ http_config.c 1998/03/17 08:20:56 1.109 @@ -123,8 +123,7 @@ confv[m->module_index] = val; } -void * - create_empty_config(pool *p) +static void *create_empty_config(pool *p) { void **conf_vector = (void **) pcalloc(p, sizeof(void *) * (total_modules + DYNAMIC_MODULE_LIMIT)); 1.174 +2 -2 apache-1.3/src/main/http_core.c Index: http_core.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- http_core.c 1998/03/17 07:54:18 1.173 +++ http_core.c 1998/03/17 08:20:57 1.174 @@ -652,7 +652,7 @@ static const char end_ifmodule_section[] = ""; -const char *check_cmd_context(cmd_parms *cmd, unsigned forbidden) +API_EXPORT(const char *) check_cmd_context(cmd_parms *cmd, unsigned forbidden) { const char *gt = (cmd->cmd->name[0] == '<' && cmd->cmd->name[strlen(cmd->cmd->name)-1] != '>') ? ">" : ""; @@ -2036,7 +2036,7 @@ * the last handler called and return 405 or 501. */ -int default_handler (request_rec *r) +static int default_handler (request_rec *r) { core_dir_config *d = (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 1.307 +7 -9 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- http_main.c 1998/03/17 07:54:20 1.306 +++ http_main.c 1998/03/17 08:20:59 1.307 @@ -268,12 +268,12 @@ /* *Non*-shared http_main globals... */ -server_rec *server_conf; -JMP_BUF APACHE_TLS jmpbuffer; -int sd; +static server_rec *server_conf; +static JMP_BUF APACHE_TLS jmpbuffer; +static int sd; static fd_set listenfds; static int listenmaxfd; -pid_t pgrp; +static pid_t pgrp; /* one_process --- debugging mode variable; can be set from the command line * with the -X flag. If set, this gets you the child_main loop running @@ -315,7 +315,7 @@ static pool *pchild; /* Pool for httpd child stuff */ static pool *pcommands; /* Pool for -C and -c switches */ -int APACHE_TLS my_pid; /* it seems silly to call getpid all the time */ +static int APACHE_TLS my_pid; /* it seems silly to call getpid all the time */ #ifndef MULTITHREAD static int my_child_num; #endif @@ -972,9 +972,9 @@ } +#ifdef WIN32 int check_alarm(void) { -#ifdef WIN32 if (alarm_expiry_time) { unsigned int t; @@ -990,10 +990,8 @@ } else return (0); -#else - return (0); -#endif /* WIN32 */ } +#endif /* WIN32 */ 1.200 +1 -12 apache-1.3/src/main/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- http_protocol.c 1998/03/17 07:54:21 1.199 +++ http_protocol.c 1998/03/17 08:21:01 1.200 @@ -264,7 +264,7 @@ return 0; } -int set_keepalive(request_rec *r) +API_EXPORT(int) set_keepalive(request_rec *r) { int ka_sent = 0; int wimpy = find_token(r->pool, @@ -2133,15 +2133,4 @@ } kill_timeout(r); finalize_request_protocol(r); -} - -/* Finally, this... it's here to support nph- scripts - * Now what ever are we going to do about them when HTTP-NG packetization - * comes along? - */ - -API_EXPORT(void) client_to_stdout(conn_rec *c) -{ - bflush(c->client); - dup2(c->client->fd, STDOUT_FILENO); } 1.20 +1 -1 apache-1.3/src/main/rfc1413.c Index: rfc1413.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rfc1413.c 1998/01/07 16:46:20 1.19 +++ rfc1413.c 1998/03/17 08:21:03 1.20 @@ -94,7 +94,7 @@ int rfc1413_timeout = RFC1413_TIMEOUT; /* Global so it can be changed */ -JMP_BUF timebuf; +static JMP_BUF timebuf; /* bind_connect - bind both ends of a socket */ /* Ambarish fix this. Very broken */ 1.9 +1 -1 apache-1.3/src/main/util_date.c Index: util_date.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/util_date.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- util_date.c 1998/01/07 16:46:22 1.8 +++ util_date.c 1998/03/17 08:21:05 1.9 @@ -132,7 +132,7 @@ * * This routine is intended to be very fast, much faster than mktime(). */ -time_t tm2sec(const struct tm * t) +API_EXPORT(time_t) tm2sec(const struct tm * t) { int year; time_t days;