www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* Do not drop contents of incomplete lines, but safe them for the next

Browse Source 
round of reading.

PR: 50481


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051468 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2010-12-21 11:43:42 +00:00
parent 35419d4827
commit 98a2ee3314
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -2,6 +2,9 @@
Changes with Apache 2.3.11 Changes with Apache 2.3.11
*) mod_ssl: Correctly read full lines in input filter when the line is
incomplete during first read. PR 50481. [Ruediger Pluem]
*) mod_authz_core: Add AuthzSendForbiddenOnFailure directive to allow *) mod_authz_core: Add AuthzSendForbiddenOnFailure directive to allow
sending '403 FORBIDDEN' instead of '401 UNAUTHORIZED' if authorization sending '403 FORBIDDEN' instead of '401 UNAUTHORIZED' if authorization
fails for an authenticated user. PR 40721. [Stefan Fritsch] fails for an authenticated user. PR 40721. [Stefan Fritsch]

8
modules/ssl/ssl_engine_io.c
View File

@@ -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); status = ssl_io_input_read(inctx, buf + offset, &tmplen);
if (status != APR_SUCCESS) { 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; return status;
} }
@@ -782,6 +786,10 @@ static apr_status_t ssl_io_input_getline(bio_filter_in_ctx_t *inctx,
*len = bytes; *len = bytes;
} }
else {
/* Safe the part of the line we already got */
char_buffer_write(&inctx->cbuf, buf, *len);
}
return APR_SUCCESS; return APR_SUCCESS;
} }