Return-Path: Delivered-To: apmail-httpd-apreq-dev-archive@www.apache.org Received: (qmail 20788 invoked from network); 30 Oct 2003 06:47:20 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 30 Oct 2003 06:47:20 -0000 Received: (qmail 70275 invoked by uid 500); 30 Oct 2003 06:46:58 -0000 Delivered-To: apmail-httpd-apreq-dev-archive@httpd.apache.org Received: (qmail 70191 invoked by uid 500); 30 Oct 2003 06:46:58 -0000 Mailing-List: contact apreq-dev-help@httpd.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list apreq-dev@httpd.apache.org Received: (qmail 70174 invoked from network); 30 Oct 2003 06:46:57 -0000 Received: from unknown (HELO mail.logilune.com) (195.154.174.52) by daedalus.apache.org with SMTP; 30 Oct 2003 06:46:57 -0000 Received: from stason.org (localhost.logilune.com [127.0.0.1]) by mail.logilune.com (Postfix) with ESMTP id B471C78E80 for ; Thu, 30 Oct 2003 07:47:07 +0100 (CET) Message-ID: <3FA0B411.7050402@stason.org> Date: Wed, 29 Oct 2003 22:47:45 -0800 From: Stas Bekman Organization: Hope, Humanized User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030630 X-Accept-Language: en-us, en, he, ru MIME-Version: 1.0 To: apreq-dev@httpd.apache.org Subject: Re: cvs commit: httpd-apreq-2/build xsbuilder.pl References: <20031030044552.83594.qmail@minotaur.apache.org> In-Reply-To: <20031030044552.83594.qmail@minotaur.apache.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N joes@apache.org wrote: > joes 2003/10/29 20:45:52 > > Modified: build xsbuilder.pl > Log: > Improve the perl glue's environment check by following the recipe in CGI.pm > > Revision Changes Path > 1.18 +14 -2 httpd-apreq-2/build/xsbuilder.pl > > Index: xsbuilder.pl > =================================================================== > RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v > retrieving revision 1.17 > retrieving revision 1.18 > diff -u -r1.17 -r1.18 > --- xsbuilder.pl 30 Oct 2003 01:22:00 -0000 1.17 > +++ xsbuilder.pl 30 Oct 2003 04:45:52 -0000 1.18 > @@ -237,8 +237,20 @@ > # The modperl package isn't necessarily loaded, but Apache2 > # is. Perhaps Apache2 should always include a VERSION? No, it shouldn't. If it does people will start using it in their code to check for version which won't work when mp3 comes out. > -die __PACKAGE__ . ": httpd must load mod_apreq.so first" > - if __PACKAGE__->env ne "Apache::RequestRec"; > +if (\$ENV{MOD_PERL}) { > + require mod_perl; > + if (\$mod_perl::VERSION > 1.99) { > + die __PACKAGE__ . ": httpd must load mod_apreq.so first" > + if __PACKAGE__->env ne "Apache::RequestRec"; > + } > + elsif (\$mod_perl::VERSION > 1.24) { > + die __PACKAGE__ . ": httpd must load mod_apreq1.so first" > + if __PACKAGE__->env ne "Apache"; A::R 2 supports mp1? __________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:stas@stason.org http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com