httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Bloom <...@locus.apache.org>
Subject cvs commit: apache-2.0/src/main iol_socket.c
Date Thu, 06 Jul 2000 20:57:05 GMT
rbb         00/07/06 13:57:01

  Modified:    src/main iol_socket.c
  Log:
  Fix my stupid mistake.  Only define iol->sendfile if APR_HAS_SENDFILE is
  true.  Otherise iol->sendfile is NULL.
  Submitted by:	Greg Stein
  
  Revision  Changes    Path
  1.5       +4 -4      apache-2.0/src/main/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_socket.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- iol_socket.c	2000/07/06 20:01:18	1.4
  +++ iol_socket.c	2000/07/06 20:56:59	1.5
  @@ -136,11 +136,7 @@
                                      ap_hdtr_t *hdtr, ap_off_t *offset, 
                                      ap_size_t *len,  ap_int32_t flags) 
   {
  -#if APR_HAS_SENDFILE
       return ap_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
  -#else
  -    return APR_ENOTIMPL;
  -#endif
   }
   
   static ap_status_t socket_close(ap_iol *viol)
  @@ -170,7 +166,11 @@
       socket_read,
       socket_setopt,
       socket_getopt,
  +#if APR_HAS_SENDFILE
       socket_sendfile,
  +#else
  +    NULL,
  +#endif
       socket_shutdown,
   };
   
  
  
  

Mime
View raw message