From: Bradley Nicholes <bnicholes@apache.org>
Date: Thu, 8 Jan 2004 17:50:03 +0000 (+0000)
Subject: If large file support is enabled allow the file to be split into AP_MAX_SENDFILE... 
X-Git-Tag: pre_ajp_proxy~850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23440444540d7e01faa1f10562445593fe81d85;p=apache

If large file support is enabled allow the file to be split into AP_MAX_SENDFILE sized buckets.  Otherwise Apache will be unable to send files larger than 2 gig due to signed 32-bit limitations.


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

diff --git a/server/core.c b/server/core.c
index 8f5cefe0c1..0b4677928e 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000-2004 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -3508,8 +3508,12 @@ static int default_handler(request_rec *r)
         }
 
         bb = apr_brigade_create(r->pool, c->bucket_alloc);
-#if APR_HAS_SENDFILE && APR_HAS_LARGE_FILES
+#if APR_HAS_LARGE_FILES
+#if APR_HAS_SENDFILE
         if ((d->enable_sendfile != ENABLE_SENDFILE_OFF) &&
+#else
+        if (
+#endif
             (r->finfo.size > AP_MAX_SENDFILE)) {
             /* APR_HAS_LARGE_FILES issue; must split into mutiple buckets,
              * no greater than MAX(apr_size_t), and more granular than that