You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2005/03/28 23:26:08 UTC

svn commit: r159313 - in perl/modperl/trunk: Changes lib/Apache/Reload.pm

Author: stas
Date: Mon Mar 28 13:26:07 2005
New Revision: 159313

URL: http://svn.apache.org/viewcvs?view=rev&rev=159313
Log:
Fixes for Apache::Reload's touchfile feature (return Apache::OK
instead of 1)
Contributed by: Chris Warren <ch...@cisco.com>

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/lib/Apache/Reload.pm

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=159312&r2=159313
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Mar 28 13:26:07 2005
@@ -12,6 +12,13 @@
 
 =item 1.999_22-dev
 
+Fixes for Apache::Reload's touchfile feature (return Apache::OK
+instead of 1) [Chris Warren <ch...@cisco.com>]
+
+cygwin fixes: [Nick *** <do...@abv.bg>]
+- doesn't like XS wrapper starting with 'static'
+- need to compile everything with -DCYGWIN
+
 ModPerl::RegistryCooker API change: s/rewrite_shebang/shebang_to_perl/
 the new API now returns the string to prepend before the rest of the
 script, instead of rewriting the content, which is both faster and

Modified: perl/modperl/trunk/lib/Apache/Reload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Reload.pm?view=diff&r1=159312&r2=159313
==============================================================================
--- perl/modperl/trunk/lib/Apache/Reload.pm (original)
+++ perl/modperl/trunk/lib/Apache/Reload.pm Mon Mar 28 13:26:07 2005
@@ -95,8 +95,8 @@
 
     if ($TouchFile) {
         warn "Checking mtime of $TouchFile\n" if $DEBUG;
-        my $touch_mtime = (stat $TouchFile)[9] || return 1;
-        return 1 unless $touch_mtime > $TouchTime;
+        my $touch_mtime = (stat $TouchFile)[9] || return Apache::OK;
+        return Apache::OK unless $touch_mtime > $TouchTime;
         $TouchTime = $touch_mtime;
         open my $fh, $TouchFile or die "Can't open '$TouchFile': $!";
         $TouchModules = <$fh>;