httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@hyperreal.org>
Subject cvs commit: apachen/src/main conf.h http_log.c
Date Wed, 27 Aug 1997 14:22:10 GMT
randy       97/08/27 07:22:09

  Modified:    src/main conf.h http_log.c
  Log:
  HAVE_SYSLOG. Added #define for most platforms erroring on the optimistic side.
  
  Revision  Changes    Path
  1.129     +28 -0     apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- conf.h	1997/08/24 18:24:03	1.128
  +++ conf.h	1997/08/27 14:22:06	1.129
  @@ -93,6 +93,7 @@
   #define NO_LINGCLOSE
   #define USE_FLOCK_SERIALIZED_ACCEPT
   #define NEED_DIFFTIME
  +#define HAVE_SYSLOG
   
   #elif defined(SOLARIS2)
   #undef HAVE_GMTOFF
  @@ -109,6 +110,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   int gethostname(char *name, int namelen);
  +#define HAVE_SYSLOG
   
   #elif defined(IRIX)
   #undef HAVE_GMTOFF
  @@ -125,6 +127,7 @@
   #define NO_LONG_DOUBLE
   #define HAVE_BSTRING_H
   #define NO_LINGCLOSE
  +#define HAVE_SYSLOG
   
   #elif defined(HIUX)
   #define HAVE_SYS_RESOURCE_H
  @@ -137,6 +140,7 @@
   #define JMP_BUF sigjmp_buf
   #define HAVE_SHMGET
   #define SELECT_NEEDS_CAST
  +#define HAVE_SYSLOG
   
   #elif defined(HPUX) || defined(HPUX10)
   #define HAVE_SYS_RESOURCE_H
  @@ -148,6 +152,7 @@
   #endif
   #define JMP_BUF sigjmp_buf
   #define HAVE_SHMGET
  +#define HAVE_SYSLOG
   #ifndef HPUX10
   #define SELECT_NEEDS_CAST
   typedef int rlim_t;
  @@ -162,6 +167,7 @@
   #ifndef __ps2__
   #define HAVE_MMAP
   #define USE_MMAP_FILES
  +#define HAVE_SYSLOG
   #ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP "nobody"
   #endif
  @@ -184,6 +190,7 @@
   #define const /* Not implemented */
   #endif
   #define JMP_BUF sigjmp_buf
  +#define HAVE_SYSLOG
   
   #elif defined(OSF1)
   #define HAVE_GMTOFF
  @@ -194,6 +201,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   #define NO_LONG_DOUBLE
  +#define HAVE_SYSLOG
   
   #elif defined(PARAGON)
   #define HAVE_GMTOFF
  @@ -204,6 +212,7 @@
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
   #define NO_LONG_DOUBLE
  +#define HAVE_SYSLOG
   typedef int rlim_t;
   
   #elif defined(SEQUENT)
  @@ -211,6 +220,7 @@
   #undef NO_KILLPG
   #define NO_SETSID
   #define NEED_STRDUP
  +#define HAVE_SYSLOG
   #define tolower(c) (isupper(c) ? tolower(c) : c)
   
   #elif defined(NEXT)
  @@ -271,6 +281,7 @@
   #define JMP_BUF jmp_buf
   #define USE_LONGJMP
   #define NO_USE_SIGACTION
  +#define HAVE_SYSLOG
   
   #elif defined(LINUX)
   #if LINUX > 1
  @@ -295,6 +306,7 @@
   #undef NEED_STRDUP
   #define JMP_BUF sigjmp_buf
   #include <sys/time.h>     
  +#define HAVE_SYSLOG
   
   #elif defined(SCO)
   #undef HAVE_GMTOFF
  @@ -305,6 +317,7 @@
   #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 HAVE_SYSLOG
   
   #elif defined(SCO5)
   
  @@ -316,6 +329,7 @@
   #define USE_MMAP_FILES
   #define HAVE_SYS_RESOURCE_H
   #define SecureWare
  +#define HAVE_SYSLOG
   
   /* Although SCO 5 defines these in <strings.h> (note the "s") they don't have
   consts. Sigh. */
  @@ -355,6 +369,7 @@
   #define MOVEBREAK		0x4000000
   #define NO_LINGCLOSE
   #define NO_SLACK
  +#define HAVE_SYSLOG
   
   #elif defined(SVR4)
   #define NO_KILLPG
  @@ -368,6 +383,7 @@
   #define JMP_BUF sigjmp_buf
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
  +#define HAVE_SYSLOG
   
   #elif defined(UW)
   #define NO_LINGCLOSE
  @@ -388,6 +404,7 @@
   #include <sys/time.h>
   #define _POSIX_SOURCE
   #define NET_SIZE_T size_t
  +#define HAVE_SYSLOG
   
   #elif defined(DGUX)
   #define NO_KILLPG
  @@ -400,6 +417,7 @@
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define ap_inet_addr inet_network
  +#define HAVE_SYSLOG
   
   #elif defined(__NetBSD__) || defined(__OpenBSD__)
   #define HAVE_SYS_RESOURCE_H
  @@ -407,6 +425,7 @@
   #undef NO_KILLPG
   #undef NO_SETSID
   #define JMP_BUF sigjmp_buf
  +#define HAVE_SYSLOG
   #ifndef DEFAULT_USER
   #define DEFAULT_USER "nobody"
   #endif
  @@ -422,6 +441,7 @@
   #define STDIN_FILENO 0
   #define STDOUT_FILENO 1
   #define STDERR_FILENO 2
  +#define HAVE_SYSLOG
   #define strftime(buf,bufsize,fmt,tm)    ascftime(buf,fmt,tm)
   #include <sys/types.h>
   
  @@ -429,6 +449,7 @@
   #undef HAVE_GMTOFF
   #undef NO_KILLPG
   #undef NO_SETSID
  +#define HAVE_SYSLOG
   
   #elif defined(__FreeBSD__) || defined(__bsdi__)
   #if defined(__FreeBSD__)
  @@ -452,6 +473,7 @@
   typedef quad_t rlim_t;
   #endif
   #define USE_FLOCK_SERIALIZED_ACCEPT
  +#define HAVE_SYSLOG
   
   #elif defined(QNX)
   #ifndef crypt
  @@ -472,6 +494,7 @@
   #include <unix.h>
   #define JMP_BUF sigjmp_buf
   #define HAVE_MMAP
  +#define HAVE_SYSLOG
   
   #elif defined(LYNXOS)
   #undef NO_KILLPG
  @@ -480,6 +503,7 @@
   #define NEED_STRNCASECMP
   #define NEED_INITGROUPS
   #define JMP_BUF jmp_buf
  +#define HAVE_SYSLOG
   
   #elif defined(UXPDS)
   #undef NEED_STRCASECMP
  @@ -495,6 +519,7 @@
   #define HAVE_MMAP
   #define USE_MMAP_FILES
   #define HAVE_CRYPT_H
  +#define HAVE_SYSLOG
    
   #elif defined(__EMX__)
   /* Defines required for EMX OS/2 port. */
  @@ -536,6 +561,7 @@
   #undef NEED_STRDUP
   #define HAVE_MMAP
   #define USE_MMAP_FILES
  +#define HAVE_SYSLOG
   
   #define NO_TIMEZONE
   #include <stdio.h>
  @@ -551,6 +577,7 @@
   #define SIGURG SIGUSR1
   #define JMP_BUF sigjmp_buf
   #define USE_FCNTL_SERIALIZED_ACCEPT
  +#define HAVE_SYSLOG
   
   #elif defined(NEWSOS)
   #define HAVE_SYS_RESOURCE_H
  @@ -560,6 +587,7 @@
   #define NO_SETSID
   #define NO_USE_SIGACTION
   #define NEED_WAITPID
  +#define HAVE_SYSLOG
   #include <sys/time.h>
   #include <stdlib.h>
   #include <sys/types.h>
  
  
  
  1.27      +5 -3      apachen/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- http_log.c	1997/08/27 05:45:36	1.26
  +++ http_log.c	1997/08/27 14:22:07	1.27
  @@ -66,7 +66,7 @@
   
   #include <stdarg.h>
   
  -#ifdef USE_SYSLOG
  +#ifdef HAVE_SYSLOG
   #include <syslog.h>
   
   static TRANS facilities[] = {
  @@ -139,7 +139,9 @@
   void open_error_log (server_rec *s, pool *p)
   {
       char *fname;
  +#ifdef HAVE_SYSLOG
       register TRANS *fac;
  +#endif
   
   
       if (*s->error_fname == '|') {
  @@ -154,7 +156,7 @@
   
   	s->error_log = dummy;
       }
  -#ifdef USE_SYSLOG
  +#ifdef HAVE_SYSLOG
       else if (!strncasecmp(s->error_fname, "syslog", 6)) {
   	if ((fname = strchr(s->error_fname, ':'))) {
   	    fname++;
  @@ -246,7 +248,7 @@
   	vfprintf(s->error_log, fmt, args);
   	fflush(s->error_log);
       }
  -#ifdef USE_SYSLOG
  +#ifdef HAVE_SYSLOG
       else {
   	vsprintf(errstr + strlen(errstr), fmt, args);
   	syslog(level, "%s", errstr);
  
  
  

Mime
View raw message