You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/11 05:48:19 UTC
cvs commit: apache-2.0/src/main http_core.c http_protocol.c
rbb 00/07/10 20:48:19
Modified: src/include http_protocol.h
src/main http_core.c http_protocol.c
Log:
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.
Revision Changes Path
1.19 +1 -1 apache-2.0/src/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- http_protocol.h 2000/07/10 21:49:20 1.18
+++ http_protocol.h 2000/07/11 03:48:17 1.19
@@ -183,7 +183,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);
/* Support for the Basic authentication protocol. Note that there's
* nothing that prevents these from being in mod_auth.c, except that other
1.88 +1 -1 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- http_core.c 2000/07/11 00:06:21 1.87
+++ http_core.c 2000/07/11 03:48:18 1.88
@@ -2859,7 +2859,7 @@
}
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);
}
1.95 +3 -3 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- http_protocol.c 2000/07/10 21:49:21 1.94
+++ http_protocol.c 2000/07/11 03:48:18 1.95
@@ -240,7 +240,7 @@
}
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_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 @@
*/
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;