From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 14 Oct 2002 20:08:15 +0000 (+0000)
Subject:   Use a better name for the APR_SENDFILE_ENABLE flag.
X-Git-Tag: 2.0.44~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2e122738eb4bba9612979d93aa121e7a025d293;p=thirdparty%2Fapache%2Fhttpd.git

  Use a better name for the APR_SENDFILE_ENABLE flag.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97211 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index f3b1a48885b..126795ffa26 100644
--- a/server/core.c
+++ b/server/core.c
@@ -3316,8 +3316,8 @@ static int default_handler(request_rec *r)
 
         if ((status = apr_file_open(&fd, r->filename, APR_READ | APR_BINARY
 #if APR_HAS_SENDFILE
-                             | ((d->enable_sendfile == ENABLE_SENDFILE_OFF) 
-                                                ? 0 : APR_OPEN_FOR_SENDFILE)
+                            | ((d->enable_sendfile == ENABLE_SENDFILE_OFF) 
+                                                ? 0 : APR_SENDFILE_ENABLED)
 #endif
                                     , 0, r->pool)) != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
@@ -3924,7 +3924,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
             }
 
 #if APR_HAS_SENDFILE
-            if (apr_file_flags_get(fd) & APR_OPEN_FOR_SENDFILE) {
+            if (apr_file_flags_get(fd) & APR_SENDFILE_ENABLED) {
 
                 if (c->keepalive == AP_CONN_CLOSE && APR_BUCKET_IS_EOS(last_e)) {
                     /* Prepare the socket to be reused */