jwoolley 01/02/28 09:19:07
Modified: buckets apr_buckets_file.c apr_buckets_pipe.c
apr_buckets_socket.c
include apr_buckets.h
Log:
*) Standardize on APR_BUCKET_BUFF_SIZE instead of HUGE_STRING_LEN.
*) Adjust APR_BUCKET_BUFF_SIZE to be exactly 8KB.
To be determined: the fate of HUGE_STRING_LEN over in apr_lib.h
Revision Changes Path
1.37 +3 -2 apr-util/buckets/apr_buckets_file.c
Index: apr_buckets_file.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_file.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -u -r1.36 -r1.37
--- apr_buckets_file.c 2001/02/27 20:45:36 1.36
+++ apr_buckets_file.c 2001/02/28 17:18:59 1.37
@@ -54,7 +54,6 @@
#include "apr.h"
#include "apr_general.h"
-#include "apr_lib.h"
#include "apr_file_io.h"
#include "apr_buckets.h"
#include <stdlib.h>
@@ -132,7 +131,9 @@
}
#endif
- *len = (filelength > HUGE_STRING_LEN) ? HUGE_STRING_LEN : filelength;
+ *len = (filelength > APR_BUCKET_BUFF_SIZE)
+ ? APR_BUCKET_BUFF_SIZE
+ : filelength;
*str = NULL; /* in case we die prematurely */
buf = malloc(*len);
1.33 +2 -3 apr-util/buckets/apr_buckets_pipe.c
Index: apr_buckets_pipe.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -u -r1.32 -r1.33
--- apr_buckets_pipe.c 2001/02/27 20:45:36 1.32
+++ apr_buckets_pipe.c 2001/02/28 17:19:00 1.33
@@ -52,7 +52,6 @@
* <http://www.apache.org/>.
*/
-#include "apr_lib.h"
#include "apr_buckets.h"
#include <stdlib.h>
@@ -70,7 +69,7 @@
}
*str = NULL;
- *len = HUGE_STRING_LEN;
+ *len = APR_BUCKET_BUFF_SIZE;
buf = malloc(*len); /* XXX: check for failure? */
rv = apr_file_read(p, buf, len);
@@ -101,7 +100,7 @@
/* XXX: check for failure? */
a = apr_bucket_heap_make(a, buf, *len, 0, NULL);
h = a->data;
- h->alloc_len = HUGE_STRING_LEN; /* note the real buffer size */
+ h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
*str = buf;
APR_BUCKET_INSERT_AFTER(a, apr_bucket_pipe_create(p));
}
1.22 +2 -3 apr-util/buckets/apr_buckets_socket.c
Index: apr_buckets_socket.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -u -r1.21 -r1.22
--- apr_buckets_socket.c 2001/02/27 20:45:36 1.21
+++ apr_buckets_socket.c 2001/02/28 17:19:01 1.22
@@ -52,7 +52,6 @@
* <http://www.apache.org/>.
*/
-#include "apr_lib.h"
#include "apr_buckets.h"
#include <stdlib.h>
@@ -70,7 +69,7 @@
}
*str = NULL;
- *len = HUGE_STRING_LEN;
+ *len = APR_BUCKET_BUFF_SIZE;
buf = malloc(*len); /* XXX: check for failure? */
rv = apr_recv(p, buf, len);
@@ -104,7 +103,7 @@
/* XXX: check for failure? */
a = apr_bucket_heap_make(a, buf, *len, 0, NULL);
h = a->data;
- h->alloc_len = HUGE_STRING_LEN; /* note the real buffer size */
+ h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
*str = buf;
APR_BUCKET_INSERT_AFTER(a, apr_bucket_socket_create(p));
}
1.85 +1 -1 apr-util/include/apr_buckets.h
Index: apr_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -u -r1.84 -r1.85
--- apr_buckets.h 2001/02/28 04:41:14 1.84
+++ apr_buckets.h 2001/02/28 17:19:05 1.85
@@ -78,7 +78,7 @@
* @package Bucket Brigades
*/
-#define APR_BUCKET_BUFF_SIZE 9000
+#define APR_BUCKET_BUFF_SIZE 8192
typedef enum {
APR_BLOCK_READ,
