From 08a0a36c86313f738c79b7498be70c567a026be4 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 10 Feb 2011 15:26:43 +0000 Subject: [PATCH] Merge r1051468, r1058133, r1059037 from trunk: * Do not drop contents of incomplete lines, but safe them for the next round of reading. PR: 50481 * Fix comment typo as noticed by jorton * We can only get there if the line is too long and in this case we should return the partial line as defined in util_filter.h. Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1069427 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 10 ---------- modules/ssl/ssl_engine_io.c | 4 ++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index cbfe34fd35c..dc2bb374808 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.18 + *) mod_ssl: Correctly read full lines in input filter when the line is + incomplete during first read. PR 50481. [Ruediger Pluem] + *) mod_autoindex: Merge IndexOptions from server to directory context when the directory has no mod_autoindex directives. PR 47766. [Eric Covener] diff --git a/STATUS b/STATUS index 95e86af297d..17fa73215d7 100644 --- a/STATUS +++ b/STATUS @@ -90,16 +90,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_ssl: Correctly read full lines in input filter when the line is - incomplete during first read. PR 50481. - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=1051468&view=rev - http://svn.apache.org/viewcvs.cgi?rev=1058133&view=rev - http://svn.apache.org/viewcvs.cgi?rev=1059037&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, jorton, jim - * prefork: Update MPM state in children; implement fast exit from connection loop via ap_graceful_stop_signalled. PR 41743. Trunk patch: http://svn.apache.org/viewvc?rev=1068389&view=rev diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 9f5d2832042..da9a8229415 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -749,6 +749,10 @@ static apr_status_t ssl_io_input_getline(bio_filter_in_ctx_t *inctx, status = ssl_io_input_read(inctx, buf + offset, &tmplen); if (status != APR_SUCCESS) { + if (APR_STATUS_IS_EAGAIN(status) && (*len > 0)) { + /* Save the part of the line we already got */ + char_buffer_write(&inctx->cbuf, buf, *len); + } return status; } -- 2.47.2