From 17c24f88a42013c78e30d9a1d9992c9b40070f91 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 22 Dec 2016 22:57:41 +0000 Subject: [PATCH] Backports: r1483005 Submitted by: jailletc36 core: Do not over allocate memory within 'ap_rgetline_core' for the common case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775767 13f79535-47bb-0310-9956-ffa450edef68 --- server/protocol.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/protocol.c b/server/protocol.c index 76c15838484..6876c0a4f99 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -183,9 +183,6 @@ AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime) return (mtime > now) ? now : mtime; } -/* Min # of bytes to allocate when reading a request line */ -#define MIN_LINE_ALLOC 80 - /* Get a line of protocol input, including any continuation lines * caused by MIME folding (or broken clients) if fold != 0, and place it * in the buffer s, of size n bytes, without the ending newline. @@ -284,9 +281,6 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, /* We'll assume the common case where one bucket is enough. */ if (!*s) { current_alloc = len; - if (current_alloc < MIN_LINE_ALLOC) { - current_alloc = MIN_LINE_ALLOC; - } *s = apr_palloc(r->pool, current_alloc); } else if (bytes_handled + len > current_alloc) { -- 2.47.2