summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2010-12-21 11:43:42 +0000
committerRuediger Pluem <rpluem@apache.org>2010-12-21 11:43:42 +0000
commit98a2ee3314e380a162ecd7cff0c584c441be99b7 (patch)
tree1652b9d407ae9d9e005bca2b8375936fd79653f8 /modules
parent35419d4827d528b2238c105b65d535fe488a1665 (diff)
downloadhttpd-98a2ee3314e380a162ecd7cff0c584c441be99b7.tar.gz
* Do not drop contents of incomplete lines, but safe them for the next
round of reading. PR: 50481 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/ssl/ssl_engine_io.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index da64c05953..4ccb3ced1a 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -756,6 +756,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)) {
+ /* Safe the part of the line we already got */
+ char_buffer_write(&inctx->cbuf, buf, *len);
+ }
return status;
}
@@ -782,6 +786,10 @@ static apr_status_t ssl_io_input_getline(bio_filter_in_ctx_t *inctx,
*len = bytes;
}
+ else {
+ /* Safe the part of the line we already got */
+ char_buffer_write(&inctx->cbuf, buf, *len);
+ }
return APR_SUCCESS;
}