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 Changes Path 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_PORT 0 /* 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)