Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 64771 invoked from network); 30 Nov 2008 15:47:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Nov 2008 15:47:53 -0000 Received: (qmail 6893 invoked by uid 500); 30 Nov 2008 15:48:04 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 6843 invoked by uid 500); 30 Nov 2008 15:48:04 -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 6834 invoked by uid 99); 30 Nov 2008 15:48:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Nov 2008 07:48:04 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 30 Nov 2008 15:46:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0BD9623888A0; Sun, 30 Nov 2008 07:47:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r721832 - in /httpd/httpd/branches/2.2.x: ./ CHANGES STATUS configure.in docs/ support/ab.c support/suexec.c Date: Sun, 30 Nov 2008 15:47:31 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081130154732.0BD9623888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Sun Nov 30 07:47:31 2008 New Revision: 721832 URL: http://svn.apache.org/viewvc?rev=721832&view=rev Log: Merge r657354, r657459 from trunk: configure: Don't reject libtool 2.x PR 44817 Revert unintentional changes in r657354 Reviewed/backported by: jim Modified: httpd/httpd/branches/2.2.x/ (props changed) httpd/httpd/branches/2.2.x/CHANGES httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/configure.in httpd/httpd/branches/2.2.x/docs/ (props changed) httpd/httpd/branches/2.2.x/support/ab.c (props changed) httpd/httpd/branches/2.2.x/support/suexec.c (props changed) Propchange: httpd/httpd/branches/2.2.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 07:47:31 2008 @@ -1 +1 @@ -/httpd/httpd/trunk:451572,611483,639005,639010,647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250 +/httpd/httpd/trunk:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250 Modified: httpd/httpd/branches/2.2.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=721832&r1=721831&r2=721832&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Nov 30 07:47:31 2008 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.11 + *) configure: Don't reject libtool 2.x + PR 44817 [Arfrever Frehtes Taifersar Arahesis ] + *) mod_autoindex: add configuration option to insert string in HTML HEAD (IndexHeadInsert). [Nick Kew] Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=721832&r1=721831&r2=721832&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Sun Nov 30 07:47:31 2008 @@ -86,12 +86,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * configure.in: Don't reject libtool 2.x - PR 44817 - http://svn.apache.org/viewvc?view=rev&revision=657354 - http://svn.apache.org/viewvc?view=rev&revision=657459 - +1: niq, rpluem, jim - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] Modified: httpd/httpd/branches/2.2.x/configure.in URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=721832&r1=721831&r2=721832&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/configure.in (original) +++ httpd/httpd/branches/2.2.x/configure.in Sun Nov 30 07:47:31 2008 @@ -235,7 +235,7 @@ LIBTOOL="$my_libtool \$(LTFLAGS)" libtoolversion=`$my_libtool --version` case $libtoolversion in - *1.[[45]]*) + *1.[[45]]* | *[[2-9]].[[0-9]]*) SH_LIBTOOL='$(LIBTOOL)' SHLTCFLAGS="-prefer-pic" LTCFLAGS="-prefer-non-pic -static" Propchange: httpd/httpd/branches/2.2.x/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 07:47:31 2008 @@ -1 +1 @@ -/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250 +/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,657354,657459,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693120,693392,693727-693728,696006,697093,703441,703997,706318,707163,708902,711421,719357,720250 Propchange: httpd/httpd/branches/2.2.x/support/ab.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 07:47:31 2008 @@ -1 +1 @@ -/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250 +/httpd/httpd/trunk/support/ab.c:83751-655654,657354,657433,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250 Propchange: httpd/httpd/branches/2.2.x/support/suexec.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 30 07:47:31 2008 @@ -1 +1 @@ -/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250 +/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,657354,657459,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250