apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/support/unix waitio.c
Date Thu, 11 Jul 2002 17:08:23 GMT
trawick     2002/07/11 10:08:23

  Modified:    network_io/unix sockets.c
               support/unix waitio.c
  Log:
  include the proper header file to get prototypes
  
  fix breakage in apr_connect() which caused a hard failure in mod_proxy
  
  Revision  Changes    Path
  1.100     +2 -1      apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- sockets.c	8 Jun 2002 22:32:11 -0000	1.99
  +++ sockets.c	11 Jul 2002 17:08:23 -0000	1.100
  @@ -54,6 +54,7 @@
   
   #include "networkio.h"
   #include "apr_network_io.h"
  +#include "apr_support.h"
   #include "apr_portable.h"
   #include "inherit.h"
   
  @@ -260,7 +261,7 @@
        * socket; if called again, we can see EALREADY
        */
       if (rc == -1 && (errno == EINPROGRESS || errno == EALREADY) && sock->timeout
!= 0) {
  -        rc = apr_wait_for_io_or_timeout(sock, 0);
  +        rc = apr_wait_for_io_or_timeout(NULL, sock, 0);
           if (rc != APR_SUCCESS) {
               return rc;
           }
  
  
  
  1.3       +1 -0      apr/support/unix/waitio.c
  
  Index: waitio.c
  ===================================================================
  RCS file: /home/cvs/apr/support/unix/waitio.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- waitio.c	11 Jul 2002 14:39:04 -0000	1.2
  +++ waitio.c	11 Jul 2002 17:08:23 -0000	1.3
  @@ -56,6 +56,7 @@
   #include "networkio.h"
   #include "apr_poll.h"
   #include "apr_errno.h"
  +#include "apr_support.h"
   
   /* The only case where we don't use wait_for_io_or_timeout is on
    * pre-BONE BeOS, so this check should be sufficient and simpler */
  
  
  

Mime
View raw message