httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/main iol_socket.c
Date Wed, 05 Jul 2000 18:08:13 GMT
stoddard    00/07/05 11:08:09

  Modified:    src/main iol_socket.c
  Log:
  Implement socket_sendfile from the win32 iol_socket.c. This fixes GPF
  on Windows trying to call a NULL iol_sendfile function.
  
  Revision  Changes    Path
  1.2       +7 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- iol_socket.c	2000/06/30 18:07:07	1.1
  +++ iol_socket.c	2000/07/05 18:08:00	1.2
  @@ -131,6 +131,12 @@
       *nbytes = size;
       return ap_recv(((iol_socket *)viol)->sock, buf, nbytes);
   }
  +static ap_status_t socket_sendfile(ap_iol *viol, ap_file_t *file,
  +                                   ap_hdtr_t *hdtr, ap_off_t *offset, 
  +                                   ap_size_t *len,  ap_int32_t flags) 
  +{
  +    return ap_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
  +}
   
   static ap_status_t socket_close(ap_iol *viol)
   {
  @@ -160,7 +166,7 @@
       socket_read,
       socket_setopt,
       socket_getopt,
  -    NULL,
  +    socket_sendfile,
       socket_shutdown,
   };
   
  
  
  

Mime
View raw message