Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0BE7F200C14 for ; Tue, 7 Feb 2017 19:31:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0A7DC160B32; Tue, 7 Feb 2017 18:31:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5886F160B3E for ; Tue, 7 Feb 2017 19:31:54 +0100 (CET) Received: (qmail 74621 invoked by uid 500); 7 Feb 2017 18:31:53 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 74612 invoked by uid 99); 7 Feb 2017 18:31:53 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2017 18:31:53 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1248C3A0F9E for ; Tue, 7 Feb 2017 18:31:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1782044 - in /apr/apr-util/branches/1.6.x: ./ redis/apr_redis.c Date: Tue, 07 Feb 2017 18:31:53 -0000 To: commits@apr.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170207183153.1248C3A0F9E@svn01-us-west.apache.org> archived-at: Tue, 07 Feb 2017 18:31:55 -0000 Author: ylavic Date: Tue Feb 7 18:31:52 2017 New Revision: 1782044 URL: http://svn.apache.org/viewvc?rev=1782044&view=rev Log: Merge r1782042 from trunk. apr_redis: reserve buffer space for trailing \0. Modified: apr/apr-util/branches/1.6.x/ (props changed) apr/apr-util/branches/1.6.x/redis/apr_redis.c Propchange: apr/apr-util/branches/1.6.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 7 18:31:52 2017 @@ -1,4 +1,4 @@ -/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391 +/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378,1772414,1778153,1781391,1782042 /apr/apr-util/branches/1.3.x:896410,1154885 /apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330 /apr/apr-util/branches/1.5.x:1757430 Modified: apr/apr-util/branches/1.6.x/redis/apr_redis.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/redis/apr_redis.c?rev=1782044&r1=1782043&r2=1782044&view=diff ============================================================================== --- apr/apr-util/branches/1.6.x/redis/apr_redis.c (original) +++ apr/apr-util/branches/1.6.x/redis/apr_redis.c Tue Feb 7 18:31:52 2017 @@ -372,7 +372,7 @@ rc_conn_construct(void **conn_, void *pa return rv; } - conn->buffer = apr_palloc(conn->p, BUFFER_SIZE); + conn->buffer = apr_palloc(conn->p, BUFFER_SIZE + 1); conn->blen = 0; conn->rs = rs;