Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 170EE96F6 for ; Sat, 24 Mar 2012 00:57:50 +0000 (UTC) Received: (qmail 44978 invoked by uid 500); 24 Mar 2012 00:57:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 44908 invoked by uid 500); 24 Mar 2012 00:57:49 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 44901 invoked by uid 99); 24 Mar 2012 00:57:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Mar 2012 00:57:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Mar 2012 00:57:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B1D02388860; Sat, 24 Mar 2012 00:57:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1304689 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/filters/mod_request.c Date: Sat, 24 Mar 2012 00:57:28 -0000 To: cvs@httpd.apache.org From: igalic@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120324005728.4B1D02388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: igalic Date: Sat Mar 24 00:57:27 2012 New Revision: 1304689 URL: http://svn.apache.org/viewvc?rev=1304689&view=rev Log: revert r1304688: next time, look at the patch online, maybe.. Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/STATUS httpd/httpd/branches/2.4.x/modules/filters/mod_request.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ Reverse-merged /httpd/httpd/trunk:r1304641 Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1304689&r1=1304688&r2=1304689&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Sat Mar 24 00:57:27 2012 @@ -134,7 +134,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: * mod_request: PR52981 check apr_stroff error correctly to allow KeptBodySize to be used Trunk patch: http://svn.apache.org/viewvc?rev=1304641&view=rev 2.4.x patch: trunk works + CHANGES. - +1: covener, igalic + +1: covener PATCHES/ISSUES THAT ARE STALLED Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_request.c?rev=1304689&r1=1304688&r2=1304689&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/filters/mod_request.c (original) +++ httpd/httpd/branches/2.4.x/modules/filters/mod_request.c Sat Mar 24 00:57:27 2012 @@ -358,7 +358,7 @@ static const char *set_kept_body_size(cm char *end = NULL; if (APR_SUCCESS != apr_strtoff(&(conf->keep_body), arg, &end, 10) - || conf->keep_body < 0 || *end) { + || conf->keep_body < 0 || end) { return "KeptBodySize must be a valid size in bytes, or zero."; } conf->keep_body_set = 1;