cvs commit: apache-1.3/src/support logresolve.c
wsanchez00/01/25 20:36:03 Modified:src/support logresolve.c Log: BeOS lacks arpa/inet.h. Submitted by: David Reid [EMAIL PROTECTED] Revision ChangesPath 1.18 +7 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- logresolve.c 1999/12/07 04:54:45 1.17 +++ logresolve.c 2000/01/26 04:36:00 1.18 @@ -45,8 +45,14 @@ #include ctype.h #ifndef MPE +#ifndef BEOS #include arpa/inet.h -#endif +#else +/* BeOS lacks the necessary files until we get the new networking */ +#include netinet/in.h +#define NO_ADDRESS 4 +#endif /* BEOS */ +#endif /* MPE */ static void cgethost(struct in_addr ipnum, char *string, int check); static int getline(char *s, int n);
cvs commit: apache-1.3/src/support logresolve.c
rasmus 99/12/06 20:54:49 Modified:src/modules/standard mod_info.c src/support logresolve.c Log: Revision ChangesPath 1.47 +1 -1 apache-1.3/src/modules/standard/mod_info.c Index: mod_info.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_info.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_info.c1999/10/21 20:45:32 1.46 +++ mod_info.c1999/12/07 04:54:29 1.47 @@ -68,7 +68,7 @@ * 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 + * Rasmus Lerdorf [EMAIL PROTECTED], May 1996 * * 05.01.96 Initial Version * 1.17 +1 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- logresolve.c 1998/07/13 11:32:58 1.16 +++ logresolve.c 1999/12/07 04:54:45 1.17 @@ -1,7 +1,7 @@ /* * logresolve 1.1 * - * Tom Rathborne - [EMAIL PROTECTED] - http://www.uunet.ca/~tomr/ + * Tom Rathborne - [EMAIL PROTECTED] - http://www.aceldama.com/~tomr/ * UUNET Canada, April 16, 1995 * * Rewritten by David Robinson. ([EMAIL PROTECTED])
cvs commit: apache-1.3/src/support logresolve.c
brian 98/06/05 20:17:56 Modified:src/support logresolve.c Log: missing newline at end of error message. Revision ChangesPath 1.15 +1 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- logresolve.c 1998/05/28 11:23:13 1.14 +++ logresolve.c 1998/06/06 03:17:55 1.15 @@ -288,7 +288,7 @@ statfile = argv[i]; } else { - fprintf(stderr, Usage: logresolve [-s statfile] [-c] input output); + fprintf(stderr, Usage: logresolve [-s statfile] [-c] input output\n); exit(0); } }
cvs commit: apache-1.3/src/support logresolve.c
rse 98/05/28 04:23:14 Modified:src/support logresolve.c Log: The complete source tree passes gcc .. -Wnested-externs .. quietly except for this this support program. Make it pass -Wnested-externs, too. Revision ChangesPath 1.14 +4 -3 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- logresolve.c 1998/05/02 11:15:15 1.13 +++ logresolve.c 1998/05/28 11:23:13 1.14 @@ -95,6 +95,10 @@ * statistics - obvious */ +#ifndef h_errno +extern int h_errno; /* some machines don't have this in their headers */ +#endif + /* largeste value for h_errno */ #define MAX_ERR (NO_ADDRESS) #define UNKNOWN_ERR (MAX_ERR+1) @@ -117,9 +121,6 @@ struct nsrec **current, *new; struct hostent *hostdata; char *name; -#ifndef h_errno -extern int h_errno; /* some machines don't have this in their headers */ -#endif current = nscache[((ipnum.s_addr + (ipnum.s_addr 8) + (ipnum.s_addr 16) + (ipnum.s_addr 24)) % BUCKETS)];
cvs commit: apache-1.3/src/support logresolve.c
rse 98/05/02 04:15:15 Modified:.STATUS src CHANGES Configure README.DSO src/include conf.h src/main http_main.c src/modules/proxy proxy_cache.c src/modules/standard mod_setenvif.c mod_so.c src/os/unix os-aix-dso.c src/support logresolve.c Log: The various fixes for the AIX 3.2, 4.1.5, 4.2 and 4.3 versions. Submitted by: Jens-Uwe Mager Ralf S. Engelschall Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.347 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.346 retrieving revision 1.347 diff -u -r1.346 -r1.347 --- STATUS1998/05/01 18:42:41 1.346 +++ STATUS1998/05/02 11:15:06 1.347 @@ -78,6 +78,7 @@ * Ralf's DSO support for AIX * Ralf's DSO support for NetBSD, PR#2158 * Some optimization defines for NetBSD, PR#2165 +* Ralf's various porting changes to support AIX 3.2, 4.1.5, 4.2 and 4.3. Available Patches: 1.806 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.805 retrieving revision 1.806 diff -u -r1.805 -r1.806 --- CHANGES 1998/05/01 10:00:41 1.805 +++ CHANGES 1998/05/02 11:15:07 1.806 @@ -1,5 +1,12 @@ Changes with Apache 1.3b7 + *) PORT: Various porting changes to support AIX 3.2, 4.1.5, 4.2 and 4.3. + Additionally the checks for finding the vendor DSO library were moved + from mod_so.c to Configure because first it needs $PLAT etc. and second + mod_so already uses an abstraction layer and does not fiddle with the + vendor functions itself. + [Jens-Uwe Mager, Ralf S. Engelschall] + *) PORT: Some optimization defines for NetBSD [Jaromir Dolecek [EMAIL PROTECTED]] PR#2165 1.252 +59 -8 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- Configure 1998/05/01 10:00:42 1.251 +++ Configure 1998/05/02 11:15:08 1.252 @@ -304,19 +304,37 @@ DEF_WANTHSREGEX=no ;; i386-ibm-aix*) - OS='IBM AIX PS/2' + OS='IBM AIX PS/2' CFLAGS=$CFLAGS -DAIX=1 -U__STR__ -DUSEBCOPY DEF_WANTHSREGEX=no ;; -*-ibm-aix[1-3].*|*-ibm-aix4.[0-1]) -OS='IBM AIX v4.2' -CFLAGS=$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__ -;; +*-ibm-aix[1-2].*) + OS='IBM AIX 1.x/2.x' + CFLAGS=$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__ + ;; +*-ibm-aix3.*) + OS='IBM AIX 3.x' + CFLAGS=$CFLAGS -DAIX=30 -DNEED_RLIM_T -U__STR__ + ;; +*-ibm-aix4.1) + OS='IBM AIX 4.1' + CFLAGS=$CFLAGS -DAIX=41 -DNEED_RLIM_T -U__STR__ + ;; +*-ibm-aix4.2) + OS='IBM AIX 4.2' + CFLAGS=$CFLAGS -DAIX=42 -U__STR__ + LDFLAGS=$LDFLAGS -lm + ;; +*-ibm-aix4.3) + OS='IBM AIX 4.3' + CFLAGS=$CFLAGS -DAIX=43 -U__STR__ + LDFLAGS=$LDFLAGS -lm + ;; *-ibm-aix*) -OS='IBM AIX = 4.2' -CFLAGS=$CFLAGS -DAIX=42 -U__STR__ + OS='IBM AIX' + CFLAGS=$CFLAGS -DAIX=1 -U__STR__ LDFLAGS=$LDFLAGS -lm -;; + ;; *-apollo-*) OS='Apollo Domain' CFLAGS=$CFLAGS -DAPOLLO @@ -1015,6 +1033,32 @@ fi +## Some OS-related stuff for the DSO mechanism: +## Finding the vendor DSO functions +## +if [ x$using_shlib = x1 ] ; then +DL_LIB= +case $PLAT in +*-ibm-aix* ) +DL_LIB=-lld +;; +* ) +if ./helpers/TestCompile func dlopen; then +: +else +if ./helpers/TestCompile lib dl; then +DL_LIB=-ldl +fi +fi +;; +esac +if [ .$DL_LIB != . ]; then +LIBS=$LIBS $DL_LIB +echo + using $DL_LIB for vendor DSO support +fi +fi + + ## Now we do some OS specific adjustments... for some OSs, we need ## to adjust CFLAGS and/or OPTIM depending on which compiler we ## are going to use. This is easy, since this can be gleamed from @@ -1062,6 +1106,13 @@ */cc|cc ) CFLAGS=$CFLAGS -n32 LDFLAGS=$LDFLAGS -n32 + ;; + esac + ;; +'AIX 4.[123]') + case $CC in
cvs commit: apache-1.3/src/support logresolve.c
jim 98/04/20 18:39:30 Modified:src/support logresolve.c Log: PR: 2082 Submitted by: Jim Jagielski NeXT requires strdup()... Since we already provide for MPE we use this internal version. Another fix would be to: #ifdef NEXT #define strdup NXCopyStringBuffer #endif Revision ChangesPath 1.10 +1 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- logresolve.c 1998/01/20 01:44:42 1.9 +++ logresolve.c 1998/04/21 01:39:30 1.10 @@ -71,7 +71,7 @@ /* number of buckets in cache hash table */ #define BUCKETS 256 -#ifdef MPE +#if defined(MPE) || defined(NEXT) char *strdup (const char *str) { char *dup;
cvs commit: apache-1.3/src/support logresolve.c
jim 98/04/21 13:03:29 Modified:src/support logresolve.c Log: Again, use conf.h since we have it. Too bad no one else noticed that support's Makefile includes ./src/include or else this would have been fixed a long time ago, I'm sure Revision ChangesPath 1.11 +2 -8 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /export/home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- logresolve.c 1998/04/21 01:39:30 1.10 +++ logresolve.c 1998/04/21 20:03:23 1.11 @@ -39,18 +39,12 @@ * that one of these matches the original address. */ - +#include conf.h #include sys/types.h #include ctype.h -#include netdb.h #include string.h -#include stdio.h -#include stdlib.h - -#include sys/socket.h -#include netinet/in.h #ifndef MPE #include arpa/inet.h #endif @@ -71,7 +65,7 @@ /* number of buckets in cache hash table */ #define BUCKETS 256 -#if defined(MPE) || defined(NEXT) +#if defined(NEED_STRDUP) char *strdup (const char *str) { char *dup;