[mp2 Patch] Resubmitting OpenBSD related patches

Dunno where they all went in the past, but as Stas reminded me, I am
still holding off on 2 OpenBSD-related patches to make sure Apache-Test
generates httpd.conf that will bind on IPv4 addresses. This is important
on a platform like OpenBSD where IPv6 is prefered by default and IPv4
mapped addresses are disabled by default.

Also addresses the problematic and annoying warning about DL_GLOBAL in
DynaLoader.

Index: Apache-Test/lib/Apache/TestConfig.pm
===================================================================
RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.160
diff -u -b -B -r1.160 TestConfig.pm
--- Apache-Test/lib/Apache/TestConfig.pm        30 Apr 2003 05:03:36 -0000      
1.160
+++ Apache-Test/lib/Apache/TestConfig.pm        12 May 2003 04:33:02 -0000
@@ -940,7 +940,7 @@
                                              $port);
 
     #extra config that should go *outside* the <VirtualHost ...>
-    my @out_config = ([Listen => $port]);
+    my @out_config = ([Listen => $vars->{servername} . ':' . $port]);
 
     #there are two ways of building a vhost
     #first is when we parse test .pm and .c files
@@ -1585,7 +1585,7 @@
 
 
 __DATA__
-Listen     @Port@
+Listen     @ServerName@:@Port@
 
 ServerRoot   "@ServerRoot@"
 DocumentRoot "@DocumentRoot@"

Index: Apache-Test/lib/Apache/TestConfigPerl.pm
===================================================================
RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
retrieving revision 1.73
diff -u -b -B -r1.73 TestConfigPerl.pm
--- Apache-Test/lib/Apache/TestConfigPerl.pm    1 May 2003 06:22:18 -0000       
1.73
+++ Apache-Test/lib/Apache/TestConfigPerl.pm    12 May 2003 04:33:06 -0000
@@ -185,7 +185,7 @@
 sub set_connection_handler {
     my($self, $module, $args) = @_;
     my $port = $self->new_vhost($module);
-    $self->postamble(Listen => $port);
+    $self->postamble(Listen => $self->{vars}->{servername} . ':' . $port);
 }

And

Index: lib/Apache/Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.121
diff -u -b -B -r1.121 Build.pm
--- lib/Apache/Build.pm 22 Apr 2003 08:32:59 -0000      1.121
+++ lib/Apache/Build.pm 12 May 2003 04:33:11 -0000
@@ -25,6 +25,7 @@
 use constant AIX    => $^O eq 'aix';
 use constant DARWIN => $^O eq 'darwin';
 use constant HPUX   => $^O eq 'hpux';
+use constant OPENBSD => $^O eq 'openbsd';
 use constant WIN32  => $^O eq 'MSWin32';
 
 use constant MSVC => WIN32() && ($Config{cc} eq 'cl');
@@ -1050,7 +1051,7 @@
 
     my $ranlib = "\t" . '$(MODPERL_RANLIB) $@';
 
-    $link .= "\n" . $ranlib unless DARWIN;
+    $link .= "\n" . $ranlib unless (DARWIN or OPENBSD);
 
     $link;
 }

Index: t/response/TestApache/conftree.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/conftree.pm,v
retrieving revision 1.5
diff -u -b -B -r1.5 conftree.pm
--- t/response/TestApache/conftree.pm   29 Jan 2003 03:56:00 -0000      1.5
+++ t/response/TestApache/conftree.pm   12 May 2003 04:33:18 -0000
@@ -27,9 +27,9 @@
 
     ok $tree;
 
-    my $port = $tree->lookup('Listen');
+    my $listen = $tree->lookup('Listen');
 
-    ok t_cmp($vars->{port}, $port);
+    ok t_cmp($vars->{servername} . ':' . $vars->{port}, $listen);
 
     my $documentroot = $tree->lookup('DocumentRoot');
 

Index: xs/APR/APR/APR.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/APR.pm,v
retrieving revision 1.3
diff -u -b -B -r1.3 APR.pm
--- xs/APR/APR/APR.pm   19 Mar 2003 02:51:59 -0000      1.3
+++ xs/APR/APR/APR.pm   12 May 2003 04:33:22 -0000
@@ -6,7 +6,10 @@
 
 #dlopen("APR.so", RTDL_GLOBAL); so we only need to link libapr.a once
 # XXX: see xs/ModPerl/Const/Const.pm for issues of using 0x01
-sub dl_load_flags { 0x01 }
+use Config ();
+use constant DL_GLOBAL =>
+  ( $Config::Config{dlsrc} eq 'dl_dlopen.xs' && $^O ne 'openbsd' ) ? 0x01 : 
0x0;
+sub dl_load_flags { DL_GLOBAL }
 
 unless (defined &APR::XSLoader::BOOTSTRAP) {
     __PACKAGE__->bootstrap($VERSION);

Index: xs/ModPerl/Const/Const.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Const/Const.pm,v
retrieving revision 1.5
diff -u -b -B -r1.5 Const.pm
--- xs/ModPerl/Const/Const.pm   19 Mar 2003 02:51:59 -0000      1.5
+++ xs/ModPerl/Const/Const.pm   12 May 2003 04:33:26 -0000
@@ -16,7 +16,7 @@
 #   even when RTDL_GLOBAL is available, patch submitted to p5p
 use Config ();
 use constant DL_GLOBAL =>
-  $Config::Config{dlsrc} eq 'dl_dlopen.xs' ? 0x01 : 0x0;
+  ( $Config::Config{dlsrc} eq 'dl_dlopen.xs' && $^O ne 'openbsd' ) ? 0x01 : 
0x0;
 sub dl_load_flags { DL_GLOBAL }
 
 #only bootstrap for use outside of mod_perl




-- 
-- -----------------------------------------------------------------------------
Philippe M. Chiasson /gozer\@(cpan|ectoplasm)\.org/ 88C3A5A5 (122FF51B/C634E37B)
http://gozer.ectoplasm.org/    F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3 A5A5
Q: It is impossible to make anything foolproof because fools are so ingenious.
perl -e'$$=\${gozer};{$_=unpack(P7,pack(L,$$));/^JAm_pH\n$/&&print||$$++&&redo}'

signature.asc
Description: This is a digitally signed message part