Stas Bekman wrote:
Stas Bekman wrote:

Shall I leave you to submit that to the Apache guys, then, seeing as you cracked it?



Unfortunately I have a commit access to apr, so they would expect me to exercise it. I'll commit it and disable that test on win32 untill the next version is released.


now committed, hopefully it'll make it into httpd-2.0.48

I've also changed the test to skip the dup file sub-test if win32 and httpd < 2.0.48, now committed.


Index: t/response/TestAPR/perlio.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/perlio.pm,v
retrieving revision 1.24
diff -u -r1.24 perlio.pm
--- t/response/TestAPR/perlio.pm        4 Sep 2003 04:34:05 -0000       1.24
+++ t/response/TestAPR/perlio.pm        19 Sep 2003 19:53:46 -0000
@@ -19,13 +19,18 @@
 #XXX: you can set to zero if largefile support is not enabled in Perl
 use constant LARGE_FILES_CONFLICT => 1;

+# apr_file_dup has a bug on win32,
+# should be fixed in apr 0.9.4 / httpd-2.0.48
+require Apache::Build;
+use constant APR_WIN32_FILE_DUP_BUG =>
+    Apache::Build::WIN32() && !have_min_apache_version('2.0.48');
+
 sub handler {
     my $r = shift;

-    my $tests = 12;
-    my $lfs_tests = 3;
-
-    $tests += $lfs_tests unless LARGE_FILES_CONFLICT;
+    my $tests = 11;
+    $tests += 3 unless LARGE_FILES_CONFLICT;
+    $tests += 1 unless APR_WIN32_FILE_DUP_BUG;

     require APR::PerlIO;
     plan $r, tests => $tests,
@@ -180,9 +185,11 @@
         my $received = <$dup_fh>;

         close $dup_fh;
-        ok t_cmp($expected,
-                 $received,
-                 "read/write a dupped file");
+        unless (APR_WIN32_FILE_DUP_BUG) {
+            ok t_cmp($expected,
+                     $received,
+                     "read/write a dupped file");
+        }
     }

# unbuffered write


__________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com


--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to