cvs commit: apachen/src Configure CHANGES
dgaudet 97/10/25 16:28:07 Modified:src Configure CHANGES Log: Solaris 2.4 needs spencer regex. PR: 1321 Submitted by: John Line [EMAIL PROTECTED] Reviewed by:Lars Eilebrecht, Marc Slemko, Dean Gaudet Revision ChangesPath 1.164 +1 -1 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- Configure 1997/10/25 01:52:42 1.163 +++ Configure 1997/10/25 23:28:04 1.164 @@ -378,7 +378,7 @@ esac DBM_LIB= case $SOLVER in - 2[0123]*) + 2[01234]*) DEF_WANTHSREGEX=yes ;; *) 1.474 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.473 retrieving revision 1.474 diff -u -r1.473 -r1.474 --- CHANGES 1997/10/25 22:35:15 1.473 +++ CHANGES 1997/10/25 23:28:05 1.474 @@ -1,5 +1,8 @@ Changes with Apache 1.3b3 + *) PORT: Solaris 2.4 needs Spencer regex, the system regex is broken. + [John Line [EMAIL PROTECTED]] PR#1321 + *) Default pathname has been changed everywhere to /usr/local/apache [Sameer [EMAIL PROTECTED]]
cvs commit: apachen/src/main alloc.h
dgaudet 97/10/26 13:14:17 Modified:src/main alloc.h Log: fix an indentation problem, and add some comments Revision ChangesPath 1.36 +7 -4 apachen/src/main/alloc.h Index: alloc.h === RCS file: /export/home/cvs/apachen/src/main/alloc.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- alloc.h 1997/10/22 20:29:32 1.35 +++ alloc.h 1997/10/26 21:14:16 1.36 @@ -248,10 +248,13 @@ * to call in the child, and an argument to be passed to the function. */ - enum kill_conditions { - kill_never, kill_always, kill_after_timeout, just_wait, - kill_only_once - }; +enum kill_conditions { +kill_never, /* process is never sent any signals */ +kill_always, /* process is sent SIGKILL on pool cleanup */ +kill_after_timeout, /* SIGTERM, wait 3 seconds, SIGKILL */ +just_wait, /* wait forever for the process to complete */ +kill_only_once /* send SIGTERM and then wait */ +}; API_EXPORT(void) note_subprocess(pool *a, int pid, enum kill_conditions how); API_EXPORT(int) spawn_child_err(pool *, int (*)(void *), void *,
cvs commit: apachen/src/modules/standard mod_mime_magic.c
dgaudet 97/10/26 13:41:13 Modified:src/modules/standard mod_mime_magic.c Log: The indentation was all whacky and there were various bits not in our coding style. Fix it up. (There's no code changes in this rev.) Revision ChangesPath 1.18 +1192 -1204apachen/src/modules/standard/mod_mime_magic.c Index: mod_mime_magic.c === RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime_magic.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_mime_magic.c 1997/10/22 20:30:25 1.17 +++ mod_mime_magic.c 1997/10/26 21:41:11 1.18 @@ -144,26 +144,26 @@ #define MAXMIMESTRING256 -#define HOWMANY 1024/* big enough to recognize most WWW files */ -#define MAXDESC50 /* max leng of text description */ -#define MAXstring 64/* max leng of string types */ +#define HOWMANY 1024 /* big enough to recognize most WWW files */ +#define MAXDESC50/* max leng of text description */ +#define MAXstring 64 /* max leng of string types */ struct magic { -struct magic *next; /* link to next entry */ -int lineno; /* line number from magic file */ +struct magic *next; /* link to next entry */ +int lineno; /* line number from magic file */ short flag; -#define INDIR1 /* if '(...)' appears, */ -#defineUNSIGNED 2 /* comparison is unsigned */ -short cont_level; /* level of */ +#define INDIR1 /* if '(...)' appears, */ +#defineUNSIGNED 2/* comparison is unsigned */ +short cont_level;/* level of */ struct { -char type; /* byte short long */ -long offset;/* offset from indirection */ -} in; -long offset;/* offset to magic number */ -unsigned char reln; /* relation (0=eq, ''=gt, etc) */ -char type; /* int, short, long or string. */ -char vallen;/* length of string value, if any */ + char type; /* byte short long */ + long offset;/* offset from indirection */ +} in; +long offset; /* offset to magic number */ +unsigned char reln; /* relation (0=eq, ''=gt, etc) */ +char type; /* int, short, long or string. */ +char vallen; /* length of string value, if any */ #define BYTE1 #define SHORT2 #define LONG4 @@ -176,18 +176,18 @@ #define LELONG11 #define LEDATE12 union VALUETYPE { -unsigned char b; -unsigned short h; -unsigned long l; -char s[MAXstring]; -unsigned char hs[2];/* 2 bytes of a fixed-endian short */ -unsigned char hl[4];/* 2 bytes of a fixed-endian long */ -} value;/* either number or string */ -unsigned long mask; /* mask before comparison with value */ -char nospflag; /* supress space character */ + unsigned char b; + unsigned short h; + unsigned long l; + char s[MAXstring]; + unsigned char hs[2];/* 2 bytes of a fixed-endian short */ + unsigned char hl[4];/* 2 bytes of a fixed-endian long */ +} value; /* either number or string */ +unsigned long mask; /* mask before comparison with value */ +char nospflag; /* supress space character */ /* NOTE: this string is suspected of overrunning - find it! */ -char desc[MAXDESC]; /* description */ +char desc[MAXDESC]; /* description */ }; /* @@ -212,37 +212,34 @@ union record { char charptr[RECORDSIZE]; struct header { -char name[NAMSIZ]; -char mode[8]; -char uid[8]; -char gid[8]; -char size[12]; -char mtime[12]; -char chksum[8]; -char linkflag; -char linkname[NAMSIZ]; -char magic[8]; -char uname[TUNMLEN]; -char gname[TGNMLEN]; -char devmajor[8]; -char devminor[8]; -} header; + char name[NAMSIZ]; + char mode[8]; + char uid[8]; + char gid[8]; + char size[12]; + char mtime[12]; + char chksum[8]; + char linkflag; + char linkname[NAMSIZ]; + char magic[8]; + char uname[TUNMLEN]; + char gname[TGNMLEN]; + char devmajor[8]; + char devminor[8]; +} header; }; /* The magic field is filled with this if uname and gname are valid. */ -#defineTMAGICustar/* 7 chars and a null