httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/os/unix unixd.c
Date Wed, 10 Mar 2004 21:06:11 GMT
jorton      2004/03/10 13:06:11

  Modified:    os/unix  unixd.c
  Log:
  * os/unix/unixd.c (unixd_accept): Eliminate now-redundant call to
  apr_os_sock_get(); let APR check for accept returning zero on TPF.
  
  Revision  Changes    Path
  1.67      +1 -8      httpd-2.0/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -w -d -u -r1.66 -r1.67
  --- unixd.c	9 Feb 2004 20:40:49 -0000	1.66
  +++ unixd.c	10 Mar 2004 21:06:11 -0000	1.67
  @@ -458,19 +458,12 @@
   {
       apr_socket_t *csd;
       apr_status_t status;
  -    int sockdes;
   
       *accepted = NULL;
       status = apr_socket_accept(&csd, lr->sd, ptrans);
       if (status == APR_SUCCESS) { 
           *accepted = csd;
  -        apr_os_sock_get(&sockdes, csd);
  -#ifdef TPF
  -        if (sockdes == 0) {                  /* 0 is invalid socket for TPF */
  -            return APR_EINTR;
  -        }
  -#endif
  -        return status;
  +        return APR_SUCCESS;
       }
   
       if (APR_STATUS_IS_EINTR(status)) {
  
  
  

Mime
View raw message