Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 10683 invoked by uid 500); 6 Jul 2000 20:57:10 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 10651 invoked by uid 500); 6 Jul 2000 20:57:08 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: Thu, 6 Jul 2000 13:57:05 -0700 (PDT) From: Ryan Bloom Message-Id: <200007062057.NAA10526@locus.apache.org> To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/main iol_socket.c 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, };