httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/unix sockets.c
Date Tue, 23 May 2000 05:49:27 GMT
fielding    00/05/22 22:49:27

  Modified:    src      CHANGES
               src/lib/apr/network_io/unix sockets.c
  Log:
  BEOS: ap_shutdown should return APR_SUCCESS or errno.
  
  Revision  Changes    Path
  1.117     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- CHANGES	2000/05/19 07:24:26	1.116
  +++ CHANGES	2000/05/23 05:49:26	1.117
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0a4
   
  +  *) BEOS: ap_shutdown should return APR_SUCCESS or errno. Note that
  +     the BeOS 5.0 documentation says that shutdown doesn't work yet.
  +     [Roy Fielding]
  +
     *) Fix some minor errors where pid was being manipulated as an int
        instead of the portable pid_t.  [Roy Fielding]
   
  
  
  
  1.45      +4 -10     apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- sockets.c	2000/05/16 21:04:20	1.44
  +++ sockets.c	2000/05/23 05:49:27	1.45
  @@ -111,16 +111,10 @@
   
   ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how)
   {
  -#ifdef BEOS
  -    return shutdown(thesocket->socketdes, how);
  -#else
  -    if (shutdown(thesocket->socketdes, how) == 0) {
  -        return APR_SUCCESS;
  -    }
  -    else {
  -        return errno;
  -    }
  -#endif
  +    /* BEOS internal documentation indicates that this system call
  +     * may not work in 5.0, but we don't have any alternatives.
  +     */
  +    return (shutdown(thesocket->socketdes, how) == -1) ? errno : APR_SUCCESS;
   }
   
   ap_status_t ap_close_socket(ap_socket_t *thesocket)
  
  
  

Mime
View raw message