From: Ryan Bloom <rbb@apache.org>
Date: Tue, 11 Jul 2000 03:48:18 +0000 (+0000)
Subject: Fix a warning associated with the ap_send_fd change from earlier today.
X-Git-Tag: APACHE_2_0_ALPHA_5~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98514ba315e19d8f006e2f4d8a2ec31aaef0b84f;p=thirdparty%2Fapache%2Fhttpd.git

Fix a warning associated with the ap_send_fd change from earlier today.
This just changes a couple of long's to ap_size_t.


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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 14cb6c0adcf..5759487e776 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -183,7 +183,7 @@ API_EXPORT(int) ap_discard_request_body(request_rec *r);
 
 API_EXPORT(int) ap_set_byterange(request_rec *r);
 API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
-				  long *length);
+				  ap_size_t *length);
 
 /* Support for the Basic authentication protocol.  Note that there's
  * nothing that prevents these from being in mod_auth.c, except that other
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 93d874fea2a..3224cb7f573 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2859,7 +2859,7 @@ static int default_handler(request_rec *r)
 	    }
 	    else {
 		ap_off_t offset;
-		long length;
+		ap_size_t length;
 		while (ap_each_byterange(r, &offset, &length)) {
 		    ap_send_mmap(mm, r, offset, length);
 		}
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index bb78d74920b..8b6d59fdcb5 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -240,7 +240,7 @@ static int parse_byterange(char *range, long clength, long *start, long *end)
 }
 
 static int internal_byterange(int, long *, request_rec *, const char **,
-			      ap_off_t *, long *);
+			      ap_off_t *, ap_size_t *);
 
 API_EXPORT(int) ap_set_byterange(request_rec *r)
 {
@@ -316,7 +316,7 @@ API_EXPORT(int) ap_set_byterange(request_rec *r)
 }
 
 API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
-				  long *length)
+				  ap_size_t *length)
 {
     return internal_byterange(1, NULL, r, &r->range, offset, length);
 }
@@ -333,7 +333,7 @@ API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
  */
 static int internal_byterange(int realreq, long *tlength, request_rec *r,
                               const char **r_range, ap_off_t *offset,
-			      long *length)
+			      ap_size_t *length)
 {
     long range_start, range_end;
     char *range;