Permalink
Browse files

sync with the trunk

  • Loading branch information...
1 parent ff7c9d0 commit 82b632f1a649afb55cad1a383114a20177adc4a7 Stas Bekman committed Sep 2, 2005
Showing with 752 additions and 596 deletions.
  1. +22 −0 Changes
  2. +11 −2 Makefile.PL
  3. +8 −8 ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
  4. +4 −3 ModPerl-Registry/lib/ModPerl/RegistryLoader.pm
  5. +1 −1 ModPerl-Registry/t/206.t
  6. +2 −2 ModPerl-Registry/t/304.t
  7. +1 −1 ModPerl-Registry/t/404.t
  8. +2 −1 ModPerl-Registry/t/cgi.t
  9. +1 −1 ModPerl-Registry/t/closure.t
  10. +1 −1 ModPerl-Registry/t/flush.t
  11. +1 −1 ModPerl-Registry/t/perlrun_extload.t
  12. +1 −1 ModPerl-Registry/t/redirect.t
  13. +1 −1 ModPerl-Registry/t/special_blocks.t
  14. +159 −91 lib/Apache2/Build.pm
  15. +15 −15 lib/Apache2/ParseSource.pm
  16. +11 −11 lib/Apache2/PerlSections.pm
  17. +4 −4 lib/Apache2/PerlSections/Dump.pm
  18. +6 −4 lib/Apache2/Reload.pm
  19. +5 −5 lib/Apache2/Resource.pm
  20. +2 −2 lib/Apache2/SizeLimit.pm
  21. +95 −101 lib/Apache2/Status.pm
  22. +17 −17 lib/Apache2/compat.pm
  23. +2 −1 lib/Apache2/porting.pm
  24. +13 −9 lib/ModPerl/BuildMM.pm
  25. +5 −5 lib/ModPerl/BuildOptions.pm
  26. +8 −8 lib/ModPerl/CScan.pm
  27. +46 −46 lib/ModPerl/Code.pm
  28. +4 −4 lib/ModPerl/FunctionMap.pm
  29. +4 −4 lib/ModPerl/MM.pm
  30. +1 −1 lib/ModPerl/Manifest.pm
  31. +5 −5 lib/ModPerl/MapUtil.pm
  32. +3 −3 lib/ModPerl/StructureMap.pm
  33. +24 −24 lib/ModPerl/TypeMap.pm
  34. +39 −39 lib/ModPerl/WrapXS.pm
  35. +9 −0 src/modules/perl/modperl_filter.c
  36. +6 −9 t/apache/content_length_header.t
  37. +1 −1 t/api/internal_redirect.t
  38. +1 −1 t/api/lookup_uri.t
  39. +1 −1 t/compat/request_body.t
  40. +1 −1 t/conf/modperl_extra.pl
  41. +2 −2 t/conf/post_config_startup.pl
  42. +1 −1 t/directive/setupenv.t
  43. +1 −1 t/filter/TestFilter/in_bbs_body.pm
  44. +1 −1 t/filter/TestFilter/in_bbs_consume.pm
  45. +1 −1 t/filter/TestFilter/in_bbs_inject_header.pm
  46. +1 −1 t/filter/TestFilter/in_bbs_msg.pm
  47. +1 −1 t/filter/TestFilter/in_bbs_underrun.pm
  48. +51 −0 t/filter/TestFilter/in_str_declined_read.pm
  49. +1 −1 t/filter/TestFilter/out_bbs_basic.pm
  50. +1 −1 t/filter/TestFilter/out_bbs_ctx.pm
  51. +1 −1 t/filter/TestFilter/out_bbs_filebucket.pm
  52. +2 −2 t/filter/TestFilter/out_str_buffer.pm
  53. +11 −0 t/filter/in_str_declined_read.t
  54. +1 −1 t/filter/out_bbs_filebucket.t
  55. +2 −2 t/filter/out_str_subreq_default.t
  56. +1 −1 t/hooks/TestHooks/authen_basic.pm
  57. +2 −2 t/hooks/TestHooks/authz.pm
  58. +1 −1 t/hooks/TestHooks/push_handlers_anon.pm
  59. +3 −3 t/hooks/TestHooks/startup.pm
  60. +1 −1 t/hooks/hookrun.t
  61. +1 −1 t/lib/TestAPRlib/string.pm
  62. +3 −3 t/lib/TestAPRlib/table.pm
  63. +1 −1 t/lib/TestAPRlib/uri.pm
  64. +1 −1 t/lib/TestAPRlib/util.pm
  65. +3 −3 t/lib/TestCommon/FilterDebug.pm
  66. +2 −2 t/lib/TestCommon/SameInterp.pm
  67. +1 −1 t/lib/TestCommon/TiePerlSection.pm
  68. +1 −1 t/lib/TestExit/FromPerlModule.pm
  69. +1 −1 t/modperl/setupenv2.t
  70. +1 −0 t/protocol/TestProtocol/eliza.pm
  71. +1 −1 t/protocol/TestProtocol/pseudo_http.pm
  72. +2 −2 t/protocol/pseudo_http.t
  73. +3 −5 t/response/TestAPI/access2.pm
  74. +1 −1 t/response/TestAPI/aplog.pm
  75. +1 −1 t/response/TestAPI/in_out_filters.pm
  76. +1 −1 t/response/TestAPI/lookup_uri2.pm
  77. +1 −1 t/response/TestAPI/request_util.pm
  78. +1 −1 t/response/TestAPI/status.pm
  79. +1 −1 t/response/TestAPR/flatten.pm
  80. +1 −1 t/response/TestAPR/perlio.pm
  81. +2 −2 t/response/TestApache/subprocess.pm
  82. +2 −2 t/response/TestApache/util.pm
  83. +2 −2 t/response/TestCompat/apache_module.pm
  84. +1 −1 t/response/TestCompat/apache_util.pm
  85. +1 −1 t/response/TestCompat/conn_authen.pm
  86. +2 −2 t/response/TestDirective/cmdparms.pm
  87. +1 −1 t/response/TestDirective/env.pm
  88. +8 −8 t/response/TestDirective/perlloadmodule.pm
  89. +4 −4 t/response/TestDirective/perlloadmodule2.pm
  90. +4 −4 t/response/TestDirective/perlloadmodule3.pm
  91. +2 −2 t/response/TestDirective/perlloadmodule4.pm
  92. +2 −2 t/response/TestDirective/perlloadmodule5.pm
  93. +2 −2 t/response/TestDirective/perlloadmodule6.pm
  94. +3 −3 t/response/TestDirective/perlloadmodule7.pm
  95. +1 −1 t/response/TestDirective/perlrequire.pm
  96. +1 −1 t/response/TestDirective/setupenv.pm
  97. +11 −11 t/response/TestError/runtime.pm
  98. +2 −2 t/response/TestModperl/cookie.pm
  99. +2 −2 t/response/TestModperl/cookie2.pm
  100. +1 −1 t/response/TestModperl/method.pm
  101. +2 −2 t/response/TestModperl/setupenv2.pm
  102. +2 −2 t/response/TestModperl/subenv.pm
  103. +0 −31 todo/apache2_rename
  104. +9 −15 todo/bugs_build
  105. +17 −0 todo/release
  106. +8 −1 xs/APR/APR/Makefile.PL
  107. +3 −3 xs/APR/Base64/APR__Base64.h
View
22 Changes
@@ -12,6 +12,28 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes
=item 2.0.2-dev
+Fix an undefined warning in DSO builds when not using MP_APXS.
+[Nikolay Ananiev <ananiev@thegdb.com>]
+
+When running Makefile.PL with the MP_MAINTAINER=1 option
+add -Wdeclaration-after-statement if we are using gcc
+version 3.3.2 or higher and its not already part of the ccopts.
+[Philip M. Gollucci, Gozer]
+
+Several fixes to Apache2::Status
+[Philip M. Gollucci]
+
+When using Apache2::Reload and ReloadDebug is set to 'On',
+sort the output alphabetically [Philip M. Gollucci]
+
+croak in case a filter returns DECLINED after calling $f->read (as it
+is not supposed to happen) [Stas]
+
+another round of cygwin fixes [Nick *** <doink123@abv.bg>]
+
+Multiple fixes to make mod_perl 2.0 work with blead-perl (5.9.3+)
+[Stas]
+
t/modules/reload.t would fail if run more than 3 times, breaking
smokes [Gozer]
View
@@ -389,8 +389,17 @@ sub post_configure {
}
if ($build->is_dynamic) {
- warning "You'll need to add the following to httpd.conf:",
- " LoadModule perl_module modules/$build->{MODPERL_LIB_DSO}\n";
+ warning
+ "You'll need to add the following to httpd.conf:", "",
+ " LoadModule perl_module modules/$build->{MODPERL_LIB_DSO}", "",
+ "depending on your build, mod_perl might not live in",
+ "the modules/ directory.\n";
+ if ($build->{MP_APXS}) {
+ warning
+ "Check the results of", "",
+ " \$ $build->{MP_APXS} -q LIBEXECDIR", "",
+ "and adjust the LoadModule directive accordingly.\n";
+ }
}
$build->save;
@@ -103,7 +103,7 @@ unless (defined $ModPerl::RegistryCooker::NameWithVirtualHost) {
#########################################################################
sub new {
- my($class, $r) = @_;
+ my ($class, $r) = @_;
my $self = bless {}, $class;
$self->init($r);
return $self;
@@ -575,7 +575,7 @@ my %switches = (
sub shebang_to_perl {
my $self = shift;
- my($line) = ${ $self->{CODE} } =~ /^(.*)$/m;
+ my ($line) = ${ $self->{CODE} } =~ /^(.*)$/m;
my @cmdline = split /\s+/, $line;
return "" unless @cmdline;
return "" unless shift(@cmdline) =~ /^\#!/;
@@ -617,7 +617,7 @@ sub get_script_name {
*chdir_file = \&NOP;
sub chdir_file_normal {
- my($self, $dir) = @_;
+ my ($self, $dir) = @_;
$dir ||= File::Basename::dirname($self->{FILENAME});
$self->debug("chdir $dir") if DEBUG & D_NOISE;
chdir $dir or die "Can't chdir to $dir: $!";
@@ -662,7 +662,7 @@ sub strip_end_data_segment {
#########################################################################
sub compile {
- my($self, $eval) = @_;
+ my ($self, $eval) = @_;
$self->debug("compiling $self->{FILENAME}") if DEBUG && D_COMPILE;
@@ -711,10 +711,10 @@ sub error_check {
#########################################################################
sub install_aliases {
- my($class, $rh_aliases) = @_;
+ my ($class, $rh_aliases) = @_;
no strict 'refs';
- while (my($k,$v) = each %$rh_aliases) {
+ while (my ($k,$v) = each %$rh_aliases) {
if (my $sub = *{$v}{CODE}){
*{ $class . "::$k" } = $sub;
}
@@ -733,7 +733,7 @@ sub debug {
}
sub log_error {
- my($self, $msg) = @_;
+ my ($self, $msg) = @_;
my $class = ref $self;
$self->{REQ}->log_error($msg);
@@ -763,7 +763,7 @@ sub log_error {
# cache_table() to point to another function, this function will fail.
sub uncache_myself {
my $package = scalar caller;
- my($class) = __PACKAGE__->cache_table_common();
+ my ($class) = __PACKAGE__->cache_table_common();
unless (defined $class) {
Apache2->warn("$$: cannot figure out cache symbol table for $package");
@@ -19,6 +19,7 @@ use warnings;
use ModPerl::RegistryCooker ();
use Apache2::ServerUtil ();
+use Apache2::Log ();
use APR::Pool ();
use Carp;
@@ -38,7 +39,7 @@ sub new {
}
sub handler {
- my($self, $uri, $filename, $virthost) = @_;
+ my ($self, $uri, $filename, $virthost) = @_;
# set the inheritance rules at run time
@ISA = $self->{package};
@@ -142,7 +143,7 @@ sub slurp_filename {
}
sub load_package {
- my($self, $package) = @_;
+ my ($self, $package) = @_;
croak "package to load wasn't specified" unless defined $package;
@@ -153,7 +154,7 @@ sub load_package {
sub warn {
my $self = shift;
- Apache2->warn(__PACKAGE__ . ": @_\n");
+ Apache2::Log->warn(__PACKAGE__ . ": @_\n");
}
1;
View
@@ -5,7 +5,7 @@ use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 2, need 'mod_alias.c';
+plan tests => 2, need [qw(mod_alias.c HTML::HeadParser)];
my $url = "/registry/206.pl";
my $res = GET($url);
View
@@ -5,7 +5,7 @@ use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 10, need 'mod_alias.c';
+plan tests => 10, need [qw(mod_alias.c HTML::HeadParser)];
my $url = "/registry/304.pl";
@@ -42,7 +42,7 @@ my $url = "/registry/304.pl";
'Thu Juk 99 00:00:00 9999 FUK' => "bogus If-Modified-Since #2",
);
my $received = '<html><head></head><body>Test</body></html>';
- while ( my($if_modified_since, $debug) = each %dates) {
+ while ( my ($if_modified_since, $debug) = each %dates) {
my $res = GET($url, 'If-Modified-Since' => $if_modified_since);
t_debug "If-Modified-Since $if_modified_since";
ok t_cmp(
View
@@ -5,7 +5,7 @@ use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY GET);
-plan tests => 2, need 'mod_alias.c';
+plan tests => 2, need [qw(mod_alias.c HTML::HeadParser)];
{
t_client_log_error_is_expected();
View
@@ -5,7 +5,8 @@ use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 2, need 'mod_alias.c', need_min_module_version CGI => 3.08;
+plan tests => 2, need [qw(mod_alias.c HTML::HeadParser)],
+ need_min_module_version CGI => 3.08;
my $url = "/registry/cgi.pl";
my $res = GET $url;
@@ -17,7 +17,7 @@ use File::Spec::Functions;
my @modules = qw(registry registry_bb perlrun);
-plan tests => 6, need 'mod_alias.c';
+plan tests => 6, need [qw(mod_alias.c HTML::HeadParser)];
my $cfg = Apache::Test::config();
@@ -5,7 +5,7 @@ use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY);
-plan tests => 1, need 'deflate', 'mod_alias.c',
+plan tests => 1, need [qw(mod_alias.c deflate HTML::HeadParser)],
need_min_module_version("Compress::Zlib", "1.09"),
need_min_apache_version("2.0.48");
# it requires httpd 2.0.48 because of the bug in mod_deflate:
@@ -6,7 +6,7 @@ use Apache::TestUtil;
use Apache::TestRequest qw(GET);
use TestCommon::SameInterp;
-plan tests => 2, need 'mod_alias.c';
+plan tests => 2, need [qw(mod_alias.c HTML::HeadParser)];
my $url = "/same_interp/perlrun/perlrun_extload.pl";
my $same_interp = Apache::TestRequest::same_interp_tie($url);
@@ -7,7 +7,7 @@ use Apache::TestRequest qw(GET_BODY HEAD);
use Apache::TestUtil qw(t_catfile_apache);
-plan tests => 4, need 'mod_alias.c', need_lwp;
+plan tests => 4, need [qw(mod_alias.c HTML::HeadParser)], need_lwp;
# need LWP to handle redirects
my $base_url = "/registry/redirect.pl";
@@ -16,7 +16,7 @@ my %modules = (
my @aliases = sort keys %modules;
-plan tests => @aliases * 4, need 'mod_alias.c';
+plan tests => @aliases * 4, need [qw(mod_alias.c HTML::HeadParser)];
{
# PerlRun always run BEGIN/END since it's never cached
Oops, something went wrong.

0 comments on commit 82b632f

Please sign in to comment.