You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2009/09/28 02:33:50 UTC
svn commit: r819430 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ssl/ssl_engine_io.c
Author: fuankg
Date: Mon Sep 28 00:33:50 2009
New Revision: 819430
URL: http://svn.apache.org/viewvc?rev=819430&view=rev
Log:
mod_ssl: fixed wrong 3rd parameter passed to apr_brigade_split_line().
Reported on the list by Jie Gao.
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=819430&r1=819429&r2=819430&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Sep 28 00:33:50 2009
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=819430&r1=819429&r2=819430&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Sep 28 00:33:50 2009
@@ -87,12 +87,6 @@
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
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=819430&r1=819429&r2=819430&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 Mon Sep 28 00:33:50 2009
@@ -1665,7 +1665,7 @@
}
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,