mod_ssl: fixed wrong 3rd parameter passed to apr_brigade_split_line().

Reported on the list by Jie Gao.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@819430 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 6ee44f2232e7f3eec5b1dc35726c7f673829343a..bdbafd9dc77bcd2b22d354a3a1cdf0446f0a6e42 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.15
 
+  *) mod_ssl: fixed wrong 3rd parameter passed to to apr_brigade_split_line().
+     Reported on the list by Jie Gao. [Guenter Knauf]
+
   *) mod_dbd: Backport of r708820 from trunk to avoid compiler warnings with
      strict compilers like Sun Studio. Reported on the list by Jie Gao.
      [Guenter Knauf]

diff --git a/STATUS b/STATUS
index 7507e0f1be5ca43c3f932d461d686b0ca78f42db..27ad53782955ad05bdd6cf95d0fb98d1235a46bd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,12 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_ssl: Backport of r819373 from trunk; fix wrong 3rd parameter passed
-   to to apr_brigade_split_line().  Mentioned on the list by Jie Gao.
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=819373
-   2.2.x patch: trunk should work with offset.
-   +1: fuankg, trawick, rpluem
-
  * mod_rewrite: Add scgi scheme detection. /me completely forgot, that
    mod_rewrite was extended for this as well...
    Trunk Patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?r1=728220&r2=729538

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 6e58c6b31979ab754b84d591efa98f012467b606..53626bc9de7737b8956038a37a34357a93b55551 100644 (file)
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1665,7 +1665,7 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f,
     }
     else {
         /* Split a line into the passed-in brigade. */
-        rv = apr_brigade_split_line(bb, ctx->bb, mode, bytes);
+        rv = apr_brigade_split_line(bb, ctx->bb, block, bytes);
 
         if (rv) {
             ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, f->c,