You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/02/10 16:26:43 UTC
svn commit: r1069427 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ssl/ssl_engine_io.c
Author: jim
Date: Thu Feb 10 15:26:43 2011
New Revision: 1069427
URL: http://svn.apache.org/viewvc?rev=1069427&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1069427&r1=1069426&r2=1069427&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Feb 10 15:26:43 2011
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1069427&r1=1069426&r2=1069427&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Feb 10 15:26:43 2011
@@ -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
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c?rev=1069427&r1=1069426&r2=1069427&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c Thu Feb 10 15:26:43 2011
@@ -749,6 +749,10 @@ static apr_status_t ssl_io_input_getline
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;
}