cvs commit: apache/src rfc1413.c

[Mark Cox]

mjc 96/04/18 04:18:25

  Modified:src   rfc1413.c
  Log:
  Submitted by: Chuck Murcko <[EMAIL PROTECTED]>
  
  rfc1413.c doesn't need to #include conf.h, since it's already included in
  httpd.h. Besides, it blows the compile on BSDI 2.x with a redefine of
  union wait error.
  
  Revision  ChangesPath
  1.2   +0 -1  apache/src/rfc1413.c
  
  Index: rfc1413.c
  ===
  RCS file: /export/home/cvs/apache/src/rfc1413.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** rfc1413.c 1996/03/01 02:46:47 1.1
  --- rfc1413.c 1996/04/18 11:18:24 1.2
  ***
  *** 73,79 

/* Rewritten by David Robinson */

  - #include "conf.h"
#include "httpd.h"/* for server_rec, conn_rec */
#include "http_log.h" /* for log_unixerr */
#include "rfc1413.h"
  --- 73,78 
  
  
  

cvs commit: apache/src rfc1413.c

[Randy Terbush]

randy   97/05/29 11:29:14

  Modified:src   rfc1413.c
  Log:
  Unfortunately, the recent setjmp fix to rfc1413.c changed something
  completely unrelated, and upon which one of my modules depends:
  namely, the declaration of rfc1413_timeout as a global int.  This
  needs to be put back, please.
  #ken:-(}
  
  Reviewed by:  Randy Terbush, Jim Jagielski, Dean Gaudet
  Submitted by: Ken Coar
  
  Revision  ChangesPath
  1.11  +3 -1  apache/src/rfc1413.c
  
  Index: rfc1413.c
  ===
  RCS file: /export/home/cvs/apache/src/rfc1413.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** rfc1413.c 1997/05/29 04:50:27 1.10
  --- rfc1413.c 1997/05/29 18:29:12 1.11
  ***
  *** 95,100 
  --- 95,102 
#define ANY_PORT0   /* Any old port will do */
#define FROM_UNKNOWN  "unknown"

  + int rfc1413_timeout = RFC1413_TIMEOUT;  /* Global so it can be changed */
  + 
JMP_BUF timebuf;

/* bind_connect - bind both ends of a socket */
  ***
  *** 208,214 
if (ap_setjmp(timebuf) == 0)
{
signal(SIGALRM, ident_timeout);
  ! alarm(RFC1413_TIMEOUT);

if (get_rfc1413(sock, &conn->local_addr, &conn->remote_addr, user,
  srv)
  --- 210,216 
if (ap_setjmp(timebuf) == 0)
{
signal(SIGALRM, ident_timeout);
  ! alarm(rfc1413_timeout);

if (get_rfc1413(sock, &conn->local_addr, &conn->remote_addr, user,
  srv)