You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2004/09/30 19:47:07 UTC

cvs commit: apr/include apr_network_io.h

trawick     2004/09/30 10:47:07

  Modified:    include  apr_network_io.h
  Log:
  add some hints about non-blocking sockets
  
  Revision  Changes    Path
  1.154     +14 -5     apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_network_io.h,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- apr_network_io.h	13 Feb 2004 09:38:28 -0000	1.153
  +++ apr_network_io.h	30 Sep 2004 17:47:06 -0000	1.154
  @@ -456,7 +456,8 @@
    * @remark
    * <PRE>
    * This functions acts like a blocking write by default.  To change 
  - * this behavior, use apr_socket_timeout_set().
  + * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
  + * socket option.
    *
    * It is possible for both bytes to be sent and an error to be returned.
    *
  @@ -475,7 +476,8 @@
    * @remark
    * <PRE>
    * This functions acts like a blocking write by default.  To change 
  - * this behavior, use apr_socket_timeout_set().
  + * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
  + * socket option.
    * The number of bytes actually sent is stored in argument 3.
    *
    * It is possible for both bytes to be sent and an error to be returned.
  @@ -526,7 +528,8 @@
    *                       including headers, file, and trailers
    * @param flags APR flags that are mapped to OS specific flags
    * @remark This functions acts like a blocking write by default.  To change 
  - *         this behavior, use apr_socket_timeout_set().
  + *         this behavior, use apr_socket_timeout_set() or the
  + *         APR_SO_NONBLOCK socket option.
    *         The number of bytes actually sent is stored in argument 5.
    */
   APR_DECLARE(apr_status_t) apr_socket_sendfile(apr_socket_t *sock, 
  @@ -547,8 +550,9 @@
    * @remark
    * <PRE>
    * This functions acts like a blocking read by default.  To change 
  - * this behavior, use apr_socket_timeout_set().
  - * The number of bytes actually sent is stored in argument 3.
  + * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
  + * socket option.
  + * The number of bytes actually received is stored in argument 3.
    *
    * It is possible for both bytes to be received and an APR_EOF or
    * other error to be returned.
  @@ -568,6 +572,11 @@
    *            APR_SO_KEEPALIVE  --  keep connections active
    *            APR_SO_LINGER     --  lingers on close if data is present
    *            APR_SO_NONBLOCK   --  Turns blocking on/off for socket
  + *                                  When this option is enabled, use
  + *                                  the APR_STATUS_IS_EAGAIN() macro to
  + *                                  see if a send or receive function
  + *                                  could not transfer data without
  + *                                  blocking.
    *            APR_SO_REUSEADDR  --  The rules used in validating addresses
    *                                  supplied to bind should allow reuse
    *                                  of local addresses.