You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Dean Gaudet <dg...@hyperreal.org> on 1997/09/16 02:25:51 UTC
cvs commit: apachen/src/main conf.h httpd.h scoreboard.h
dgaudet 97/09/15 17:25:50
Modified: src INDENT
src/main conf.h httpd.h scoreboard.h
Log:
indent
Revision Changes Path
1.19 +8 -8 apachen/src/INDENT
Index: INDENT
===================================================================
RCS file: /export/home/cvs/apachen/src/INDENT,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- INDENT 1997/09/16 00:17:55 1.18
+++ INDENT 1997/09/16 00:25:43 1.19
@@ -8,14 +8,14 @@
alloc.h DONE by Dean
buff.c DONE by Dean
buff.h DONE by Dean
- conf.h RESERVED by Dean
+ conf.h DONe by Dean
dummy.c
explain.c
explain.h
- fnmatch.c
- fnmatch.h
+ fnmatch.c RESERVED by Dean
+ fnmatch.h RESERVED by Dean
http_bprintf.c
- http_conf_globals.h RESERVED by Dean
+ http_conf_globals.h DONe by Dean
http_config.c DONE by Dean
http_config.h DONE by Dean
http_core.c RESERVED by Randy
@@ -28,13 +28,13 @@
http_protocol.h DONE by Roy
http_request.c DONE by Roy
http_request.h DONE by Roy
- httpd.h RESERVED by Dean
+ httpd.h DONe by Dean
md5.h
md5c.c
multithread.h
- rfc1413.c
- rfc1413.h
- scoreboard.h RESERVED by Dean
+ rfc1413.c RESERVED by Dean
+ rfc1413.h RESERVED by Dean
+ scoreboard.h DONE by Dean
util.c DONE by Randy
util_date.c DONE by Randy
util_date.h DONE by Randy
1.139 +75 -75 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- conf.h 1997/09/14 11:53:35 1.138
+++ conf.h 1997/09/16 00:25:45 1.139
@@ -93,7 +93,7 @@
#define JMP_BUF sigjmp_buf
#define HAVE_MMAP
#define USE_MMAP_FILES
-#include <sys/time.h>
+#include <sys/time.h>
#define NEED_STRERROR
typedef int rlim_t;
#define memmove(a,b,c) bcopy(b,a,c)
@@ -109,8 +109,8 @@
#define HAVE_SYS_RESOURCE_H
#define bzero(a,b) memset(a,0,b)
#define JMP_BUF sigjmp_buf
-/*#define USE_FCNTL_SERIALIZED_ACCEPT*/
-/*#define USE_SYSVSEM_SERIALIZED_ACCEPT*/
+/*#define USE_FCNTL_SERIALIZED_ACCEPT */
+/*#define USE_SYSVSEM_SERIALIZED_ACCEPT */
#if SOLARIS2 < 250
#define USE_FCNTL_SERIALIZED_ACCEPT
#else
@@ -130,7 +130,7 @@
#define NO_KILLPG
#undef NO_SETSID
#define JMP_BUF sigjmp_buf
-/*#define USE_FCNTL_SERIALIZED_ACCEPT*/
+/*#define USE_FCNTL_SERIALIZED_ACCEPT */
#define USE_SYSVSEM_SERIALIZED_ACCEPT
#define HAVE_SHMGET
#define USE_MMAP_FILES
@@ -197,8 +197,8 @@
#define ULTRIX_BRAIN_DEATH
#define NEED_STRDUP
/* If you have Ultrix 4.3, and are using cc, const is broken */
-#ifndef __ultrix__ /* Hack to check for pre-Ultrix 4.4 cc */
-#define const /* Not implemented */
+#ifndef __ultrix__ /* Hack to check for pre-Ultrix 4.4 cc */
+#define const /* Not implemented */
#endif
#define JMP_BUF sigjmp_buf
#define HAVE_SYSLOG
@@ -281,7 +281,7 @@
#ifndef rlim_t
typedef int rlim_t;
#endif
-typedef u_long n_long;
+typedef u_long n_long;
#endif
#define STDIN_FILENO 0
@@ -316,7 +316,7 @@
#undef NO_SETSID
#undef NEED_STRDUP
#define JMP_BUF sigjmp_buf
-#include <sys/time.h>
+#include <sys/time.h>
#define HAVE_SYSLOG
#elif defined(SCO)
@@ -326,8 +326,8 @@
#define NEED_INITGROUPS
#define NO_WRITEV
#define JMP_BUF sigjmp_buf
-#define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */
-#include <sys/time.h>
+#define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */
+#include <sys/time.h>
#define HAVE_SYSLOG
#elif defined(SCO5)
@@ -343,22 +343,22 @@
#define HAVE_SYSLOG
/* Although SCO 5 defines these in <strings.h> (note the "s") they don't have
-consts. Sigh. */
-extern int strcasecmp(const char *,const char *);
-extern int strncasecmp(const char *,const char *,unsigned);
+ consts. Sigh. */
+extern int strcasecmp(const char *, const char *);
+extern int strncasecmp(const char *, const char *, unsigned);
#elif defined(AUX)
/* These are to let -Wall compile more cleanly */
extern int strcasecmp(const char *, const char *);
-extern int strncasecmp(const char *,const char *,unsigned);
+extern int strncasecmp(const char *, const char *, unsigned);
extern int set42sig(), getopt(), getpeername(), bzero();
extern int listen(), bind(), socket(), getsockname();
extern int accept(), gethostname(), connect(), lstat();
extern int select(), killpg(), shutdown();
extern int initgroups(), setsockopt();
extern char *shmat();
-extern int shmctl();
-extern int shmget();
+extern int shmctl();
+extern int shmget();
extern char *sbrk();
extern char *crypt();
#include <sys/time.h>
@@ -492,7 +492,7 @@
char *crypt(const char *pw, const char *salt);
#endif
#ifndef initgroups
-int initgroups (char *, int);
+int initgroups(char *, int);
#endif
#ifndef strncasecmp
#define strncasecmp strnicmp
@@ -532,7 +532,7 @@
#define USE_MMAP_FILES
#define HAVE_CRYPT_H
#define HAVE_SYSLOG
-
+
#elif defined(__EMX__)
/* Defines required for EMX OS/2 port. */
#define JMP_BUF sigjmp_buf
@@ -543,11 +543,11 @@
#define NO_TIMES
/* Add some drive name support */
#define chdir _chdir2
-#include <sys/time.h>
+#include <sys/time.h>
#define MAXSOCKETS 4096
#define HAVE_MMAP
#define NO_RELIABLE_PIPED_LOGS
-
+
#elif defined(__MACHTEN__)
typedef int rlim_t;
#define JMP_BUF sigjmp_buf
@@ -584,7 +584,7 @@
typedef int rlim_t;
#elif defined(ISC)
-#include <net/errno.h>
+#include <net/errno.h>
#define NO_KILLPG
#undef NO_SETSID
#define HAVE_SHMGET
@@ -628,13 +628,13 @@
#define NO_KILLPG
#define NEED_INITGROUPS
-/* BeOS doesn't have a couple signals... redefine to close ones*/
+/* BeOS doesn't have a couple signals... redefine to close ones */
#define SIGBUS SIGSEGV
#define SIGURG SIGPIPE
#define isascii(c) (!((c) & ~0177))
-#elif defined(WIN32)
+#elif defined(WIN32)
/* All windows stuff is now in os/win32/os.h */
@@ -726,7 +726,7 @@
#include <netdb.h>
#include <sys/ioctl.h>
#if !defined(MPE) && !defined(BEOS)
-#include <arpa/inet.h> /* for inet_ntoa */
+#include <arpa/inet.h> /* for inet_ntoa */
#endif
#include <sys/wait.h>
#include <pwd.h>
@@ -745,7 +745,7 @@
#include <fcntl.h>
#endif /* ndef WIN32 */
-#include <time.h> /* for ctime */
+#include <time.h> /* for ctime */
#include <signal.h>
#include <errno.h>
#if !defined(QNX) && !defined(CONVEXOS11) && !defined(NEXT)
@@ -762,8 +762,8 @@
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#ifdef SUNOS4
-int getrlimit( int, struct rlimit *);
-int setrlimit( int, struct rlimit *);
+int getrlimit(int, struct rlimit *);
+int setrlimit(int, struct rlimit *);
#endif
#endif
#ifdef HAVE_MMAP
@@ -820,7 +820,7 @@
#undef signal
#endif
#define signal(s,f) ap_signal(s,f)
-Sigfunc *signal(int signo, Sigfunc *func);
+Sigfunc *signal(int signo, Sigfunc * func);
#endif
#include <setjmp.h>
@@ -866,13 +866,13 @@
#define XtOffset(p_type,field) \
(sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
-#else /* !CRAY2 */
+#else /* !CRAY2 */
#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
-#endif /* !CRAY2 */
-#endif /* __STDC__ */
-#else /* ! (CRAY || __arm) */
+#endif /* !CRAY2 */
+#endif /* __STDC__ */
+#else /* ! (CRAY || __arm) */
#define XtOffset(p_type,field) \
((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
@@ -899,52 +899,52 @@
* Sun Quality Software. Gotta love it.
*/
-int getopt (int, char **, char *);
+int getopt(int, char **, char *);
-int strcasecmp (char *, char *);
-int strncasecmp (char *, char *, int);
+int strcasecmp(char *, char *);
+int strncasecmp(char *, char *, int);
int toupper(int);
-int tolower(int);
-
-int printf (char *, ...);
-int fprintf (FILE *, char *, ...);
-int fputs (char *, FILE *);
-int fread (char *, int, int, FILE *);
-int fwrite (char *, int, int, FILE *);
-int fflush (FILE *);
-int fclose (FILE *);
-int ungetc (int, FILE *);
-int _filbuf (FILE *); /* !!! */
-int _flsbuf (unsigned char, FILE *); /* !!! */
-int sscanf (char *, char *, ...);
-void setbuf (FILE *, char *);
-void perror (char *);
-
-time_t time (time_t *);
-int strftime (char *, int, char *, struct tm *);
-
-int initgroups (char *, int);
-int wait3 (int *, int, void*); /* Close enough for us... */
-int lstat (const char *, struct stat *);
-int stat (const char *, struct stat *);
-int flock (int, int);
+int tolower(int);
+
+int printf(char *,...);
+int fprintf(FILE *, char *,...);
+int fputs(char *, FILE *);
+int fread(char *, int, int, FILE *);
+int fwrite(char *, int, int, FILE *);
+int fflush(FILE *);
+int fclose(FILE *);
+int ungetc(int, FILE *);
+int _filbuf(FILE *); /* !!! */
+int _flsbuf(unsigned char, FILE *); /* !!! */
+int sscanf(char *, char *,...);
+void setbuf(FILE *, char *);
+void perror(char *);
+
+time_t time(time_t *);
+int strftime(char *, int, char *, struct tm *);
+
+int initgroups(char *, int);
+int wait3(int *, int, void *); /* Close enough for us... */
+int lstat(const char *, struct stat *);
+int stat(const char *, struct stat *);
+int flock(int, int);
#ifndef NO_KILLPG
int killpg(int, int);
#endif
-int socket (int, int, int);
-int setsockopt (int, int, int, const char*, int);
-int listen (int, int);
-int bind (int, struct sockaddr *, int);
-int connect (int, struct sockaddr *, int);
-int accept (int, struct sockaddr *, int *);
-int shutdown (int, int);
-
-int getsockname (int s, struct sockaddr *name, int *namelen);
-int getpeername (int s, struct sockaddr *name, int *namelen);
-int gethostname (char *name, int namelen);
-void syslog (int, char *, ...);
-char *mktemp (char *);
-
-long vfprintf (FILE *, char *, va_list);
-
+int socket(int, int, int);
+int setsockopt(int, int, int, const char *, int);
+int listen(int, int);
+int bind(int, struct sockaddr *, int);
+int connect(int, struct sockaddr *, int);
+int accept(int, struct sockaddr *, int *);
+int shutdown(int, int);
+
+int getsockname(int s, struct sockaddr *name, int *namelen);
+int getpeername(int s, struct sockaddr *name, int *namelen);
+int gethostname(char *name, int namelen);
+void syslog(int, char *,...);
+char *mktemp(char *);
+
+long vfprintf(FILE *, char *, va_list);
+
#endif /* SUNOS_LIB_PROTOTYPES */
1.149 +190 -191 apachen/src/main/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- httpd.h 1997/09/12 22:38:59 1.148
+++ httpd.h 1997/09/16 00:25:46 1.149
@@ -67,7 +67,7 @@
*/
#ifndef HTTPD_ROOT
#ifdef __EMX__
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define HTTPD_ROOT "/os2httpd"
#elif defined(WIN32)
/* Set default for Windows file system */
@@ -80,7 +80,7 @@
/* Root of server */
#ifndef DOCUMENT_LOCATION
#ifdef __EMX__
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define DOCUMENT_LOCATION "/os2httpd/docs"
#else
#define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
@@ -121,7 +121,7 @@
/* The name of the log files */
#ifndef DEFAULT_XFERLOG
#ifdef __EMX__
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define DEFAULT_XFERLOG "logs/access.log"
#else
#define DEFAULT_XFERLOG "logs/access_log"
@@ -130,7 +130,7 @@
#ifndef DEFAULT_ERRORLOG
#ifdef __EMX__
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define DEFAULT_ERRORLOG "logs/error.log"
#else
#define DEFAULT_ERRORLOG "logs/error_log"
@@ -166,7 +166,7 @@
/* Define this to be what your per-directory security files are called */
#ifndef DEFAULT_ACCESS_FNAME
#ifdef __EMX__
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define DEFAULT_ACCESS_FNAME "htaccess"
#else
#define DEFAULT_ACCESS_FNAME ".htaccess"
@@ -210,7 +210,7 @@
/* The path to the Bourne shell, for parsed docs */
#ifndef SHELL_PATH
#if defined(__EMX__) || defined(WIN32)
-/* Set default for OS/2 file system */
+/* Set default for OS/2 file system */
#define SHELL_PATH "CMD.EXE"
#else
#define SHELL_PATH "/bin/sh"
@@ -355,7 +355,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/1.3b1-dev" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/1.3b1-dev" /* SEE COMMENTS ABOVE */
#ifdef SERVER_SUBVERSION
#define SERVER_VERSION SERVER_BASEVERSION " " SERVER_SUBVERSION
#else
@@ -374,9 +374,9 @@
#endif
#define DECLINED -1 /* Module declines to handle */
-#define DONE -2 /* Module has served the response completely
- * - it's safe to die() with no more output
- */
+#define DONE -2 /* Module has served the response completely
+ * - it's safe to die() with no more output
+ */
#define OK 0 /* Module has handled this stage. */
@@ -507,11 +507,10 @@
/* This represents the result of calling htaccess; these are cached for
* each request.
*/
-struct htaccess_result
-{
- char *dir; /* the directory to which this applies */
- int override; /* the overrides allowed for the .htaccess file */
- void *htaccess; /* the configuration directives */
+struct htaccess_result {
+ char *dir; /* the directory to which this applies */
+ int override; /* the overrides allowed for the .htaccess file */
+ void *htaccess; /* the configuration directives */
/* the next one, or NULL if no more; N.B. never change this */
const struct htaccess_result *next;
};
@@ -523,110 +522,110 @@
struct request_rec {
- pool *pool;
- conn_rec *connection;
- server_rec *server;
+ pool *pool;
+ conn_rec *connection;
+ server_rec *server;
- request_rec *next; /* If we wind up getting redirected,
+ request_rec *next; /* If we wind up getting redirected,
* pointer to the request we redirected to.
*/
- request_rec *prev; /* If this is an internal redirect,
+ request_rec *prev; /* If this is an internal redirect,
* pointer to where we redirected *from*.
*/
-
- request_rec *main; /* If this is a sub_request (see request.h)
+
+ request_rec *main; /* If this is a sub_request (see request.h)
* pointer back to the main request.
*/
- /* Info about the request itself... we begin with stuff that only
- * protocol.c should ever touch...
- */
-
- char *the_request; /* First line of request, so we can log it */
- int assbackwards; /* HTTP/0.9, "simple" request */
- int proxyreq; /* A proxy request */
- int header_only; /* HEAD request, as opposed to GET */
- char *protocol; /* Protocol, as given to us, or HTTP/0.9 */
- int proto_num; /* Number version of protocol; 1.1 = 1001 */
- char *hostname; /* Host, as set by full URI or Host: */
- int hostlen; /* Length of http://host:port in full URI */
-
- time_t request_time; /* When the request started */
-
- char *status_line; /* Status line, if set by script */
- int status; /* In any case */
-
- /* Request method, two ways; also, protocol, etc.. Outside of protocol.c,
- * look, but don't touch.
- */
-
- char *method; /* GET, HEAD, POST, etc. */
- int method_number; /* M_GET, M_POST, etc. */
- int allowed; /* Allowed methods - for 405, OPTIONS, etc */
-
- int sent_bodyct; /* byte count in stream is for body */
- long bytes_sent; /* body byte count, for easy access */
- time_t mtime; /* Time the resource was last modified */
-
- /* HTTP/1.1 connection-level features */
-
- int chunked; /* sending chunked transfer-coding */
- int byterange; /* number of byte ranges */
- char *boundary; /* multipart/byteranges boundary */
- char *range; /* The Range: header */
- long clength; /* The "real" content length */
-
- long remaining; /* bytes left to read */
- long read_length; /* bytes that have been read */
- int read_body; /* how the request body should be read */
- int read_chunked; /* reading chunked transfer-coding */
-
- /* MIME header environments, in and out. Also, an array containing
- * environment variables to be passed to subprocesses, so people can
- * write modules to add to that environment.
- *
- * The difference between headers_out and err_headers_out is that the
- * latter are printed even on error, and persist across internal redirects
- * (so the headers printed for ErrorDocument handlers will have them).
- *
- * The 'notes' table is for notes from one module to another, with no
- * other set purpose in mind...
- */
-
- table *headers_in;
- table *headers_out;
- table *err_headers_out;
- table *subprocess_env;
- table *notes;
-
- char *content_type; /* Break these out --- we dispatch on 'em */
- char *handler; /* What we *really* dispatch on */
-
- char *content_encoding;
- char *content_language; /* for back-compat. only -- do not use */
- array_header *content_languages; /* array of (char*) */
-
- int no_cache;
- int no_local_copy;
-
- /* What object is being requested (either directly, or via include
- * or content-negotiation mapping).
- */
-
- char *uri; /* complete URI for a proxy req, or
- URL path for a non-proxy req */
- char *filename;
- char *path_info;
- char *args; /* QUERY_ARGS, if any */
- struct stat finfo; /* ST_MODE set to zero if no such file */
-
- /* Various other config info which may change with .htaccess files
- * These are config vectors, with one void* pointer for each module
- * (the thing pointed to being the module's business).
- */
-
- void *per_dir_config; /* Options set in config files, etc. */
- void *request_config; /* Notes on *this* request */
+ /* Info about the request itself... we begin with stuff that only
+ * protocol.c should ever touch...
+ */
+
+ char *the_request; /* First line of request, so we can log it */
+ int assbackwards; /* HTTP/0.9, "simple" request */
+ int proxyreq; /* A proxy request */
+ int header_only; /* HEAD request, as opposed to GET */
+ char *protocol; /* Protocol, as given to us, or HTTP/0.9 */
+ int proto_num; /* Number version of protocol; 1.1 = 1001 */
+ char *hostname; /* Host, as set by full URI or Host: */
+ int hostlen; /* Length of http://host:port in full URI */
+
+ time_t request_time; /* When the request started */
+
+ char *status_line; /* Status line, if set by script */
+ int status; /* In any case */
+
+ /* Request method, two ways; also, protocol, etc.. Outside of protocol.c,
+ * look, but don't touch.
+ */
+
+ char *method; /* GET, HEAD, POST, etc. */
+ int method_number; /* M_GET, M_POST, etc. */
+ int allowed; /* Allowed methods - for 405, OPTIONS, etc */
+
+ int sent_bodyct; /* byte count in stream is for body */
+ long bytes_sent; /* body byte count, for easy access */
+ time_t mtime; /* Time the resource was last modified */
+
+ /* HTTP/1.1 connection-level features */
+
+ int chunked; /* sending chunked transfer-coding */
+ int byterange; /* number of byte ranges */
+ char *boundary; /* multipart/byteranges boundary */
+ char *range; /* The Range: header */
+ long clength; /* The "real" content length */
+
+ long remaining; /* bytes left to read */
+ long read_length; /* bytes that have been read */
+ int read_body; /* how the request body should be read */
+ int read_chunked; /* reading chunked transfer-coding */
+
+ /* MIME header environments, in and out. Also, an array containing
+ * environment variables to be passed to subprocesses, so people can
+ * write modules to add to that environment.
+ *
+ * The difference between headers_out and err_headers_out is that the
+ * latter are printed even on error, and persist across internal redirects
+ * (so the headers printed for ErrorDocument handlers will have them).
+ *
+ * The 'notes' table is for notes from one module to another, with no
+ * other set purpose in mind...
+ */
+
+ table *headers_in;
+ table *headers_out;
+ table *err_headers_out;
+ table *subprocess_env;
+ table *notes;
+
+ char *content_type; /* Break these out --- we dispatch on 'em */
+ char *handler; /* What we *really* dispatch on */
+
+ char *content_encoding;
+ char *content_language; /* for back-compat. only -- do not use */
+ array_header *content_languages; /* array of (char*) */
+
+ int no_cache;
+ int no_local_copy;
+
+ /* What object is being requested (either directly, or via include
+ * or content-negotiation mapping).
+ */
+
+ char *uri; /* complete URI for a proxy req, or
+ URL path for a non-proxy req */
+ char *filename;
+ char *path_info;
+ char *args; /* QUERY_ARGS, if any */
+ struct stat finfo; /* ST_MODE set to zero if no such file */
+
+ /* Various other config info which may change with .htaccess files
+ * These are config vectors, with one void* pointer for each module
+ * (the thing pointed to being the module's business).
+ */
+
+ void *per_dir_config; /* Options set in config files, etc. */
+ void *request_config; /* Notes on *this* request */
/*
* a linked list of the configuration directives in the .htaccess files
@@ -634,7 +633,7 @@
* N.B. always add to the head of the list, _never_ to the end.
* that way, a sub request's list can (temporarily) point to a parent's list
*/
- const struct htaccess_result *htaccess;
+ const struct htaccess_result *htaccess;
};
@@ -642,42 +641,42 @@
*/
struct conn_rec {
-
- pool *pool;
- server_rec *server;
- server_rec *base_server; /* Physical vhost this conn come in on */
-
- /* Information about the connection itself */
-
- int child_num; /* The number of the child handling conn_rec */
- BUFF *client; /* Connection to the guy */
-
- /* Who is the client? */
-
- struct sockaddr_in local_addr; /* local address */
- struct sockaddr_in remote_addr;/* remote address */
- char *remote_ip; /* Client's IP address */
- char *remote_host; /* Client's DNS name, if known.
- * NULL if DNS hasn't been checked,
- * "" if it has and no address was found.
- * N.B. Only access this though
+
+ pool *pool;
+ server_rec *server;
+ server_rec *base_server; /* Physical vhost this conn come in on */
+
+ /* Information about the connection itself */
+
+ int child_num; /* The number of the child handling conn_rec */
+ BUFF *client; /* Connection to the guy */
+
+ /* Who is the client? */
+
+ struct sockaddr_in local_addr; /* local address */
+ struct sockaddr_in remote_addr; /* remote address */
+ char *remote_ip; /* Client's IP address */
+ char *remote_host; /* Client's DNS name, if known.
+ * NULL if DNS hasn't been checked,
+ * "" if it has and no address was found.
+ * N.B. Only access this though
* get_remote_host() */
- char *remote_logname; /* Only ever set if doing rfc1413 lookups.
- * N.B. Only access this through
+ char *remote_logname; /* Only ever set if doing rfc1413 lookups.
+ * N.B. Only access this through
* get_remote_logname() */
- char *user; /* If an authentication check was made,
+ char *user; /* If an authentication check was made,
* this gets set to the user name. We assume
* that there's only one user per connection(!)
*/
- char *auth_type; /* Ditto. */
+ char *auth_type; /* Ditto. */
- unsigned aborted : 1; /* Are we still talking? */
- int keepalive : 2; /* Are we using HTTP Keep-Alive?
- * -1 fatal error, 0 undecided, 1 yes */
- unsigned keptalive : 1; /* Did we use HTTP Keep-Alive? */
- int double_reverse : 2; /* have we done double-reverse DNS?
+ unsigned aborted:1; /* Are we still talking? */
+ int keepalive:2; /* Are we using HTTP Keep-Alive?
+ * -1 fatal error, 0 undecided, 1 yes */
+ unsigned keptalive:1; /* Did we use HTTP Keep-Alive? */
+ int double_reverse:2; /* have we done double-reverse DNS?
* -1 yes/failure, 0 not yet, 1 yes/success */
- int keepalives; /* How many times have we used it? */
+ int keepalives; /* How many times have we used it? */
};
/* Per-vhost config... */
@@ -691,7 +690,7 @@
struct server_addr_rec {
server_addr_rec *next;
struct in_addr host_addr; /* The bound address, for this server */
- unsigned short host_port; /* The bound port, for this server */
+ unsigned short host_port; /* The bound port, for this server */
char *virthost; /* The name given in <VirtualHost> */
};
@@ -703,33 +702,33 @@
server_rec_chain *next;
server_rec *server;
server_addr_rec *sar; /* the record causing it to be in
- * this chain */
+ * this chain */
};
struct server_rec {
server_rec *next;
-
+
/* Full locations of server config info */
-
+
char *srm_confname;
char *access_confname;
-
+
/* Contact information */
-
+
char *server_admin;
char *server_hostname;
- unsigned short port; /* for redirects, etc. */
-
+ unsigned short port; /* for redirects, etc. */
+
/* Log files --- note that transfer log is now in the modules... */
-
+
char *error_fname;
FILE *error_log;
int loglevel;
-
+
/* Module-specific configuration for server, and defaults... */
- int is_virtual; /* true if this is the virtual server */
+ int is_virtual; /* true if this is the virtual server */
void *module_config; /* Config vector containing pointers to
* modules' per-server config structures.
*/
@@ -743,7 +742,7 @@
int keep_alive_timeout; /* Seconds we'll wait for another request */
int keep_alive_max; /* Maximum requests per connection */
int keep_alive; /* Use persistent connections? */
- int send_buffer_size; /* size of TCP send buffer (in bytes) */
+ int send_buffer_size; /* size of TCP send buffer (in bytes) */
char *path; /* Pathname for ServerPath */
int pathlen; /* Length of path */
@@ -757,9 +756,9 @@
/* These are more like real hosts than virtual hosts */
struct listen_rec {
listen_rec *next;
- struct sockaddr_in local_addr; /* local IP address and port */
+ struct sockaddr_in local_addr; /* local IP address and port */
int fd;
- int used; /* Only used during restart */
+ int used; /* Only used during restart */
/* more stuff here, like which protocol is bound to the port */
};
@@ -771,81 +770,81 @@
API_EXPORT(struct tm *) get_gmtoff(int *tz);
API_EXPORT(char *) get_time(void);
-API_EXPORT(char *) ht_time (pool *p, time_t t, const char *fmt, int gmt);
+API_EXPORT(char *) ht_time(pool *p, time_t t, const char *fmt, int gmt);
API_EXPORT(char *) gm_timestr_822(pool *p, time_t t);
-
+
/* String handling. The *_nc variants allow you to use non-const char **s as
-arguments (unfortunately C won't automatically convert a char ** to a const
-char **) */
-
+ arguments (unfortunately C won't automatically convert a char ** to a const
+ char **) */
+
API_EXPORT(char *) getword(pool *p, const char **line, char stop);
API_EXPORT(char *) getword_nc(pool *p, char **line, char stop);
API_EXPORT(char *) getword_white(pool *p, const char **line);
API_EXPORT(char *) getword_white_nc(pool *p, char **line);
-API_EXPORT(char *) getword_nulls (pool *p, const char **line, char stop);
-API_EXPORT(char *) getword_nulls_nc (pool *p, char **line, char stop);
-API_EXPORT(char *) getword_conf (pool *p, const char **line);
-API_EXPORT(char *) getword_conf_nc (pool *p, char **line);
-
-API_EXPORT(char *) get_token (pool *p, char **accept_line, int accept_white);
-API_EXPORT(int) find_token (pool *p, const char *line, const char *tok);
-API_EXPORT(int) find_last_token (pool *p, const char *line, const char *tok);
-
+API_EXPORT(char *) getword_nulls(pool *p, const char **line, char stop);
+API_EXPORT(char *) getword_nulls_nc(pool *p, char **line, char stop);
+API_EXPORT(char *) getword_conf(pool *p, const char **line);
+API_EXPORT(char *) getword_conf_nc(pool *p, char **line);
+
+API_EXPORT(char *) get_token(pool *p, char **accept_line, int accept_white);
+API_EXPORT(int) find_token(pool *p, const char *line, const char *tok);
+API_EXPORT(int) find_last_token(pool *p, const char *line, const char *tok);
+
API_EXPORT(int) is_url(const char *u);
API_EXPORT(int) unescape_url(char *url);
API_EXPORT(void) no2slash(char *name);
API_EXPORT(void) getparents(char *name);
API_EXPORT(char *) escape_path_segment(pool *p, const char *s);
-API_EXPORT(char *) os_escape_path(pool *p,const char *path,int partial);
+API_EXPORT(char *) os_escape_path(pool *p, const char *path, int partial);
#define escape_uri(ppool,path) os_escape_path(ppool,path,1)
API_EXPORT(char *) escape_html(pool *p, const char *s);
API_EXPORT(char *) construct_server(pool *p, const char *hostname,
unsigned port);
-API_EXPORT(char *) construct_url (pool *p, const char *path,
- const server_rec *s);
-API_EXPORT(char *) escape_shell_cmd (pool *p, const char *s);
-
+API_EXPORT(char *) construct_url(pool *p, const char *path,
+ const server_rec *s);
+API_EXPORT(char *) escape_shell_cmd(pool *p, const char *s);
+
API_EXPORT(int) count_dirs(const char *path);
-API_EXPORT(char *) make_dirstr_prefix (char *d, const char *s, int n);
-API_EXPORT(char *) make_dirstr_parent (pool *p, const char *s);
+API_EXPORT(char *) make_dirstr_prefix(char *d, const char *s, int n);
+API_EXPORT(char *) make_dirstr_parent(pool *p, const char *s);
/* deprecated. The previous two routines are preferred. */
API_EXPORT(char *) make_dirstr(pool *a, const char *s, int n);
API_EXPORT(char *) make_full_path(pool *a, const char *dir, const char *f);
-
+
API_EXPORT(int) is_matchexp(const char *str);
API_EXPORT(int) strcmp_match(const char *str, const char *exp);
API_EXPORT(int) strcasecmp_match(const char *str, const char *exp);
-API_EXPORT(char *) uudecode (pool *, const char *);
+API_EXPORT(char *) uudecode(pool *, const char *);
API_EXPORT(char *) pregsub(pool *p, const char *input, const char *source,
- size_t nmatch, regmatch_t pmatch[]);
+ size_t nmatch, regmatch_t pmatch[]);
-API_EXPORT(void) str_tolower (char *);
-API_EXPORT(int) ind (const char *, char); /* Sigh... */
-API_EXPORT(int) rind (const char *, char);
+API_EXPORT(void) str_tolower(char *);
+API_EXPORT(int) ind(const char *, char); /* Sigh... */
+API_EXPORT(int) rind(const char *, char);
API_EXPORT(int) cfg_getline(char *s, int n, FILE *f);
#ifdef NEED_STRERROR
-char *strerror (int err);
+char *strerror(int err);
#endif
/* Misc system hackery */
-
+
API_EXPORT(uid_t) uname2id(const char *name);
API_EXPORT(gid_t) gname2id(const char *name);
API_EXPORT(int) is_directory(const char *name);
-API_EXPORT(int) can_exec(const struct stat *);
+API_EXPORT(int) can_exec(const struct stat *);
API_EXPORT(void) chdir_file(const char *file);
#ifndef HAVE_CANONICAL_FILENAME
#define os_canonical_filename(p,f) (f)
#else
-API_EXPORT(char *)os_canonical_filename(pool *p,const char *file);
+API_EXPORT(char *) os_canonical_filename(pool *p, const char *file);
#endif
-
+
char *get_local_host(pool *);
-unsigned long get_virthost_addr (const char *hostname, unsigned short *port);
+unsigned long get_virthost_addr(const char *hostname, unsigned short *port);
extern API_VAR_EXPORT time_t restart_time;
@@ -865,7 +864,7 @@
#ifndef LOW_SLACK_LINE
#define LOW_SLACK_LINE 15
#endif
-/* #define HIGH_SLACK_LINE 255 */
+/* #define HIGH_SLACK_LINE 255 */
/*
* The ap_slack() function takes a fd, and tries to move it above the indicated
@@ -876,7 +875,7 @@
#ifdef NO_SLACK
#define ap_slack(fd,line) (fd)
#else
-int ap_slack (int fd, int line);
+int ap_slack(int fd, int line);
#define AP_SLACK_LOW 1
#define AP_SLACK_HIGH 2
#endif
@@ -884,7 +883,7 @@
/*
* Redefine assert() to something more useful for an Apache...
*/
-API_EXPORT(void) log_assert(const char *szExp,const char *szFile,int nLine);
+API_EXPORT(void) log_assert(const char *szExp, const char *szFile, int nLine);
#define ap_assert(exp) (void)( (exp) || (log_assert(#exp, __FILE__, __LINE__), 0) )
/* The optimized timeout code only works if we're not MULTITHREAD and we're
1.32 +15 -17 apachen/src/main/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/scoreboard.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scoreboard.h 1997/09/13 23:10:51 1.31
+++ scoreboard.h 1997/09/16 00:25:47 1.32
@@ -66,13 +66,13 @@
#define SERVER_UNKNOWN (-1) /* should never be in this state */
#define SERVER_DEAD 0
-#define SERVER_READY 1 /* Waiting for connection (or accept() lock) */
-#define SERVER_STARTING 3 /* Server Starting up */
-#define SERVER_BUSY_READ 2 /* Reading a client request */
-#define SERVER_BUSY_WRITE 4 /* Processing a client request */
-#define SERVER_BUSY_KEEPALIVE 5 /* Waiting for more requests via keepalive */
-#define SERVER_BUSY_LOG 6 /* Logging the request */
-#define SERVER_BUSY_DNS 7 /* Looking up a hostname */
+#define SERVER_READY 1 /* Waiting for connection (or accept() lock) */
+#define SERVER_STARTING 3 /* Server Starting up */
+#define SERVER_BUSY_READ 2 /* Reading a client request */
+#define SERVER_BUSY_WRITE 4 /* Processing a client request */
+#define SERVER_BUSY_KEEPALIVE 5 /* Waiting for more requests via keepalive */
+#define SERVER_BUSY_LOG 6 /* Logging the request */
+#define SERVER_BUSY_DNS 7 /* Looking up a hostname */
#define SERVER_GRACEFUL 8 /* server is gracefully finishing request */
#define SERVER_NUM_STATUS 9 /* number of status settings */
@@ -118,17 +118,16 @@
#ifndef OPTIMIZE_TIMEOUTS
time_t last_used;
#endif
- char client[32]; /* Keep 'em small... */
- char request[64]; /* We just want an idea... */
- char vhost[32]; /* What virtual host is being accessed? */
+ char client[32]; /* Keep 'em small... */
+ char request[64]; /* We just want an idea... */
+ char vhost[32]; /* What virtual host is being accessed? */
#endif
} short_score;
-typedef struct
- {
+typedef struct {
int exit_generation; /* Set by the main process if a graceful
restart is required */
- } global_score;
+} global_score;
/* stuff which the parent generally writes and the children rarely read */
typedef struct {
@@ -139,17 +138,16 @@
#endif
} parent_score;
-typedef struct
- {
+typedef struct {
short_score servers[HARD_SERVER_LIMIT];
parent_score parent[HARD_SERVER_LIMIT];
global_score global;
- } scoreboard;
+} scoreboard;
#define SCOREBOARD_SIZE sizeof(scoreboard)
API_EXPORT(void) sync_scoreboard_image(void);
-API_EXPORT(int) exists_scoreboard_image (void);
+API_EXPORT(int) exists_scoreboard_image(void);
API_VAR_EXPORT extern scoreboard *scoreboard_image;