From modperlgthompson@example.net Wed Jul 21 17:50:57 2010
Return-Path: <modperlgthompson@example.net>
Delivered-To: gthompson@example.net
Received: (qmail 1062 invoked from network); 21 Jul 2010 17:50:57 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 21 Jul 2010 17:50:57 -0000
Received: (qmail 3753 invoked by uid 500); 21 Jul 2010 17:50:57 -0000
Delivered-To: gthompson@example.net
Received: (qmail 3683 invoked by uid 500); 21 Jul 2010 17:50:57 -0000
Mailing-List: contact gthompson@example.net; run by ezmlm
Precedence: bulk
list-help: <mailto:gthompson@example.net>
list-unsubscribe: <mailto:gthompson@example.net>
List-Post: <mailto:gthompson@example.net>
Reply-To: gthompson@example.net
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list gthompson@example.net
Received: (qmail 3676 invoked by uid 99); 21 Jul 2010 17:50:57 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 17:50:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 17:50:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 86C832388A56; Wed, 21 Jul 2010 17:49:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r966331 - /perl/modperl/trunk/META.yml
Date: Wed, 21 Jul 2010 17:49:31 -0000
To: gthompson@example.net
From: gthompson@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <gthompson@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: phred
Date: Wed Jul 21 17:49:31 2010
New Revision: 966331

URL: http://svn.apache.org/viewvc?rev=966331&view=rev
Log:
Don't index bundled pure Perl modules

http://www.gossamer-threads.com/lists/modperl/dev/101734

Suggested by: Gozer
Implemented by: Phred

Modified:
    perl/modperl/trunk/META.yml

Modified: perl/modperl/trunk/META.yml
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/META.yml?rev=966331&r1=966330&r2=966331&view=diff
==============================================================================
--- perl/modperl/trunk/META.yml (original)
+++ perl/modperl/trunk/META.yml Wed Jul 21 17:49:31 2010
@@ -4,8 +4,10 @@ installdirs:  site
 distribution_type: module
 no_index:
     directory:
-          # A-T has its own CPAN distro
+          # A-T and others have their own CPAN distros
         - Apache-Test
+        - Apache-Reload
+        - Apache-SizeLimit
     package:
           # Internally redefined module
         - 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Preprocessed



From modperlgthompson@example.net Sat Jul 24 17:42:50 2010
Return-Path: <modperlgthompson@example.net>
Delivered-To: gthompson@example.net
Received: (qmail 24997 invoked from network); 24 Jul 2010 17:42:50 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Jul 2010 17:42:50 -0000
Received: (qmail 14751 invoked by uid 500); 24 Jul 2010 17:42:50 -0000
Delivered-To: gthompson@example.net
Received: (qmail 14701 invoked by uid 500); 24 Jul 2010 17:42:50 -0000
Mailing-List: contact gthompson@example.net; run by ezmlm
Precedence: bulk
list-help: <mailto:gthompson@example.net>
list-unsubscribe: <mailto:gthompson@example.net>
List-Post: <mailto:gthompson@example.net>
Reply-To: gthompson@example.net
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list gthompson@example.net
Received: (qmail 14694 invoked by uid 99); 24 Jul 2010 17:42:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 17:42:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 17:42:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CB08D2388999; Sat, 24 Jul 2010 17:41:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r978911 - /perl/modperl/branches/release/
Date: Sat, 24 Jul 2010 17:41:54 -0000
To: gthompson@example.net
From: gthompson@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <gthompson@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gozer
Date: Sat Jul 24 17:41:54 2010
New Revision: 978911

URL: http://svn.apache.org/viewvc?rev=978911&view=rev
Log:
create release branch holding area

Added:
    perl/modperl/branches/release/


From modperlgthompson@example.net Sat Jul 24 17:43:53 2010
Return-Path: <modperlgthompson@example.net>
Delivered-To: gthompson@example.net
Received: (qmail 25380 invoked from network); 24 Jul 2010 17:43:47 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Jul 2010 17:43:47 -0000
Received: (qmail 15758 invoked by uid 500); 24 Jul 2010 17:43:47 -0000
Delivered-To: gthompson@example.net
Received: (qmail 15728 invoked by uid 500); 24 Jul 2010 17:43:47 -0000
Mailing-List: contact gthompson@example.net; run by ezmlm
Precedence: bulk
list-help: <mailto:gthompson@example.net>
list-unsubscribe: <mailto:gthompson@example.net>
List-Post: <mailto:gthompson@example.net>
Reply-To: gthompson@example.net
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list gthompson@example.net
Received: (qmail 15616 invoked by uid 99); 24 Jul 2010 17:43:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 17:43:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Jul 2010 17:43:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 26FCB2388999; Sat, 24 Jul 2010 17:42:51 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r978912 - /perl/modperl/branches/release/2.0.5/
Date: Sat, 24 Jul 2010 17:42:51 -0000
To: gthompson@example.net
From: gthompson@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <gthompson@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gozer
Date: Sat Jul 24 17:42:50 2010
New Revision: 978912

URL: http://svn.apache.org/viewvc?rev=978912&view=rev
Log:
Snap trunk/ for the upcoming 2.0.5 release

Added:
    perl/modperl/branches/release/2.0.5/
      - copied from r978911, perl/modperl/trunk/


From modperlgthompson@example.net Fri Jul 30 21:33:38 2010
Return-Path: <modperlgthompson@example.net>
Delivered-To: gthompson@example.net
Received: (qmail 83929 invoked from network); 30 Jul 2010 21:33:38 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 30 Jul 2010 21:33:38 -0000
Received: (qmail 56716 invoked by uid 500); 30 Jul 2010 21:33:38 -0000
Delivered-To: gthompson@example.net
Received: (qmail 56668 invoked by uid 500); 30 Jul 2010 21:33:38 -0000
Mailing-List: contact gthompson@example.net; run by ezmlm
Precedence: bulk
list-help: <mailto:gthompson@example.net>
list-unsubscribe: <mailto:gthompson@example.net>
List-Post: <mailto:gthompson@example.net>
Reply-To: gthompson@example.net
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list gthompson@example.net
Received: (qmail 56660 invoked by uid 99); 30 Jul 2010 21:33:38 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Jul 2010 21:33:38 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Jul 2010 21:33:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D1075238899C; Fri, 30 Jul 2010 21:32:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r980971 - in /perl/Apache-Reload/trunk: Changes
 lib/Apache/Reload.pm lib/Apache2/Reload.pm
Date: Fri, 30 Jul 2010 21:32:17 -0000
To: gthompson@example.net
From: gthompson@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <gthompson@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: phred
Date: Fri Jul 30 21:32:17 2010
New Revision: 980971

URL: http://svn.apache.org/viewvc?rev=980971&view=rev
Log:
Ignore require-hooks which exist in %INC
Reloads by file, not module name

Submitted by:  Ryan Gies
Reviewed by:  Gozer
Applied by:  Phred

Modified:
    perl/Apache-Reload/trunk/Changes
    perl/Apache-Reload/trunk/lib/Apache/Reload.pm
    perl/Apache-Reload/trunk/lib/Apache2/Reload.pm

Modified: perl/Apache-Reload/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/Changes?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/Changes (original)
+++ perl/Apache-Reload/trunk/Changes Fri Jul 30 21:32:17 2010
@@ -8,6 +8,12 @@ Changes - Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload change logfile
 
 =item 0.11-dev
 
+Ignore require-hooks which exist in %INC
+[Ryan Gies <gthompson@example.net>]
+
+Reloads by file, not module name
+[Ryan Gies <gthompson@example.net>]
+
 Add a no Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload directive which skips reloading for modules
 that have it included (useful for Moose compatibility).
 [Graham Barr, <gthompson@example.net>]

Modified: perl/Apache-Reload/trunk/lib/Apache/Reload.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/lib/Apache/Reload.pm?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/lib/Apache/Reload.pm (original)
+++ perl/Apache-Reload/trunk/lib/Apache/Reload.pm Fri Jul 30 21:32:17 2010
@@ -17,7 +17,7 @@ package Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload;
 
 use strict;
 
-$Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Relo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4VERSION = '0.11';
+$Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Relo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4VERSION = '0.11-dev';
 
 use vars qw(%INCS %Stat $TouchTime %UndefFields);
 

Modified: perl/Apache-Reload/trunk/lib/Apache2/Reload.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/lib/Apache2/Reload.pm?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/lib/Apache2/Reload.pm (original)
+++ perl/Apache-Reload/trunk/lib/Apache2/Reload.pm Fri Jul 30 21:32:17 2010
@@ -20,7 +20,7 @@ use warnings FATAL => 'all';
 
 use mod_perl2;
 
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 use Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const -compile => qw(OK);
 
@@ -86,6 +86,8 @@ sub handler {
 
     my $DEBUG = ref($o) && (lc($o->dir_config("ReloadDebug") || '') eq 'on');
 
+    my $ReloadByModuleName = ref($o) && (lc($o->dir_config("ReloadByModuleName") || '') eq 'on');
+
     my $TouchFile = ref($o) && $o->dir_config("ReloadTouchFile");
 
     my $ConstantRedefineWarnings = ref($o) && 
@@ -138,6 +140,7 @@ sub handler {
         my $file = $Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Relo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4INCS{$key};
 
         next unless defined $file;
+        next if ref $file;
         next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
         warn "Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload: Checking mtime of $key\n" if $DEBUG;
 
@@ -158,24 +161,29 @@ sub handler {
         }
 
         if ($mtime > $Stat{$file}) {
-            push @changed, $key;
+            push @changed, [$key, $file];
         }
         $Stat{$file} = $mtime;
     }
     
     #First, let's unload all changed modules
-    foreach my $module (@changed) {
+    foreach my $change (@changed) {
+        my ($module, $file) = @$change;
         my $package = module_to_package($module);
         ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Util888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4unload_package($package);
     }
-    
+
     #Then, let's reload them all, so that module dependencies can satisfy
     #themselves in the correct order.
-    foreach my $module (@changed) {
-        my $package = module_to_package($module);
-        require $module;
-        warn("Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload: process $$ reloading $package from $module\n")
-            if $DEBUG;
+    foreach my $change (@changed) {
+        my ($module, $file) = @$change;
+        my $name = $ReloadByModuleName ? $module : $file;
+        require $name;
+        if ($DEBUG) {
+          my $package = module_to_package($module);
+          warn sprintf("Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload: process %d reloading %s from %s\n",
+            $$, $package, $name);
+        }
     }
 
     return Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Const888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OK;
@@ -206,6 +214,7 @@ Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload - Reload Perl Modules wh
   PerlSetVar ReloadAll Off
   PerlSetVar ReloadModules "ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4* Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4*"
   #PerlSetVar ReloadDebug On
+  #PerlSetVar ReloadByModuleName On
   
   # Reload a single module from within itself:
   package My888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4pach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Module;
@@ -226,16 +235,28 @@ modules that have registered themselves 
 also do the check for modified modules, when a special touch-file has
 been modified.
 
-Note that C<Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload> operates on the current context of
-C<@INC>.  Which means, when called as a C<Perl*Handler> it will not
-see C<@INC> paths added or removed by C<ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Registry> scripts, as
-the value of C<@INC> is saved on server startup and restored to that
-value after each request.  In other words, if you want
-C<Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload> to work with modules that live in custom C<@INC>
-paths, you should modify C<@INC> when the server is started.  Besides,
-C<'use lib'> in the startup script, you can also set the C<PERL5LIB>
-variable in the httpd's environment to include any non-standard 'lib'
-directories that you choose.  For example, to accomplish that you can
+Require-hooks, i.e., entries in %INC which are references, are ignored.  The 
+hook should modify %INC itself, adding the path to the module file, for it to 
+be reloaded.
+
+C<Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload> inspects and reloads the B<file> associated with a given 
+module.  Changes to @INC are not recognized, as it is the file which is 
+being re-required, not the module name.
+
+In version 0.10 and earlier the B<module name>, not the file, is re-required.  
+Meaning it operated on the the current context of @INC.  If you still want this 
+behavior set this environment variable in I<httpd.conf>:
+
+  PerlSetVar ReloadByModuleName On
+
+This means, when called as a C<Perl*Handler>, C<Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload> will not see 
+C<@INC> paths added or removed by C<ModPerl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Registry> scripts, as the value of 
+C<@INC> is saved on server startup and restored to that value after each 
+request.  In other words, if you want C<Apach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Reload> to work with modules 
+that live in custom C<@INC> paths, you should modify C<@INC> when the server is 
+started.  Besides, C<'use lib'> in the startup script, you can also set the 
+C<PERL5LIB> variable in the httpd's environment to include any non-standard 
+'lib' directories that you choose.  For example, to accomplish that you can 
 include a line:
 
   PERL5LIB=/home/httpd/perl/extra; export PERL5LIB




{'source': 'Apache Software Foundation Public Mail Archives'}