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/11/07 21:22:05 UTC
cvs commit: apache-2.0/src/main http_connection.c http_core.c http_protocol.c rfc1413.c util_md5.c
rbb 00/11/07 12:22:03
Modified: src CHANGES
src/ap ap_buckets.c ap_buckets_eos.c ap_buckets_file.c
ap_buckets_flush.c ap_buckets_heap.c
ap_buckets_mmap.c ap_buckets_pipe.c
ap_buckets_pool.c ap_buckets_simple.c
ap_buckets_socket.c
src/include ap_buckets.h
src/lib/apr/file_io/os2 readwrite.c
src/lib/apr/file_io/unix dir.c readwrite.c
src/lib/apr/file_io/win32 readwrite.c
src/lib/apr/include apr_file_io.h apr_network_io.h
src/lib/apr/network_io/beos sendrecv.c
src/lib/apr/network_io/os2 sendrecv.c
src/lib/apr/network_io/unix sendrecv.c
src/lib/apr/network_io/win32 sendrecv.c
src/main http_connection.c http_core.c http_protocol.c
rfc1413.c util_md5.c
Log:
Convert a lot of apr_ssize_t to apr_size_t. We don't ever accept or return
signed values in these integers, and we return the error codes directly,
so we should always report the number of bytes read/written correctly. If
we have an error, that is 0 bytes. If that is true, then using signed
values doesn't make any sense.
Revision Changes Path
1.312 +6 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- CHANGES 2000/11/07 00:58:44 1.311
+++ CHANGES 2000/11/07 20:21:00 1.312
@@ -1,4 +1,10 @@
Changes with Apache 2.0a8
+ *) APR read/write functions and bucket read functions now operate
+ on unsigned integers, instead of signed ones. It doesn't make
+ any sense to use signed ints, because we return the error codes,
+ so if we have an error we should report 0 bytes read or written.
+ [Ryan Bloom]
+
*) Always compute the content length, whether it is sent or not.
The reason for this, is that it allows us to correctly report
the bytes_sent when logging the request. This also simplifies
1.30 +1 -1 apache-2.0/src/ap/ap_buckets.c
Index: ap_buckets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ap_buckets.c 2000/11/04 01:30:26 1.29
+++ ap_buckets.c 2000/11/07 20:21:05 1.30
@@ -124,7 +124,7 @@
{
ap_bucket *e;
struct iovec *orig;
- apr_ssize_t iov_len;
+ apr_size_t iov_len;
orig = vec;
AP_BRIGADE_FOREACH(e, b) {
1.13 +1 -1 apache-2.0/src/ap/ap_buckets_eos.c
Index: ap_buckets_eos.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_eos.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ap_buckets_eos.c 2000/11/07 00:33:48 1.12
+++ ap_buckets_eos.c 2000/11/07 20:21:06 1.13
@@ -57,7 +57,7 @@
#include <stdlib.h>
static apr_status_t eos_read(ap_bucket *b, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
*str = NULL;
*len = 0;
1.8 +1 -1 apache-2.0/src/ap/ap_buckets_file.c
Index: ap_buckets_file.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_file.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ap_buckets_file.c 2000/11/04 01:30:27 1.7
+++ ap_buckets_file.c 2000/11/07 20:21:06 1.8
@@ -59,7 +59,7 @@
/* XXX: We should obey the block flag */
static apr_status_t file_read(ap_bucket *e, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
ap_bucket_file *a = (ap_bucket_file *)e->data;
apr_file_t *f = (apr_file_t *) a->fd;
1.5 +1 -1 apache-2.0/src/ap/ap_buckets_flush.c
Index: ap_buckets_flush.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_flush.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ap_buckets_flush.c 2000/11/07 00:33:48 1.4
+++ ap_buckets_flush.c 2000/11/07 20:21:07 1.5
@@ -57,7 +57,7 @@
#include <stdlib.h>
static apr_status_t flush_read(ap_bucket *b, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
*str = NULL;
*len = 0;
1.16 +3 -3 apache-2.0/src/ap/ap_buckets_heap.c
Index: ap_buckets_heap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_heap.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ap_buckets_heap.c 2000/11/04 01:30:27 1.15
+++ ap_buckets_heap.c 2000/11/07 20:21:07 1.16
@@ -66,7 +66,7 @@
#endif
static apr_status_t heap_read(ap_bucket *b, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
ap_bucket_shared *s = b->data;
ap_bucket_heap *h = s->data;
@@ -89,7 +89,7 @@
}
AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
- const char *buf, apr_size_t length, int copy, apr_ssize_t *w)
+ const char *buf, apr_size_t length, int copy, apr_size_t *w)
{
ap_bucket_heap *h;
@@ -136,7 +136,7 @@
}
AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
- const char *buf, apr_size_t length, int copy, apr_ssize_t *w)
+ const char *buf, apr_size_t length, int copy, apr_size_t *w)
{
ap_bucket_do_create(ap_bucket_make_heap(b, buf, length, copy, w));
}
1.20 +1 -1 apache-2.0/src/ap/ap_buckets_mmap.c
Index: ap_buckets_mmap.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_mmap.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ap_buckets_mmap.c 2000/11/04 01:30:28 1.19
+++ ap_buckets_mmap.c 2000/11/07 20:21:08 1.20
@@ -57,7 +57,7 @@
#include <stdlib.h>
static apr_status_t mmap_read(ap_bucket *b, const char **str,
- apr_ssize_t *length, ap_read_type block)
+ apr_size_t *length, ap_read_type block)
{
ap_bucket_shared *s = b->data;
ap_bucket_mmap *m = s->data;
1.19 +1 -1 apache-2.0/src/ap/ap_buckets_pipe.c
Index: ap_buckets_pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_pipe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ap_buckets_pipe.c 2000/11/04 16:34:47 1.18
+++ ap_buckets_pipe.c 2000/11/07 20:21:08 1.19
@@ -59,7 +59,7 @@
/* XXX: We should obey the block flag */
static apr_status_t pipe_read(ap_bucket *a, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
apr_file_t *p = a->data;
ap_bucket *b;
1.4 +2 -2 apache-2.0/src/ap/ap_buckets_pool.c
Index: ap_buckets_pool.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_pool.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_buckets_pool.c 2000/11/04 01:30:29 1.3
+++ ap_buckets_pool.c 2000/11/07 20:21:09 1.4
@@ -62,7 +62,7 @@
ap_bucket_shared *new;
ap_bucket_pool *h = s->data;
ap_bucket *b = h->b;
- apr_ssize_t w;
+ apr_size_t w;
ap_bucket_make_heap(b, h->base, b->length, 1, &w);
new = b->data;
@@ -75,7 +75,7 @@
}
static apr_status_t pool_read(ap_bucket *b, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
ap_bucket_shared *s = b->data;
ap_bucket_pool *h = s->data;
1.12 +2 -2 apache-2.0/src/ap/ap_buckets_simple.c
Index: ap_buckets_simple.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_simple.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ap_buckets_simple.c 2000/11/04 01:30:29 1.11
+++ ap_buckets_simple.c 2000/11/07 20:21:09 1.12
@@ -95,7 +95,7 @@
}
static apr_status_t simple_read(ap_bucket *b, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
ap_bucket_simple *bd = b->data;
*str = bd->start;
@@ -142,7 +142,7 @@
{
ap_bucket_simple *bd;
const char *start, *end;
- apr_ssize_t w;
+ apr_size_t w;
bd = b->data;
start = bd->start;
1.8 +1 -1 apache-2.0/src/ap/ap_buckets_socket.c
Index: ap_buckets_socket.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_socket.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ap_buckets_socket.c 2000/11/04 01:30:30 1.7
+++ ap_buckets_socket.c 2000/11/07 20:21:10 1.8
@@ -59,7 +59,7 @@
/* XXX: We should obey the block flag */
static apr_status_t socket_read(ap_bucket *a, const char **str,
- apr_ssize_t *len, ap_read_type block)
+ apr_size_t *len, ap_read_type block)
{
apr_socket_t *p = a->data;
ap_bucket *b;
1.49 +9 -9 apache-2.0/src/include/ap_buckets.h
Index: ap_buckets.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_buckets.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ap_buckets.h 2000/11/07 00:33:47 1.48
+++ ap_buckets.h 2000/11/07 20:21:18 1.49
@@ -155,9 +155,9 @@
* @param len The amount of data read.
* @param block Should this read function block if there is more data that
* cannot be read immediately.
- * @deffunc apr_status_t read(ap_bucket *b, const char **str, apr_ssize_t *len, ap_read_type block)
+ * @deffunc apr_status_t read(ap_bucket *b, const char **str, apr_size_t *len, ap_read_type block)
*/
- apr_status_t (*read)(ap_bucket *b, const char **str, apr_ssize_t *len, ap_read_type block);
+ apr_status_t (*read)(ap_bucket *b, const char **str, apr_size_t *len, ap_read_type block);
/** Make it possible to set aside the data. For most bucket types this is
* a no-op; buckets containing data that dies when the stack is un-wound
@@ -505,7 +505,7 @@
* @param str The location to store the data in
* @param len The amount of data read
* @param block Whether the read function blocks
- * @deffunc apr_status_t ap_bucket_read(ap_bucket *e, const char **str, apr_ssize_t *len, ap_read_type block)
+ * @deffunc apr_status_t ap_bucket_read(ap_bucket *e, const char **str, apr_size_t *len, ap_read_type block)
*/
#define ap_bucket_read(e,str,len,block) e->type->read(e, str, len, block)
@@ -653,7 +653,7 @@
* @param buf The data to insert into the bucket
* @param nbyte The size of the data to insert.
* @return The new bucket, or NULL if allocation failed
- * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_ssize_t *w)
+ * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t *w)
*/
AP_DECLARE(ap_bucket *) ap_bucket_create_immortal(
const char *buf, apr_size_t nbyte);
@@ -665,7 +665,7 @@
* @param buf The data to insert into the bucket
* @param nbyte The size of the data to insert.
* @return The new bucket, or NULL if allocation failed
- * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_ssize_t *w)
+ * @deffunc ap_bucket *ap_bucket_create_transient(const char *buf, apr_size_t nbyte, apr_size_t *w)
*/
AP_DECLARE(ap_bucket *) ap_bucket_create_transient(
const char *buf, apr_size_t nbyte);
@@ -685,12 +685,12 @@
* @param w The number of bytes actually copied into the bucket.
* If copy is zero then this return value can be ignored by passing a NULL pointer.
* @return The new bucket, or NULL if allocation failed
- * @deffunc ap_bucket *ap_bucket_create_heap(const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w)
+ * @deffunc ap_bucket *ap_bucket_create_heap(const char *buf, apr_size_t nbyte, int copy, apr_size_t *w)
*/
AP_DECLARE(ap_bucket *) ap_bucket_create_heap(
- const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w);
+ const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
AP_DECLARE(ap_bucket *) ap_bucket_make_heap(ap_bucket *b,
- const char *buf, apr_size_t nbyte, int copy, apr_ssize_t *w);
+ const char *buf, apr_size_t nbyte, int copy, apr_size_t *w);
/**
* Create a bucket referring to memory allocated out of a pool.
@@ -711,7 +711,7 @@
* that this bucket refers to
* @param length The number of bytes referred to by this bucket
* @return The new bucket, or NULL if allocation failed
- * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *buf, apr_size_t nbyte, apr_ssize_t *w)
+ * @deffunc ap_bucket *ap_bucket_create_mmap(const apr_mmap_t *buf, apr_size_t nbyte, apr_size_t *w)
*/
AP_DECLARE(ap_bucket *) ap_bucket_create_mmap(
apr_mmap_t *mm, apr_off_t start, apr_size_t length);
1.32 +5 -5 apache-2.0/src/lib/apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- readwrite.c 2000/10/16 06:04:39 1.31
+++ readwrite.c 2000/11/07 20:21:21 1.32
@@ -62,7 +62,7 @@
#include <os2.h>
#include <malloc.h>
-apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes)
+apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
{
ULONG rc = 0;
ULONG bytesread;
@@ -138,7 +138,7 @@
-apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
+apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
{
ULONG rc = 0;
ULONG byteswritten;
@@ -194,7 +194,7 @@
#ifdef HAVE_WRITEV
-apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_ssize_t *nbytes)
+apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_size_t *nbytes)
{
int bytes;
if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
@@ -266,7 +266,7 @@
apr_status_t apr_puts(const char *str, apr_file_t *thefile)
{
- apr_ssize_t len;
+ apr_size_t len;
len = strlen(str);
return apr_write(thefile, str, &len);
@@ -301,7 +301,7 @@
apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
{
- ssize_t readlen;
+ size_t readlen;
apr_status_t rv = APR_SUCCESS;
int i;
1.38 +2 -2 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dir.c 2000/08/06 06:07:03 1.37
+++ dir.c 2000/11/07 20:21:25 1.38
@@ -163,7 +163,7 @@
}
}
-apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir)
+apr_status_t apr_dir_entry_size(apr_size_t *size, apr_dir_t *thedir)
{
struct stat filestat;
char *fname = NULL;
@@ -175,7 +175,7 @@
fname = apr_pstrcat(thedir->cntxt, thedir->dirname, "/",
thedir->entry->d_name, NULL);
if (stat(fname, &filestat) == -1) {
- *size = -1;
+ *size = 0;
return errno;
}
1.61 +8 -8 apache-2.0/src/lib/apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- readwrite.c 2000/10/16 06:04:40 1.60
+++ readwrite.c 2000/11/07 20:21:26 1.61
@@ -101,10 +101,10 @@
/* problems:
* 1) ungetchar not used for buffered files
*/
-apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes)
+apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
{
apr_ssize_t rv;
- apr_ssize_t bytes_read;
+ apr_size_t bytes_read;
if (*nbytes <= 0) {
*nbytes = 0;
@@ -205,7 +205,7 @@
}
}
-apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
+apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
{
apr_size_t rv;
@@ -277,7 +277,7 @@
}
apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec,
- apr_size_t nvec, apr_ssize_t *nbytes)
+ apr_size_t nvec, apr_size_t *nbytes)
{
#ifdef HAVE_WRITEV
int bytes;
@@ -298,7 +298,7 @@
apr_status_t apr_putc(char ch, apr_file_t *thefile)
{
- apr_ssize_t nbytes = 1;
+ apr_size_t nbytes = 1;
return apr_write(thefile, &ch, &nbytes);
}
@@ -311,14 +311,14 @@
apr_status_t apr_getc(char *ch, apr_file_t *thefile)
{
- apr_ssize_t nbytes = 1;
+ apr_size_t nbytes = 1;
return apr_read(thefile, ch, &nbytes);
}
apr_status_t apr_puts(const char *str, apr_file_t *thefile)
{
- apr_ssize_t nbytes = strlen(str);
+ apr_size_t nbytes = strlen(str);
return apr_write(thefile, str, &nbytes);
}
@@ -348,7 +348,7 @@
apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
{
apr_status_t rv = APR_SUCCESS; /* get rid of gcc warning */
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
char *final = str + len - 1;
if (len <= 1) {
1.49 +10 -10 apache-2.0/src/lib/apr/file_io/win32/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- readwrite.c 2000/11/07 01:27:14 1.48
+++ readwrite.c 2000/11/07 20:21:29 1.49
@@ -65,7 +65,7 @@
* read_with_timeout()
* Uses async i/o to emulate unix non-blocking i/o with timeouts.
*/
-static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_ssize_t len, apr_ssize_t *nbytes)
+static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t len, apr_size_t *nbytes)
{
apr_status_t rv;
*nbytes = 0;
@@ -148,9 +148,9 @@
return rv;
}
-apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *len)
+apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *len)
{
- apr_ssize_t rv;
+ apr_size_t rv;
DWORD bytes_read = 0;
if (*len <= 0) {
@@ -172,8 +172,8 @@
}
if (thefile->buffered) {
char *pos = (char *)buf;
- apr_ssize_t blocksize;
- apr_ssize_t size = *len;
+ apr_size_t blocksize;
+ apr_size_t size = *len;
apr_lock(thefile->mutex);
@@ -213,7 +213,7 @@
apr_unlock(thefile->mutex);
} else {
/* Unbuffered i/o */
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
rv = read_with_timeout(thefile, buf, *len, &nbytes);
*len = nbytes;
}
@@ -221,7 +221,7 @@
return rv;
}
-apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes)
+apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
{
apr_status_t rv;
DWORD bwrote;
@@ -235,7 +235,7 @@
if (thefile->direction == 0) {
// Position file pointer for writing at the offset we are logically reading from
- apr_ssize_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
+ apr_size_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
if (offset != thefile->filePtr)
SetFilePointer(thefile->filehand, offset, NULL, FILE_BEGIN);
thefile->bufpos = thefile->dataRead = 0;
@@ -276,7 +276,7 @@
* Too bad WriteFileGather() is not supported on 95&98 (or NT prior to SP2)
*/
apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec,
- apr_ssize_t *nbytes)
+ apr_size_t *nbytes)
{
apr_status_t rv = APR_SUCCESS;
int i;
@@ -337,7 +337,7 @@
apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile)
{
- apr_ssize_t readlen;
+ apr_size_t readlen;
apr_status_t rv = APR_SUCCESS;
int i;
1.71 +4 -4 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- apr_file_io.h 2000/11/05 06:09:09 1.70
+++ apr_file_io.h 2000/11/07 20:21:33 1.71
@@ -357,7 +357,7 @@
*
* APR_EINTR is never returned.
*/
-apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_ssize_t *nbytes);
+apr_status_t apr_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes);
/**
* Write data to the specified file.
@@ -373,7 +373,7 @@
*
* APR_EINTR is never returned.
*/
-apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes);
+apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes);
/**
* Write data from iovec array to the specified file.
@@ -391,7 +391,7 @@
* doesn't provide writev().
*/
apr_status_t apr_writev(apr_file_t *thefile, const struct iovec *vec,
- apr_size_t nvec, apr_ssize_t *nbytes);
+ apr_size_t nvec, apr_size_t *nbytes);
/**
* Read data from the specified file.
@@ -648,7 +648,7 @@
* @param size the size of the directory entry.
* @param thedir the currently open directory.
*/
-apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir);
+apr_status_t apr_dir_entry_size(apr_size_t *size, apr_dir_t *thedir);
/**
* Get the last modified time of the current directory entry.
1.61 +4 -4 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr_network_io.h 2000/11/03 19:24:05 1.60
+++ apr_network_io.h 2000/11/07 20:21:34 1.61
@@ -271,7 +271,7 @@
* APR_EINTR is never returned.
* </PRE>
*/
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len);
+apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len);
/**
* Send multiple packets of data over a network.
@@ -291,7 +291,7 @@
* </PRE>
*/
apr_status_t apr_sendv(apr_socket_t *sock, const struct iovec *vec,
- apr_int32_t nvec, apr_ssize_t *len);
+ apr_int32_t nvec, apr_size_t *len);
#if APR_HAS_SENDFILE
/**
@@ -308,7 +308,7 @@
* The number of bytes actually sent is stored in argument 5.
*/
apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file, apr_hdtr_t *hdtr,
- apr_off_t *offset, apr_ssize_t *len, apr_int32_t flags);
+ apr_off_t *offset, apr_size_t *len, apr_int32_t flags);
#endif
/**
@@ -329,7 +329,7 @@
* APR_EINTR is never returned.
* </PRE>
*/
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len);
+apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len);
/**
* Setup socket options for the specified socket
1.17 +3 -3 apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sendrecv.c 2000/08/29 18:48:45 1.16
+++ sendrecv.c 2000/11/07 20:21:36 1.17
@@ -92,7 +92,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
+apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
ssize_t rv;
@@ -120,7 +120,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
+apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
apr_ssize_t rv;
@@ -151,7 +151,7 @@
/* BeOS doesn't have writev for sockets so we use the following instead...
*/
apr_status_t apr_sendv(apr_socket_t * sock, const struct iovec *vec,
- apr_int32_t nvec, apr_ssize_t *len)
+ apr_int32_t nvec, apr_size_t *len)
{
*len = vec[0].iov_len;
return apr_send(sock, vec[0].iov_base, len);
1.15 +2 -2 apache-2.0/src/lib/apr/network_io/os2/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sendrecv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendrecv.c 2000/08/02 05:26:27 1.14
+++ sendrecv.c 2000/11/07 20:21:41 1.15
@@ -59,7 +59,7 @@
#include "apr_lib.h"
#include <sys/time.h>
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
+apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
ssize_t rv;
int fds, err = 0;
@@ -98,7 +98,7 @@
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
+apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
ssize_t rv;
int fds, err = 0;
1.45 +10 -10 apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sendrecv.c 2000/11/03 18:05:02 1.44
+++ sendrecv.c 2000/11/07 20:21:45 1.45
@@ -101,7 +101,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
+apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
ssize_t rv;
@@ -130,7 +130,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
+apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
ssize_t rv;
@@ -164,7 +164,7 @@
#ifdef HAVE_WRITEV
apr_status_t apr_sendv(apr_socket_t * sock, const struct iovec *vec,
- apr_int32_t nvec, apr_ssize_t *len)
+ apr_int32_t nvec, apr_size_t *len)
{
apr_ssize_t rv;
@@ -251,7 +251,7 @@
}
apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
- apr_hdtr_t *hdtr, apr_off_t *offset, apr_ssize_t *len,
+ apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
apr_int32_t flags)
{
off_t off = *offset;
@@ -382,7 +382,7 @@
/* Release 3.1 or greater */
apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
- apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
+ apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
apr_int32_t flags)
{
off_t nbytes;
@@ -475,7 +475,7 @@
/* HP-UX Version 10.30 or greater */
apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
- apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
+ apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
apr_int32_t flags)
{
int i, ptr = 0;
@@ -582,7 +582,7 @@
* OS/390 - V2R7 and above
*/
apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
- apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
+ apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
apr_int32_t flags)
{
int i, ptr, rv = 0;
@@ -711,7 +711,7 @@
* all cases of the headers and trailers seems to be a good idea.
*/
apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
- apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
+ apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
apr_int32_t flags)
{
off_t nbytes = 0;
@@ -728,7 +728,7 @@
flags = 0;
if (hdtr->numheaders > 0) {
- apr_ssize_t hdrbytes = 0;
+ apr_size_t hdrbytes = 0;
arv = apr_sendv(sock, hdtr->headers, hdtr->numheaders, &hdrbytes);
if (arv != APR_SUCCESS) {
@@ -796,7 +796,7 @@
nbytes += rv;
if (hdtr->numtrailers > 0) {
- apr_ssize_t trlbytes = 0;
+ apr_size_t trlbytes = 0;
/* send the trailers now */
arv = apr_sendv(sock, hdtr->trailers, hdtr->numtrailers, &trlbytes);
1.29 +4 -4 apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sendrecv.c 2000/11/03 18:05:04 1.28
+++ sendrecv.c 2000/11/07 20:21:48 1.29
@@ -70,7 +70,7 @@
* of data.
*/
#define MAX_SEGMENT_SIZE 65536
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_ssize_t *len)
+apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
{
apr_ssize_t rv;
WSABUF wsaData;
@@ -91,7 +91,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_ssize_t *len)
+apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
{
apr_ssize_t rv;
WSABUF wsaData;
@@ -179,7 +179,7 @@
/*
* apr_status_t apr_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *,
- * apr_off_t *, apr_ssize_t *, apr_int32_t flags)
+ * apr_off_t *, apr_size_t *, apr_int32_t flags)
* Send a file from an open file descriptor to a socket, along with
* optional headers and trailers
* arg 1) The socket to which we're writing
@@ -190,7 +190,7 @@
* arg 6) APR flags that are mapped to OS specific flags
*/
apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
- apr_hdtr_t * hdtr, apr_off_t * offset, apr_ssize_t * len,
+ apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
apr_int32_t flags)
{
apr_status_t status = APR_SUCCESS;
1.59 +1 -1 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- http_connection.c 2000/11/03 02:17:56 1.58
+++ http_connection.c 2000/11/07 20:21:51 1.59
@@ -156,7 +156,7 @@
{
char dummybuf[512];
apr_time_t start;
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
apr_status_t rc;
int timeout;
1.204 +15 -15 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.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- http_core.c 2000/11/06 17:32:13 1.203
+++ http_core.c 2000/11/07 20:21:52 1.204
@@ -2560,12 +2560,12 @@
#endif
static apr_status_t writev_it_all(apr_socket_t *s, struct iovec *vec, int nvec,
- apr_ssize_t len, apr_ssize_t *nbytes)
+ apr_size_t len, apr_size_t *nbytes)
{
apr_size_t bytes_written = 0;
apr_status_t rv;
- apr_ssize_t n = len;
- apr_ssize_t i = 0;
+ apr_size_t n = len;
+ apr_size_t i = 0;
*nbytes = 0;
@@ -2607,12 +2607,12 @@
*/
static apr_status_t send_the_file(conn_rec *c, apr_file_t *fd,
apr_hdtr_t *hdtr, apr_off_t offset,
- apr_ssize_t length, apr_ssize_t *nbytes)
+ apr_size_t length, apr_size_t *nbytes)
{
apr_status_t rv = APR_SUCCESS;
apr_int32_t togo; /* Remaining number of bytes in the file to send */
- apr_ssize_t sendlen = 0;
- apr_ssize_t bytes_sent;
+ apr_size_t sendlen = 0;
+ apr_size_t bytes_sent;
apr_int32_t i;
apr_off_t o; /* Track the file offset for partial writes */
char buffer[8192];
@@ -3071,8 +3071,8 @@
typedef struct COALESCE_FILTER_CTX {
char *buf; /* Start of buffer */
char *cur; /* Pointer to next location to write */
- apr_ssize_t cnt; /* Number of bytes put in buf */
- apr_ssize_t avail; /* Number of bytes available in the buf */
+ apr_size_t cnt; /* Number of bytes put in buf */
+ apr_size_t avail; /* Number of bytes available in the buf */
} coalesce_filter_ctx_t;
#define FILTER_BUFF_SIZE 8192
#define MIN_BUCKET_SIZE 200
@@ -3107,7 +3107,7 @@
}
else {
const char *str;
- apr_ssize_t n;
+ apr_size_t n;
rv = ap_bucket_read(e, &str, &n, AP_BLOCK_READ);
if (rv != APR_SUCCESS) {
/* XXX: log error */
@@ -3220,7 +3220,7 @@
else if (e->length == -1) {
/* unknown amount of data (e.g. a pipe) */
const char *data;
- apr_ssize_t len;
+ apr_size_t len;
rv = ap_bucket_read(e, &data, &len, AP_BLOCK_READ);
if (rv != APR_SUCCESS) {
@@ -3343,18 +3343,18 @@
{
apr_status_t rv;
ap_bucket_brigade *more = NULL;
- apr_ssize_t bytes_sent = 0, nbytes;
+ apr_size_t bytes_sent = 0, nbytes;
ap_bucket *e;
conn_rec *c = f->c;
core_output_filter_ctx_t *ctx = f->ctx;
- apr_ssize_t nvec = 0;
- apr_ssize_t nvec_trailers= 0;
+ apr_size_t nvec = 0;
+ apr_size_t nvec_trailers= 0;
struct iovec vec[MAX_IOVEC_TO_WRITE];
struct iovec vec_trailers[MAX_IOVEC_TO_WRITE];
apr_file_t *fd = NULL;
- apr_ssize_t flen = 0;
+ apr_size_t flen = 0;
apr_off_t foffset = 0;
if (ctx == NULL) {
@@ -3384,7 +3384,7 @@
}
else {
const char *str;
- apr_ssize_t n;
+ apr_size_t n;
rv = ap_bucket_read(e, &str, &n, AP_BLOCK_READ);
if (n) {
nbytes += n;
1.231 +9 -9 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.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- http_protocol.c 2000/11/07 18:09:47 1.230
+++ http_protocol.c 2000/11/07 20:21:53 1.231
@@ -806,8 +806,8 @@
}
struct dechunk_ctx {
- apr_ssize_t chunk_size;
- apr_ssize_t bytes_delivered;
+ apr_size_t chunk_size;
+ apr_size_t bytes_delivered;
enum {WANT_HDR /* must have value zero */, WANT_BODY, WANT_TRL} state;
};
@@ -821,7 +821,7 @@
struct dechunk_ctx *ctx = f->ctx;
ap_bucket *b;
const char *buf;
- apr_ssize_t len;
+ apr_size_t len;
if (!ctx) {
f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(struct dechunk_ctx));
@@ -907,7 +907,7 @@
#define ASCII_TAB '\011'
ap_bucket *e;
char *buff;
- apr_ssize_t len;
+ apr_size_t len;
char *pos;
http_ctx_t *ctx = f->ctx;
apr_status_t rv;
@@ -1031,7 +1031,7 @@
int retval;
int total = 0;
int looking_ahead = 0;
- apr_ssize_t length;
+ apr_size_t length;
conn_rec *c = r->connection;
core_request_config *req_cfg;
ap_bucket_brigade *b;
@@ -2278,7 +2278,7 @@
AP_BRIGADE_FOREACH(e, b) {
const char *ignored;
- apr_ssize_t length;
+ apr_size_t length;
if (AP_BUCKET_IS_EOS(e) || AP_BUCKET_IS_FLUSH(e)) {
ctx->hold_data = 0;
@@ -2629,7 +2629,7 @@
*/
AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer, int bufsiz)
{
- apr_ssize_t len_read, total;
+ apr_size_t len_read, total;
apr_status_t rv;
ap_bucket *b, *old;
const char *tempbuf;
@@ -2841,7 +2841,7 @@
AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)
{
ap_bucket_brigade *bb = NULL;
- apr_ssize_t written;
+ apr_size_t written;
if (r->connection->aborted)
return EOF;
@@ -2874,7 +2874,7 @@
AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r, ...)
{
ap_bucket_brigade *bb = NULL;
- apr_ssize_t written;
+ apr_size_t written;
va_list va;
if (r->connection->aborted)
1.24 +2 -2 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rfc1413.c 2000/10/26 10:48:28 1.23
+++ rfc1413.c 2000/11/07 20:21:54 1.24
@@ -158,7 +158,7 @@
/* send query to server. Handle short write. */
i = 0;
while(i < strlen(buffer)) {
- apr_ssize_t j = strlen(buffer + i);
+ apr_size_t j = strlen(buffer + i);
apr_status_t status;
status = apr_send(sock, buffer+i, &j);
if (status != APR_SUCCESS && !APR_STATUS_IS_EINTR(status)) {
@@ -184,7 +184,7 @@
* this allows it to work on both ASCII and EBCDIC machines.
*/
while((cp = strchr(buffer, '\012')) == NULL && i < sizeof(buffer) - 1) {
- apr_ssize_t j = sizeof(buffer) - 1 - i;
+ apr_size_t j = sizeof(buffer) - 1 - i;
apr_status_t status;
status = apr_recv(sock, buffer+i, &j);
if (status != APR_SUCCESS && !APR_STATUS_IS_EINTR(status)) {
1.22 +1 -1 apache-2.0/src/main/util_md5.c
Index: util_md5.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- util_md5.c 2000/10/25 18:54:20 1.21
+++ util_md5.c 2000/11/07 20:21:55 1.22
@@ -200,7 +200,7 @@
apr_md5_ctx_t context;
unsigned char buf[1000];
long length = 0;
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
apr_off_t offset = 0L;
apr_MD5Init(&context);