Commit 81cc115e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent c60055e9

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −10
Changes for STATUS: 0 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/ssl/ssl_engine_io.c

+4 −0
Changes for modules/ssl/ssl_engine_io.c: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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;

        }