httpd-test-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael A Nachbaur <m...@nachbaur.com>
Subject Re: Patch to Apache::TestConfig for Mandrake
Date Mon, 08 Sep 2003 22:00:46 GMT
Just after I sent the message, I saw the bug.  Just change:
     $vars->{httpd} = $httpd . "-perl"
to say instead:
     $httpd = $httpd . "-perl"

On Monday 08 September 2003 02:53 pm, Michael A Nachbaur wrote:
> I've created the following patch to help TestConfig.pm find the proper
> mod_perl httpd on Mandrake machines.  Mandrake installs both a
> /usr/sbin/httpd and /usr/sbin/httpd-perl, and includes configuration for
> mod_perl acceleration with a standard (e.g. non-mod_perl) httpd in front of
> it.
>
> However, when Apache::Test is used, it finds /usr/sbin/httpd instead of the
> -perl one.  I've fixed this for my site, but so I don't run into this later
> (nor for others), I'm sending this patch to the list.
>
> If you want to reply, please CC me, since I'm not on the list.
>
> RCS file:
> /home/cvspublic/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig
>.pm,v retrieving revision 1.171
> diff -u -3 -p -r1.171 TestConfig.pm
> --- TestConfig.pm       13 Aug 2003 19:02:51 -0000      1.171
> +++ TestConfig.pm       8 Sep 2003 21:14:36 -0000
> @@ -310,7 +310,13 @@ sub configure_httpd {
>          for my $dir (map { $vars->{$_} } qw(sbindir bindir)) {
>              next unless defined $dir;
>              my $httpd = catfile $dir, $vars->{target};
> -            next unless -x $httpd;
> +            unless (-x $httpd) {
> +                if (-x $httpd . '-perl') {
> +                    $vars->{httpd} = $httpd . '-perl';
> +                } else {
> +                    next;
> +                }
> +            }
>              $vars->{httpd} = $httpd;
>              last;
>          }

-- 
/* Michael A. Nachbaur <mike@nachbaur.com>
 * http://nachbaur.com/pgpkey.asc
 */

"Ford," he said, "how many escape capsules are there?"
"None," said Ford.
Zaphod gibbered.
"Did you count them?" he yelled.
"Twice," said Ford


Mime
View raw message