From fd1950344aa403afbb5acc087b5ee10164b234b7 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Fri, 12 Oct 2001 02:00:41 +0000 Subject: [PATCH] Lose the magic number and use the central #define AP_IOBUFSIZE. Hey, I've never seen it in actual use anywhere, so I didn't know. Thanks to Roy for pointing it out. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91440 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_http.c | 4 ++-- modules/ssl/ssl_engine_io.c | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c index ff89a32678..87d39fb2ed 100644 --- a/modules/proxy/proxy_http.c +++ b/modules/proxy/proxy_http.c @@ -812,7 +812,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, apr_off_t readbytes; apr_bucket *e; rp->headers_in = r->headers_out; - readbytes = 8192; + readbytes = AP_IOBUFSIZE; while (ap_get_brigade(rp->input_filters, bb, AP_MODE_NONBLOCKING, @@ -837,7 +837,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, break; } apr_brigade_cleanup(bb); - readbytes = 8192; + readbytes = AP_IOBUFSIZE; } } ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server, diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index b8f5665a84..01ca180206 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -309,7 +309,7 @@ static apr_status_t churn_input(SSLFilterRec *pRec, ap_input_mode_t eMode, return APR_SUCCESS; } if (rv == SSL_ERROR_WANT_READ) { - apr_off_t tempread = 1024; + apr_off_t tempread = AP_IOBUFSIZE; return churn_input(pRec, eMode, &tempread); } return rv; @@ -331,7 +331,7 @@ static apr_status_t churn_input(SSLFilterRec *pRec, ap_input_mode_t eMode, } if (n < 0 && errno == EINTR && APR_BRIGADE_EMPTY(ctx->b)) { - apr_off_t tempread = 1024; + apr_off_t tempread = AP_IOBUFSIZE; return churn_input(pRec, eMode, &tempread); } @@ -462,10 +462,9 @@ static apr_status_t ssl_io_filter_Input(ap_filter_t *f, return APR_SUCCESS; } - /* Readbytes == 0 implies we only want a LF line. - * 1024 seems like a good number for now. */ + /* Readbytes == 0 implies we only want a LF line. */ if (APR_BRIGADE_EMPTY(ctx->b)) { - tempread = 1024; + tempread = AP_IOBUFSIZE; rv = churn_input(ctx, mode, &tempread); if (rv != APR_SUCCESS) return rv; @@ -505,7 +504,7 @@ static apr_status_t ssl_io_filter_Input(ap_filter_t *f, /* Hey, we're about to be starved - go fetch more data. */ if (APR_BRIGADE_EMPTY(ctx->b)) { - tempread = 1024; + tempread = AP_IOBUFSIZE; ret = churn_input(ctx, mode, &tempread); if (ret != APR_SUCCESS) return ret; -- 2.50.1