Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 32761 invoked from network); 8 Dec 2007 14:52:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2007 14:52:38 -0000 Received: (qmail 43078 invoked by uid 500); 8 Dec 2007 14:52:27 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 43027 invoked by uid 500); 8 Dec 2007 14:52:27 -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 43016 invoked by uid 99); 8 Dec 2007 14:52:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 06:52:26 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 14:52:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0548E1A9832; Sat, 8 Dec 2007 06:52:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602477 - in /apr/apr-util/trunk: CHANGES uri/apr_uri.c Date: Sat, 08 Dec 2007 14:52:04 -0000 To: commits@apr.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071208145207.0548E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Sat Dec 8 06:52:03 2007 New Revision: 602477 URL: http://svn.apache.org/viewvc?rev=602477&view=rev Log: * Ensure that apr_uri_unparse does not add scheme to URI if APR_URI_UNP_OMITSITEPART flag is set. PR: 44044 Submitted by: Michael Clark Reviewed by: rpluem Modified: apr/apr-util/trunk/CHANGES apr/apr-util/trunk/uri/apr_uri.c Modified: apr/apr-util/trunk/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=602477&r1=602476&r2=602477&view=diff ============================================================================== --- apr/apr-util/trunk/CHANGES [utf-8] (original) +++ apr/apr-util/trunk/CHANGES [utf-8] Sat Dec 8 06:52:03 2007 @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with APR-util 1.3.0 + *) Ensure that apr_uri_unparse does not add scheme to URI if + APR_URI_UNP_OMITSITEPART flag is set. PR 44044 + [Michael Clark ] + *) Add an LDAP rebind implementation so that authentication can be carried through referrals. [Paul J. Reder] Modified: apr/apr-util/trunk/uri/apr_uri.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/uri/apr_uri.c?rev=602477&r1=602476&r2=602477&view=diff ============================================================================== --- apr/apr-util/trunk/uri/apr_uri.c (original) +++ apr/apr-util/trunk/uri/apr_uri.c Sat Dec 8 06:52:03 2007 @@ -92,12 +92,6 @@ unsigned flags) { char *ret = ""; - char *scheme = NULL; - - if (uptr->scheme) { - scheme = apr_pstrcat(p, uptr->scheme, ":", NULL); - } - /* If suppressing the site part, omit both user name & scheme://hostname */ if (!(flags & APR_URI_UNP_OMITSITEPART)) { @@ -140,9 +134,10 @@ is_default_port ? "" : uptr->port_str, NULL); } + if (uptr->scheme) { + ret = apr_pstrcat(p, uptr->scheme, ":", ret, NULL); + } } - - ret = apr_pstrcat(p, scheme ? scheme : "", ret, NULL); /* Should we suppress all path info? */ if (!(flags & APR_URI_UNP_OMITPATHINFO)) {