cvs commit: apache/src http_main.c

1996-08-13 Thread Roy Fielding 
fielding96/08/13 22:18:46

  Modified:src   http_main.c
  Log:
  Removed global static declaration of wait_or_timeout_retval that was
  never used (because it is overridden by a local declaration of
  wait_or_timeout_retval in the only routine where it is used).
  
  Revision  ChangesPath
  1.58  +0 -1  apache/src/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -C3 -r1.57 -r1.58
  *** http_main.c   1996/08/02 20:39:14 1.57
  --- http_main.c   1996/08/14 05:18:45 1.58
  ***
  *** 935,941 
 */

static JMP_BUF wait_timeout_buf;
  - static int wait_or_timeout_retval = -1;

static void longjmp_out_of_alarm (int sig) {
#if defined(NEXT) || defined(USE_LONGJMP)
  --- 935,940

cvs commit: apache/src conf.h

1996-08-13 Thread Roy Fielding 
fielding96/08/13 22:08:08

  Modified:src   conf.h
  Log:
  Added prototype of gethostname for SOLARIS2.
  Submitted by: Roy Fielding
  
  Revision  ChangesPath
  1.33  +1 -0  apache/src/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -C3 -r1.32 -r1.33
  *** conf.h1996/08/06 18:28:41 1.32
  --- conf.h1996/08/14 05:08:07 1.33
  ***
  *** 85,90 
  --- 85,91 
#define USE_FCNTL_SERIALIZED_ACCEPT
#define HAVE_MMAP
#define HAVE_CRYPT_H
  + int gethostname(char *name, int namelen);

#elif defined(IRIX)
#undef HAVE_GMTOFF

cvs commit: apache/src mod_auth.c

1996-08-13 Thread Roy Fielding 
fielding96/08/13 21:43:22

  Modified:src   mod_auth.c
  Log:
  Fixed warning on systems that HAVE_CRYPT_H.
  Submitted by: Roy Fielding
  
  Revision  ChangesPath
  1.4   +3 -0  apache/src/mod_auth.c
  
  Index: mod_auth.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_auth.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** mod_auth.c1996/06/07 20:11:28 1.3
  --- mod_auth.c1996/08/14 04:43:21 1.4
  ***
  *** 65,70 
  --- 65,73 
#include "http_core.h"
#include "http_log.h"
#include "http_protocol.h"
  + #if defined(HAVE_CRYPT_H)
  + #include 
  + #endif

typedef struct auth_config_struct {
char *auth_pwfile;

cvs commit: apache/src mod_cgi.c

1996-08-13 Thread Alexei Kosut 
akosut  96/08/13 10:57:31

  Modified:src   mod_cgi.c
  Log:
  Fix typo.
  
  Submitted by: Jim Jagielski
  
  Revision  ChangesPath
  1.16  +1 -1  apache/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===
  RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -C3 -r1.15 -r1.16
  *** mod_cgi.c 1996/08/08 12:32:22 1.15
  --- mod_cgi.c 1996/08/13 17:57:30 1.16
  ***
  *** 113,119 
void *merge_cgi_config (pool *p, void *basev, void *overridesv)
{
cgi_server_conf *base = (cgi_server_conf *)basev,
  !   *overrides = (cgi_server_conf *)overrides;

return overrides->logname ? overrides : base;
}
  --- 113,119 
void *merge_cgi_config (pool *p, void *basev, void *overridesv)
{
cgi_server_conf *base = (cgi_server_conf *)basev,
  !   *overrides = (cgi_server_conf *)overridesv;

return overrides->logname ? overrides : base;
}