httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@hyperreal.org
Subject cvs commit: apache-2.0/src/main rfc1413.c
Date Wed, 01 Dec 1999 00:25:21 GMT
manoj       99/11/30 16:25:20

  Modified:    src/main rfc1413.c
  Log:
  Remove a vestige of the old timeout system. ident lookups need timeouts,
  though.
  
  Revision  Changes    Path
  1.9       +4 -11     apache-2.0/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -d -u -r1.8 -r1.9
  --- rfc1413.c	1999/10/24 19:24:00	1.8
  +++ rfc1413.c	1999/12/01 00:25:18	1.9
  @@ -55,6 +55,7 @@
    *
    */
   
  +/* TODO - put timeouts back in */
   /*
    * rfc1413() speaks a common subset of the RFC 1413, AUTH, TAP and IDENT
    * protocols. The code queries an RFC 1413 etc. compatible daemon on a remote
  @@ -77,7 +78,7 @@
   
   /* Rewritten by David Robinson */
   
  -#include "httpd.h"		/* for server_rec, conn_rec, ap_longjmp, etc. */
  +#include "httpd.h"		/* for server_rec, conn_rec, etc. */
   #include "http_log.h"		/* for aplog_error */
   #include "rfc1413.h"
   #include "http_main.h"		/* set_callback_and_alarm */
  @@ -99,8 +100,6 @@
   
   int ap_rfc1413_timeout = RFC1413_TIMEOUT;	/* Global so it can be changed */
   
  -static JMP_BUF timebuf;
  -
   /* bind_connect - bind both ends of a socket */
   /* Ambarish fix this. Very broken */
   static int get_rfc1413(ap_socket_t *sock, const char *local_ip,
  @@ -230,14 +229,8 @@
   	conn->remote_logname = result;
       }
   
  -    /*
  -     * Set up a timer so we won't get stuck while waiting for the server.
  -     */
  -    if (ap_setjmp(timebuf) == 0) {
  -
  -	if (get_rfc1413(sock, conn->local_ip, conn->remote_ip, user, srv) >= 0)
  -	    result = user;
  -    }
  +    if (get_rfc1413(sock, conn->local_ip, conn->remote_ip, user, srv) >= 0)
  +        result = user;
       ap_close_socket(sock);
       conn->remote_logname = result;
   
  
  
  

Mime
View raw message