You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by "Philippe M. Chiasson" <go...@ectoplasm.org> on 2010/07/23 05:33:59 UTC
2.0.4 RC tomorrow?
Phred just took care of what I believe was the last blocker for
releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
valid objections or concerns, let me know.
Cheers.
--
Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/
Re: 2.0.4 RC tomorrow?
Posted by Fred Moyer <fr...@redhotpenguin.com>.
Sounds great, but we should roll the 2.0.5 rc instead ;)
On Thu, Jul 22, 2010 at 8:33 PM, Philippe M. Chiasson
<go...@ectoplasm.org> wrote:
> Phred just took care of what I believe was the last blocker for
> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
> valid objections or concerns, let me know.
>
> Cheers.
>
> --
> Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
> http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by Fred Moyer <fr...@redhotpenguin.com>.
Can you please generate this patch using 'svn diff' and then send that
patch inline as you did this one? I tried to apply the patch below
and failed:
phred@harpua ~/dev/svn/modperl/mod_perl-2.0/Apache-Reload $ patch -p0
< ryan.diff
patching file lib/Apache2/Reload.pm
Hunk #2 FAILED at 86.
Hunk #3 FAILED at 140.
Hunk #4 FAILED at 161.
Hunk #5 FAILED at 214.
patch unexpectedly ends in middle of line
Hunk #6 succeeded at 235 with fuzz 1.
4 out of 6 hunks FAILED -- saving rejects to file lib/Apache2/Reload.pm.rej
On Thu, Jul 29, 2010 at 12:15 PM, Ryan Gies <ry...@livesite.net> wrote:
> On 07/29/2010 01:15 PM, Fred Moyer wrote:
>>
>> I just checked out that thread, not sure how I missed it last year.
>> But if you could pull
>> https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk and update
>> the patches I'd be happy to test them and integrate into this release.
>
> Below is the patch (inline as previously requested) as well as attached.
> The patch file was created in the top (trunk) directory.
>
> --- lib/Apache2/Reload.pm 2010-07-29 14:38:16.187299747 -0400
> +++ lib/Apache2/Reload.pm.mine 2010-07-29 14:43:38.291778900 -0400
> @@ -20,7 +20,7 @@
>
> use mod_perl2;
>
> -our $VERSION = '0.11';
> +our $VERSION = '0.12';
>
> use Apache2::Const -compile => qw(OK);
>
> @@ -86,6 +86,8 @@
>
> 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 @@
> my $file = $Apache2::Reload::INCS{$key};
>
> next unless defined $file;
> + next if ref $file;
> next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
> warn "Apache2::Reload: Checking mtime of $key\n" if $DEBUG;
>
> @@ -158,24 +161,29 @@
> }
>
> 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);
> ModPerl::Util::unload_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("Apache2::Reload: 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("Apache2::Reload: process %d reloading %s from
> %s\n",
> + $$, $package, $name);
> + }
> }
>
> return Apache2::Const::OK;
> @@ -206,6 +214,7 @@
> PerlSetVar ReloadAll Off
> PerlSetVar ReloadModules "ModPerl::* Apache2::*"
> #PerlSetVar ReloadDebug On
> + #PerlSetVar ReloadByModuleName On
>
> # Reload a single module from within itself:
> package My::Apache2::Module;
> @@ -226,16 +235,28 @@
> also do the check for modified modules, when a special touch-file has
> been modified.
>
> -Note that C<Apache2::Reload> 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<ModPerl::Registry> 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<Apache2::Reload> 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<Apache2::Reload> 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<Apache2::Reload> will not
> see
> +C<@INC> paths added or removed by C<ModPerl::Registry> 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<Apache2::Reload> 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
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by Ryan Gies <ry...@livesite.net>.
On 07/29/2010 01:15 PM, Fred Moyer wrote:
> I just checked out that thread, not sure how I missed it last year.
> But if you could pull
> https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk and update
> the patches I'd be happy to test them and integrate into this release.
Below is the patch (inline as previously requested) as well as attached.
The patch file was created in the top (trunk) directory.
--- lib/Apache2/Reload.pm 2010-07-29 14:38:16.187299747 -0400
+++ lib/Apache2/Reload.pm.mine 2010-07-29 14:43:38.291778900 -0400
@@ -20,7 +20,7 @@
use mod_perl2;
-our $VERSION = '0.11';
+our $VERSION = '0.12';
use Apache2::Const -compile => qw(OK);
@@ -86,6 +86,8 @@
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 @@
my $file = $Apache2::Reload::INCS{$key};
next unless defined $file;
+ next if ref $file;
next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
warn "Apache2::Reload: Checking mtime of $key\n" if $DEBUG;
@@ -158,24 +161,29 @@
}
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);
ModPerl::Util::unload_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("Apache2::Reload: 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("Apache2::Reload: process %d reloading %s from
%s\n",
+ $$, $package, $name);
+ }
}
return Apache2::Const::OK;
@@ -206,6 +214,7 @@
PerlSetVar ReloadAll Off
PerlSetVar ReloadModules "ModPerl::* Apache2::*"
#PerlSetVar ReloadDebug On
+ #PerlSetVar ReloadByModuleName On
# Reload a single module from within itself:
package My::Apache2::Module;
@@ -226,16 +235,28 @@
also do the check for modified modules, when a special touch-file has
been modified.
-Note that C<Apache2::Reload> 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<ModPerl::Registry> 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<Apache2::Reload> 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<Apache2::Reload> 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<Apache2::Reload> will
not see
+C<@INC> paths added or removed by C<ModPerl::Registry> 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<Apache2::Reload> 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
Re: 2.0.5 RC soon?
Posted by Fred Moyer <fr...@redhotpenguin.com>.
On Thu, Jul 29, 2010 at 9:15 AM, Ryan Gies <ry...@livesite.net> wrote:
> I'm not even sure what is being released, however wanted to follow through
> just in case.
This is the current 0.11 changeset:
=item 0.11-dev
Add a no Apache::Reload directive which skips reloading for modules
that have it included (useful for Moose compatibility).
[Graham Barr, <gb...@pobox.com>]
Add Empty NOTICE file
http://rt.cpan.org/Ticket/Display.html?id=34786
[Niko Tyni (Debian Perl Group) <nt...@debian.org>]
> I submitted a patch (and revised according to feedback) for
> Apache2::Reload
>
> http://www.mail-archive.com/dev@perl.apache.org/msg12391.html
>
> Did this make it in (Fred?) or would you like me to create a patch against
> the current revision? Or does this have nothing to do with the release?
I just checked out that thread, not sure how I missed it last year.
But if you could pull
https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk and update
the patches I'd be happy to test them and integrate into this release.
- Fred
> Cheers, -Ryan
>
> On 07/26/2010 11:35 PM, Philippe M. Chiasson wrote:
>>
>> On 10-07-22 23:33 , Philippe M. Chiasson wrote:
>>
>>>
>>> Phred just took care of what I believe was the last blocker for
>>> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
>>> valid objections or concerns, let me know.
>>>
>>
>> First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
>>
>> Second, I've started giving this a shot, using the idea of creating a
>> release branch where I would update the svn:externals to the latest
>> released versions of the various submodules we use. However, I realized
>> something of a problem with that.
>>
>> Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
>> don't have up-to-date releases to base this release on. I'd like to ask
>> the various maintainers of these modules to try and make a release (and
>> tag it proprely) and notify this thread, so we can base this upcoming
>> release on the same stuff then what's on CPAN.
>>
>> I'll take on Apache-Test, as it's the one with the least amount of
>> changes (1-2 IIRC) from the last released version.
>>
>> Cheers.
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
> For additional commands, e-mail: dev-help@perl.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by Ryan Gies <ry...@livesite.net>.
I'm not even sure what is being released, however wanted to follow
through just in case. I submitted a patch (and revised according to
feedback) for Apache2::Reload
http://www.mail-archive.com/dev@perl.apache.org/msg12391.html
Did this make it in (Fred?) or would you like me to create a patch
against the current revision? Or does this have nothing to do with the
release? Cheers, -Ryan
On 07/26/2010 11:35 PM, Philippe M. Chiasson wrote:
> On 10-07-22 23:33 , Philippe M. Chiasson wrote:
>
>> Phred just took care of what I believe was the last blocker for
>> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
>> valid objections or concerns, let me know.
>>
> First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
>
> Second, I've started giving this a shot, using the idea of creating a
> release branch where I would update the svn:externals to the latest
> released versions of the various submodules we use. However, I realized
> something of a problem with that.
>
> Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
> don't have up-to-date releases to base this release on. I'd like to ask
> the various maintainers of these modules to try and make a release (and
> tag it proprely) and notify this thread, so we can base this upcoming
> release on the same stuff then what's on CPAN.
>
> I'll take on Apache-Test, as it's the one with the least amount of
> changes (1-2 IIRC) from the last released version.
>
> Cheers.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by Fred Moyer <fr...@redhotpenguin.com>.
Ok I'll have an Apache-Reload rc shortly.
On Wednesday, July 28, 2010, Philip M. Gollucci <pg...@p6m7g8.com> wrote:
> On 7/26/2010 11:35 PM, Philippe M. Chiasson wrote:
>> On 10-07-22 23:33 , Philippe M. Chiasson wrote:
>>> Phred just took care of what I believe was the last blocker for
>>> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
>>> valid objections or concerns, let me know.
>>
>> First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
>>
>> Second, I've started giving this a shot, using the idea of creating a
>> release branch where I would update the svn:externals to the latest
>> released versions of the various submodules we use. However, I realized
>> something of a problem with that.
>>
>> Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
>> don't have up-to-date releases to base this release on. I'd like to ask
>> the various maintainers of these modules to try and make a release (and
>> tag it proprely) and notify this thread, so we can base this upcoming
>> release on the same stuff then what's on CPAN.
>>
>> I'll take on Apache-Test, as it's the one with the least amount of
>> changes (1-2 IIRC) from the last released version.
> The maintainers are this pmc and committers.
>
>
>
>
> --
> ------------------------------------------------------------------------
> 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
> Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
> VP Apache Infrastructure; Member, Apache Software Foundation
> Committer, FreeBSD Foundation
> Consultant, P6M7G8 Inc.
> Sr. System Admin, Ridecharge Inc.
>
> Work like you don't need the money,
> love like you'll never get hurt,
> and dance like nobody's watching.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
On 7/26/2010 11:35 PM, Philippe M. Chiasson wrote:
> On 10-07-22 23:33 , Philippe M. Chiasson wrote:
>> Phred just took care of what I believe was the last blocker for
>> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
>> valid objections or concerns, let me know.
>
> First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
>
> Second, I've started giving this a shot, using the idea of creating a
> release branch where I would update the svn:externals to the latest
> released versions of the various submodules we use. However, I realized
> something of a problem with that.
>
> Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
> don't have up-to-date releases to base this release on. I'd like to ask
> the various maintainers of these modules to try and make a release (and
> tag it proprely) and notify this thread, so we can base this upcoming
> release on the same stuff then what's on CPAN.
>
> I'll take on Apache-Test, as it's the one with the least amount of
> changes (1-2 IIRC) from the last released version.
The maintainers are this pmc and committers.
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
VP Apache Infrastructure; Member, Apache Software Foundation
Committer, FreeBSD Foundation
Consultant, P6M7G8 Inc.
Sr. System Admin, Ridecharge Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
Re: 2.0.5 RC soon?
Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 07/27/10 03:35, Philippe M. Chiasson wrote:
> On 10-07-22 23:33 , Philippe M. Chiasson wrote:
>> Phred just took care of what I believe was the last blocker for
>> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
>> valid objections or concerns, let me know.
>
> First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
>
> Second, I've started giving this a shot, using the idea of creating a
> release branch where I would update the svn:externals to the latest
> released versions of the various submodules we use. However, I realized
> something of a problem with that.
>
> Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
> don't have up-to-date releases to base this release on. I'd like to ask
> the various maintainers of these modules to try and make a release (and
> tag it proprely) and notify this thread, so we can base this upcoming
> release on the same stuff then what's on CPAN.
I've been out of the game for a while, but I'm going to take a crack at
the A-SL -rc nowish.
- --
- ------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
VP Apache Infrastructure; Member, Apache Software Foundation
Committer, FreeBSD Foundation
Consultant, P6M7G8 Inc.
Sr. System Admin, Ridecharge Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)
iD8DBQFMWX/ldbiP+9ubjBwRAuxjAJ9AMTbDKmJbaiZ/t147ilOgDWLJ0wCfcR5L
hR7PjuOOeewKrZ5SRE74htI=
=okHZ
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: 2.0.5 RC soon?
Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
On 10-07-22 23:33 , Philippe M. Chiasson wrote:
> Phred just took care of what I believe was the last blocker for
> releasing 2.0.4. I'd like to roll out RC1 tomorrow, so if tou have any
> valid objections or concerns, let me know.
First of all, sorry for the confusion, should have been 2.0.5, not 2.0.4.
Second, I've started giving this a shot, using the idea of creating a
release branch where I would update the svn:externals to the latest
released versions of the various submodules we use. However, I realized
something of a problem with that.
Apache-SizeLimit, Apache-Reload and to a lesser extent, Apache-Test
don't have up-to-date releases to base this release on. I'd like to ask
the various maintainers of these modules to try and make a release (and
tag it proprely) and notify this thread, so we can base this upcoming
release on the same stuff then what's on CPAN.
I'll take on Apache-Test, as it's the one with the least amount of
changes (1-2 IIRC) from the last released version.
Cheers.
--
Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/