Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8832A63AA for ; Fri, 3 Jun 2011 06:48:47 +0000 (UTC) Received: (qmail 66243 invoked by uid 500); 3 Jun 2011 06:48:46 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 65581 invoked by uid 500); 3 Jun 2011 06:48:44 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 65562 invoked by uid 99); 3 Jun 2011 06:48:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 06:48:43 +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; Fri, 03 Jun 2011 06:48:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C750023888FD; Fri, 3 Jun 2011 06:48:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1130916 - /subversion/branches/1.6.x/STATUS Date: Fri, 03 Jun 2011 06:48:21 -0000 To: commits@subversion.apache.org From: lgo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110603064821.C750023888FD@eris.apache.org> Author: lgo Date: Fri Jun 3 06:48:20 2011 New Revision: 1130916 URL: http://svn.apache.org/viewvc?rev=1130916&view=rev Log: * STATUS: Propose r894014 and friends for backport. Modified: subversion/branches/1.6.x/STATUS Modified: subversion/branches/1.6.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1130916&r1=1130915&r2=1130916&view=diff ============================================================================== --- subversion/branches/1.6.x/STATUS (original) +++ subversion/branches/1.6.x/STATUS Fri Jun 3 06:48:20 2011 @@ -168,6 +168,18 @@ Veto-blocked changes: needs the same fix). -1: markphip (tested multiple builds of this and never saw it work). + * r894014, 896247, 905705 + Use serf_connection_create2 instead of serf_connection_create so that + 1.6.x will be prepared to work with serf's upcoming ssl tunnel support + (https over http proxy). + Justification: + Make use of new feature provided by the serf library, stop using + an API that will be deprecated (although isn't yet). + Note: this change doesn't require a change of the minimum serf requirements + for this branch. + Votes: + +1: lgo + Approved changes: =================