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 ge...@apache.org on 2005/03/08 02:58:54 UTC
svn commit: r156472 [1/4] - in
perl/modperl/branches/apache2-rename-unstable/t: conf/ filter/TestFilter/
hooks/TestHooks/ htdocs/includes-registry/ htdocs/vhost/ lib/TestCommon/
preconnection/TestPreConnection/ protocol/TestProtocol/ response/TestAPI/
response/TestAPR/ response/TestApache/ response/TestCompat/
response/TestDirective/ response/TestError/ response/TestModperl/
response/TestModules/ response/TestPerl/ response/TestUser/
response/TestVhost/
Author: geoff
Date: Mon Mar 7 17:58:09 2005
New Revision: 156472
URL: http://svn.apache.org/viewcvs?view=rev&rev=156472
Log:
do the minimum required to get the test server started so
the tests will run.
note you will need to alter CGI.pm to require Apache2 modules
just to get the server to start
Modified:
perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in
perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl
perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_con_add.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_native_remove.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_add.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_mix.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_proxy.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_autoload.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_body.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_consume.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_inject_header.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_msg.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_underrun.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_error.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_init_basic.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_bin_data.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_consume.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_declined.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_lc.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_msg.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_sandwich.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_basic.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_ctx.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_filebucket.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_init_basic.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_ctx.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_declined.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_eval.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_lc.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_remove.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_eos.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_mix.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_reverse.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_default.pm
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_modperl.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/access.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_basic.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_digest.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authz.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup2.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/fixup.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/headerparser.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/hookrun.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/init.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/inlined_handlers.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/push_handlers.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/push_handlers_blessed.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/push_handlers_same_phase.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/set_handlers.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/stacked_handlers.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/stacked_handlers2.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/startup.pm
perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/trans.pm
perl/modperl/branches/apache2-rename-unstable/t/htdocs/includes-registry/cgipm.pl
perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl
perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/startup.pl
perl/modperl/branches/apache2-rename-unstable/t/lib/TestCommon/FilterDebug.pm
perl/modperl/branches/apache2-rename-unstable/t/lib/TestCommon/Handlers.pm
perl/modperl/branches/apache2-rename-unstable/t/lib/TestCommon/Utils.pm
perl/modperl/branches/apache2-rename-unstable/t/preconnection/TestPreConnection/note.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_bbs.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_bbs2.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_block.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_filter.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_nonblock.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/echo_timeout.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/eliza.pm
perl/modperl/branches/apache2-rename-unstable/t/protocol/TestProtocol/pseudo_http.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/access.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/access2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/command.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/custom_response.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/internal_redirect.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/internal_redirect_handler.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/lookup_misc.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/lookup_uri.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/lookup_uri2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/response.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/rflush.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/sendfile.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_const.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/show.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/slurp_filename.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/status.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/sub_request.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/uri.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/base64.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/brigade.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/bucket.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/date.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/finfo.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/flatten.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/ipsubnet.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/os.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/perlio.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/pool.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/pool_lifetime.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/sockaddr.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/socket.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/string.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/table.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/threadmutex.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/uri.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPR/uuid.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/cgihandler.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/conftree.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/content_length_header.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/discard_rbody.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/post.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/send_cgi_header.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/subprocess.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/write.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_module.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/send_fd.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/cmdparms.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/env.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perldo.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule4.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule5.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule6.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlmodule.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlrequire.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/pod.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/setupenv.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestError/runtime.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestError/syntax.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/current_callback.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/endav.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/exit.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/getc.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_nested_with_closed_stds.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_with_closed_stds.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/merge.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/method.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodname.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodobj.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl_options.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/pnotes.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/post_utf8.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8_2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/printf.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/readline.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_tie_api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/sameinterp.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setauth.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/status.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/subenv.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/include_subreq.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/proxy.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/hash_attack.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/ithreads.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/signals.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestUser/rewrite.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/config.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in Mon Mar 7 17:58:09 2005
@@ -1,4 +1,4 @@
-PerlModule Apache::Module
+PerlModule Apache2::Module
PerlPostConfigRequire @ServerRoot@/conf/post_config_startup.pl
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl Mon Mar 7 17:58:09 2005
@@ -24,12 +24,12 @@
use Apache2 ();
-use Apache::ServerUtil ();
-use Apache::ServerRec ();
-use Apache::Process ();
-use Apache::Log ();
+use Apache2::ServerUtil ();
+use Apache2::ServerRec ();
+use Apache2::Process ();
+use Apache2::Log ();
-use Apache::Const -compile => ':common';
+use Apache2::Const -compile => ':common';
reorg_INC();
@@ -53,9 +53,9 @@
# after Apache2 has pushed blib and core dirs including Apache2 on
# top reorg @INC to have first devel libs, then blib libs, and
# only then perl core libs
- my $pool = Apache->server->process->pool;
+ my $pool = Apache2->server->process->pool;
my $project_root = canonpath
- Apache::ServerUtil::server_root_relative($pool, "..");
+ Apache2::ServerUtil::server_root_relative($pool, "..");
my (@a, @b, @c);
for (@INC) {
if (m|^\Q$project_root\E|) {
@@ -76,10 +76,10 @@
my $ap_mods = scalar grep { /^Apache/ } keys %INC;
my $apr_mods = scalar grep { /^APR/ } keys %INC;
- Apache::Log->info("$ap_mods Apache:: modules loaded");
- Apache::ServerRec->log->info("$apr_mods APR:: modules loaded");
+ Apache2::Log->info("$ap_mods Apache:: modules loaded");
+ Apache2::ServerRec->log->info("$apr_mods APR:: modules loaded");
- my $server = Apache->server;
+ my $server = Apache2->server;
my $vhosts = 0;
for (my $s = $server->next; $s; $s = $s->next) {
$vhosts++;
@@ -99,22 +99,22 @@
PerlResponseHandler Apache::TestHandler::ok1
</Location>
EOC
- Apache->server->add_config([split /\n/, $conf]);
+ Apache2->server->add_config([split /\n/, $conf]);
# test a directive that triggers an early startup, so we get an
# attempt to use perl's mip early
- Apache->server->add_config(['<Perl >', '1;', '</Perl>']);
+ Apache2->server->add_config(['<Perl >', '1;', '</Perl>']);
}
# need to run from config phase, since it registers PerlPostConfigHandler
sub test_add_version_component {
- Apache->server->push_handlers(
+ Apache2->server->push_handlers(
PerlPostConfigHandler => \&add_my_version);
sub add_my_version {
my($conf_pool, $log_pool, $temp_pool, $s) = @_;
$s->add_version_component("world domination series/2.0");
- return Apache::OK;
+ return Apache2::OK;
}
}
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl Mon Mar 7 17:58:09 2005
@@ -7,21 +7,21 @@
use Socket (); # test DynaLoader vs. XSLoader workaround for 5.6.x
-use Apache::ServerRec ();
-use Apache::ServerUtil ();
-use Apache::Process ();
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
-use Apache::Connection ();
-use Apache::Log ();
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::Process ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
+use Apache2::Connection ();
+use Apache2::Log ();
use APR::Table ();
use APR::Pool ();
use ModPerl::Util (); #for CORE::GLOBAL::exit
-use Apache::Const -compile => ':common';
+use Apache2::Const -compile => ':common';
END {
warn "END in modperl_extra.pl, pid=$$\n";
@@ -46,54 +46,54 @@
### only subs below this line ###
sub test_apache_resource {
- ### Apache::Resource tests
+ ### Apache2::Resource tests
# load first for the menu
- require Apache::Status;
+ require Apache2::Status;
# uncomment for local tests
#$ENV{PERL_RLIMIT_DEFAULTS} = 1;
- #$Apache::Resource::Debug = 1;
+ #$Apache2::Resource::Debug = 1;
# requires optional BSD::Resource
return unless eval { require BSD::Resource };
- require Apache::Resource;
+ require Apache2::Resource;
}
sub test_apache_size_limit {
# would be nice to write a real test, but for now just see that we
# can load it for non-threaded mpms on supported platforms
- require Apache::MPM;
- return if Apache::MPM->is_threaded;
- eval { require Apache::SizeLimit };
+ require Apache2::MPM;
+ return if Apache2::MPM->is_threaded;
+ eval { require Apache2::SizeLimit };
if ($@) {
# unsupported platform
- die $@ unless $@ =~ /Apache::SizeLimit not implemented on/
+ die $@ unless $@ =~ /Apache2::SizeLimit not implemented on/
or $@ =~ /you must install BSD::Resource/;
}
}
sub test_apache_status {
- ### Apache::Status tests
- require Apache::Status;
- require Apache::Module;
- Apache::Status->menu_item(
+ ### Apache2::Status tests
+ require Apache2::Status;
+ require Apache2::Module;
+ Apache2::Status->menu_item(
'test_menu' => "Test Menu Entry",
sub {
my($r, $q) = @_; #request and CGI objects
return ["This is just a test entry"];
}
- ) if Apache::Module::loaded('Apache::Status');
+ ) if Apache2::Module::loaded('Apache::Status');
}
# test startup loglevel setting (under threaded mpms loglevel can be
# changed only before threads are started) so here we test whether we
# can still set it after restart
sub test_loglevel {
- use Apache::Const -compile => 'LOG_INFO';
- my $s = Apache->server;
- my $oldloglevel = $s->loglevel(Apache::LOG_INFO);
+ use Apache2::Const -compile => 'LOG_INFO';
+ my $s = Apache2->server;
+ my $oldloglevel = $s->loglevel(Apache2::LOG_INFO);
# restore
$s->loglevel($oldloglevel);
}
@@ -117,12 +117,12 @@
# server shutdown, when the test suite has finished its run
# so just check that we can register the cleanup and that it
# doesn't segfault
- Apache::ServerUtil::server_shutdown_cleanup_register(sub { Apache::OK });
+ Apache2::ServerUtil::server_shutdown_cleanup_register(sub { Apache2::OK });
# replace the sub with the following to get some visual debug
# should log cnt:1 on -start, oncand cnt: 2 -stop followed by cnt: 1)
- #Apache::ServerUtil::server_shutdown_cleanup_register( sub {
- # my $cnt = Apache::ServerUtil::restart_count();
+ #Apache2::ServerUtil::server_shutdown_cleanup_register( sub {
+ # my $cnt = Apache2::ServerUtil::restart_count();
# open my $fh, ">>/tmp/out" or die "$!";
# print $fh "cnt: $cnt\n";
# close $fh;
@@ -134,7 +134,7 @@
$s->log->info("Child process pid=$$ is exiting");
- Apache::OK;
+ Apache2::OK;
}
@@ -150,7 +150,7 @@
#test adding config at request time
$r->add_config(['require valid-user']);
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_con_add.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_con_add.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_con_add.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_con_add.pm Mon Mar 7 17:58:09 2005
@@ -8,24 +8,24 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Connection ();
+use Apache2::Connection ();
use APR::Bucket ();
use APR::Brigade ();
use APR::Error ();
use APR::Socket;
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
use APR::Const -compile => qw(SUCCESS EOF SO_NONBLOCK);
-use Apache::Const -compile => qw(OK MODE_GETLINE);
+use Apache2::Const -compile => qw(OK MODE_GETLINE);
sub pre_connection {
- my Apache::Connection $c = shift;
+ my Apache2::Connection $c = shift;
$c->add_input_filter(\&in_filter);
$c->add_output_filter(\&out_filter);
- return Apache::OK;
+ return Apache2::OK;
}
sub in_filter : FilterConnectionHandler {
@@ -38,7 +38,7 @@
# test that $filter->ctx works here
$filter->ctx(1);
- Apache::OK;
+ Apache2::OK;
}
sub out_filter : FilterConnectionHandler {
@@ -49,11 +49,11 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
- my Apache::Connection $c = shift;
+ my Apache2::Connection $c = shift;
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
@@ -62,7 +62,7 @@
my $bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
for (;;) {
- $c->input_filters->get_brigade($bb, Apache::MODE_GETLINE);
+ $c->input_filters->get_brigade($bb, Apache2::MODE_GETLINE);
last if $bb->is_empty;
my $b = APR::Bucket::flush_create($c->bucket_alloc);
@@ -75,7 +75,7 @@
$bb->destroy;
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_native_remove.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_native_remove.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_native_remove.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_native_remove.pm Mon Mar 7 17:58:09 2005
@@ -6,15 +6,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use Apache::Filter ();
-use Apache::FilterRec ();
+use Apache2::Filter ();
+use Apache2::FilterRec ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK DECLINED M_POST);
+use Apache2::Const -compile => qw(OK DECLINED M_POST);
# this filter removes the next filter in chain and itself
sub remove_includes {
@@ -28,7 +28,7 @@
$f->remove;
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
# this filter removes the next filter in chain and itself
@@ -46,7 +46,7 @@
}
$f->remove;
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
# this filter appends the output filter list at eos
@@ -67,7 +67,7 @@
$f->print("output2: $flist\n");
}
- return Apache::OK;
+ return Apache2::OK;
}
sub store_in_flist {
@@ -80,7 +80,7 @@
$r->pnotes('INPUT_FILTERS' => $x);
}
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
@@ -92,7 +92,7 @@
local $| = 0;
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print("content: " . TestCommon::Utils::read_post($r) ."\n");
}
@@ -110,7 +110,7 @@
$r->rflush; # this sends the data in the buffer + flush bucket
$r->print('"SSI_TEST" -->x'."\n");
- Apache::OK;
+ Apache2::OK;
}
sub get_flist {
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_add.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_add.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_add.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_add.pm Mon Mar 7 17:58:09 2005
@@ -6,14 +6,14 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use Apache::Filter ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub header_parser {
my $r = shift;
@@ -31,10 +31,10 @@
$filter->print($buffer);
}
- return Apache::OK;
+ return Apache2::OK;
});
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
sub in_filter {
@@ -44,7 +44,7 @@
$filter->print(lc $buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub out_filter {
@@ -55,7 +55,7 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
@@ -63,11 +63,11 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
- return Apache::OK;
+ return Apache2::OK;
}
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_mix.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_mix.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_mix.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_mix.pm Mon Mar 7 17:58:09 2005
@@ -64,15 +64,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use Apache::TestTrace;
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant DEBUG => 1;
@@ -87,7 +87,7 @@
$filter->print("");
- Apache::OK;
+ Apache2::OK;
}
sub in_adjust { adjust("INPUT", @_)}
@@ -105,7 +105,7 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
@@ -113,11 +113,11 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
- return Apache::OK;
+ return Apache2::OK;
}
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_proxy.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_proxy.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_proxy.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/both_str_req_proxy.pm Mon Mar 7 17:58:09 2005
@@ -7,15 +7,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use Apache::TestTrace;
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub in_filter {
my $filter = shift;
@@ -26,7 +26,7 @@
$filter->print(lc $buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub out_filter {
@@ -39,7 +39,7 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
@@ -49,11 +49,11 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_autoload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_autoload.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_autoload.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_autoload.pm Mon Mar 7 17:58:09 2005
@@ -9,11 +9,11 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Filter ();
+use Apache2::Filter ();
use Apache::TestTrace;
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
sub handler {
my $filter = shift;
@@ -23,7 +23,7 @@
$filter->print(lc $buffer);
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_body.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_body.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_body.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_body.pm Mon Mar 7 17:58:09 2005
@@ -3,16 +3,16 @@
use strict;
use warnings FATAL => 'all';
-use base qw(Apache::Filter); #so we inherit MODIFY_CODE_ATTRIBUTES
+use base qw(Apache2::Filter); #so we inherit MODIFY_CODE_ATTRIBUTES
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use APR::Brigade ();
use APR::Bucket ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use APR::Const -compile => ':common';
sub handler : FilterRequestHandler {
@@ -33,7 +33,7 @@
}
}
- Apache::OK;
+ Apache2::OK;
}
sub response {
@@ -41,7 +41,7 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
$r->puts($data);
}
@@ -49,7 +49,7 @@
$r->puts("1..1\nok 1\n");
}
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_consume.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_consume.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_consume.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_consume.pm Mon Mar 7 17:58:09 2005
@@ -8,15 +8,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use Apache::TestTrace;
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant READ_SIZE => 26;
@@ -58,7 +58,7 @@
die "Something is wrong, this filter should have been called only once";
}
- return Apache::OK;
+ return Apache2::OK;
}
# if $scan_only is true, don't read the data, just look for eos
@@ -88,13 +88,13 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
#warn "HANDLER READ: $data\n";
$r->print($data);
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_inject_header.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_inject_header.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_inject_header.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_inject_header.pm Mon Mar 7 17:58:09 2005
@@ -6,7 +6,7 @@
#
# the first task is simple for non-keepalive connections -- as soon as
# a bucket which matches /^[\r\n]+$/ is read we can store that event
-# in the filter context and simply 'return Apache::DECLINED on the
+# in the filter context and simply 'return Apache2::DECLINED on the
# future invocation, so not to slow things.
#
# it becomes much trickier with keepalive connection, since Apache
@@ -27,11 +27,11 @@
use strict;
use warnings FATAL => 'all';
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Connection ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Connection ();
use APR::Brigade ();
use APR::Bucket ();
use APR::Table ();
@@ -40,7 +40,7 @@
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK DECLINED CONN_KEEPALIVE);
+use Apache2::Const -compile => qw(OK DECLINED CONN_KEEPALIVE);
use APR::Const -compile => ':common';
my $header1_key = 'X-My-Protocol';
@@ -102,7 +102,7 @@
return $ctx;
}
- if ($c->keepalive == Apache::CONN_KEEPALIVE &&
+ if ($c->keepalive == Apache2::CONN_KEEPALIVE &&
$ctx->{done_with_headers} &&
$c->keepalives > $ctx->{keepalives}) {
@@ -127,7 +127,7 @@
my $c = $filter->c;
# reset the filter state, we start a new request
- if ($c->keepalive == Apache::CONN_KEEPALIVE &&
+ if ($c->keepalive == Apache2::CONN_KEEPALIVE &&
$ctx->{done_with_headers} && $c->notes->get('reset_request')) {
debug "a new request resetting the input filter state";
$c->notes->set('reset_request' => 0);
@@ -141,16 +141,16 @@
# XXX: when the bug in httpd filter will be fixed all the
# code in this branch will be replaced with:
# $filter->remove;
- # return Apache::DECLINED;
+ # return Apache2::DECLINED;
# at the moment (2.0.48) it doesn't work
# so meanwhile tell the mod_perl filter core to pass-through
# the brigade unmodified
debug "passing the body through unmodified";
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
# any custom HTTP header buckets to inject?
- return Apache::OK if inject_header_bucket($bb, $ctx);
+ return Apache2::OK if inject_header_bucket($bb, $ctx);
# normal HTTP headers processing
my $ctx_bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
@@ -224,7 +224,7 @@
$bb->insert_tail($b);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -242,7 +242,7 @@
my $data = TestCommon::Utils::read_post($r);
$r->print($data);
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_msg.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_msg.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_msg.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_msg.pm Mon Mar 7 17:58:09 2005
@@ -3,14 +3,14 @@
use strict;
use warnings FATAL => 'all';
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use APR::Brigade ();
use APR::Bucket ();
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
use APR::Const -compile => ':common';
use Apache::TestTrace;
@@ -45,7 +45,7 @@
# $filter->remove; # this filter is no longer needed
}
- Apache::OK;
+ Apache2::OK;
}
sub response {
@@ -55,7 +55,7 @@
$r->puts("1..1\nok 1\n");
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_underrun.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_underrun.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_underrun.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_bbs_underrun.pm Mon Mar 7 17:58:09 2005
@@ -43,15 +43,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use Apache::TestTrace;
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant SIZE => 1024*16 + 5; # ~16k
@@ -99,7 +99,7 @@
debug "storing the remainder: " . length($ctx) . " bytes";
}
- return Apache::OK;
+ return Apache2::OK;
}
# split in words of SIZE chars and a remainder
@@ -135,14 +135,14 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
#warn "HANDLER READ: $data\n";
my $length = length $data;
$r->print("read $length chars");
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_error.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_error.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_error.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_error.pm Mon Mar 7 17:58:09 2005
@@ -8,15 +8,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use APR::Table ();
use Apache::TestTrace;
use Apache::TestUtil;
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
sub handler {
my $filter = shift;
@@ -25,7 +25,7 @@
die "This filter must die";
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -43,7 +43,7 @@
$r->content_type('text/plain');
$r->print("it shouldn't be printed, because the input filter has died");
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_init_basic.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_init_basic.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_init_basic.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_init_basic.pm Mon Mar 7 17:58:09 2005
@@ -6,14 +6,14 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant READ_SIZE => 1024;
@@ -27,7 +27,7 @@
$filter->r->notes->set(init => $ctx->{init});
$filter->ctx($ctx);
- return Apache::OK;
+ return Apache2::OK;
}
# this filter passes the data through unmodified and sets a note
@@ -44,14 +44,14 @@
$filter->next->get_brigade($bb, $mode, $block, $readbytes);
- return Apache::OK;
+ return Apache2::OK;
}
# this filter is not supposed to get a chance to run, since its init
# handler immediately removes it
-sub suicide_init : FilterInitHandler { shift->remove(); Apache::OK }
+sub suicide_init : FilterInitHandler { shift->remove(); Apache2::OK }
sub suicide : FilterHasInitHandler(\&suicide_init) {
die "this filter is not supposed to have a chance to run";
}
@@ -61,7 +61,7 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
@@ -69,7 +69,7 @@
my %times = map { $_ => $r->notes->get($_)||0 } @keys;
$r->print("$_ $times{$_}\n") for @keys;
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_bin_data.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_bin_data.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_bin_data.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_bin_data.pm Mon Mar 7 17:58:09 2005
@@ -6,15 +6,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestIO ();
-use Apache::RequestRec ();
-use Apache::Filter ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::Filter ();
use Apache::TestTrace;
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub pass_through {
my $f = shift;
@@ -24,20 +24,20 @@
$f->print($buffer);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub handler {
my $r = shift;
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
my $length = length $data;
debug "pass through $length bytes of $data\n";
$r->print($data);
}
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_consume.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_consume.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_consume.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_consume.pm Mon Mar 7 17:58:09 2005
@@ -14,7 +14,7 @@
# currently if the streaming filter doesn't print anything, the
# upstream filter gets an empty brigade brigade (easily verified with
# the snooping debug filter). Of course if the filter returns
-# Apache::DECLINED the unconsumed data will be passed to upstream filter
+# Apache2::DECLINED the unconsumed data will be passed to upstream filter
#
# However this filter has a problem. Since it doesn't consume all the
# data, the client is left with un-read data, and when the response is
@@ -54,15 +54,15 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Filter ();
+use Apache2::Filter ();
use Apache::TestTrace;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant READ_BYTES_TOTAL => 105;
use constant READ_BYTES_FIRST => 23;
@@ -115,7 +115,7 @@
# if we don't need to have it as a whole chunk
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -123,7 +123,7 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
# tell Apache to get rid of the rest of the request body
@@ -136,7 +136,7 @@
$r->print($len);
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_declined.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_declined.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_declined.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_declined.pm Mon Mar 7 17:58:09 2005
@@ -6,14 +6,14 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use Apache::Filter ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK DECLINED M_POST);
+use Apache2::Const -compile => qw(OK DECLINED M_POST);
# make sure that if the input filter returns DECLINED without
# reading/printing data the data flow is not broken
@@ -29,7 +29,7 @@
$filter->r->notes->set(invoked => $ctx->{invoked});
#warn "filter was invoked $ctx->{invoked} times\n";
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
sub response {
@@ -39,7 +39,7 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
# consume the data so the input filter is invoked
my $data = TestCommon::Utils::read_post($r);
ok t_cmp(length $data, 20000, "the request body received ok");
@@ -54,7 +54,7 @@
my $invoked = $r->notes->get('invoked') || 0;
ok $invoked > 1;
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_lc.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_lc.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_lc.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_lc.pm Mon Mar 7 17:58:09 2005
@@ -3,13 +3,13 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub handler {
my $filter = shift;
@@ -19,7 +19,7 @@
$filter->print(lc $buffer);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -27,13 +27,13 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
#warn "HANDLER READ: $data\n";
$r->print($data);
}
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_msg.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_msg.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_msg.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_msg.pm Mon Mar 7 17:58:09 2005
@@ -12,10 +12,10 @@
use strict;
use warnings FATAL => 'all';
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use APR::Brigade ();
use APR::Bucket ();
@@ -24,7 +24,7 @@
use TestCommon::Utils ();
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
use APR::Const -compile => ':common';
my $from_url = '/input_filter.html';
@@ -46,7 +46,7 @@
}
$filter->ctx($ctx) if $ctx;
- return Apache::OK;
+ return Apache2::OK;
}
sub req : FilterRequestHandler {
@@ -58,7 +58,7 @@
$filter->print($buffer);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub con_skip : FilterConnectionHandler {
@@ -69,7 +69,7 @@
$filter->print("I'm a bogus filter. Don't run me\n");
}
- return Apache::OK;
+ return Apache2::OK;
}
my $expected = "UPCASED";
@@ -83,7 +83,7 @@
ok t_cmp($received, $expected,
"request filter must have upcased the data");
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_sandwich.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_sandwich.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_sandwich.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/in_str_sandwich.pm Mon Mar 7 17:58:09 2005
@@ -6,13 +6,13 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub handler {
my $filter = shift;
@@ -33,7 +33,7 @@
$filter->print("TAIL\n");
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -41,13 +41,13 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
#warn "HANDLER READ: $data\n";
$r->print($data);
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_basic.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_basic.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_basic.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_basic.pm Mon Mar 7 17:58:09 2005
@@ -5,14 +5,14 @@
use Apache::Test;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use APR::Brigade ();
use APR::Bucket ();
use APR::BucketType ();
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
#XXX: Not implemented yet, required by Test.pm
sub Apache::TestToString::PRINTF {}
@@ -53,7 +53,7 @@
$filter->ctx(1); # flag that we have run this already
}
- Apache::OK;
+ Apache2::OK;
}
sub response {
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_ctx.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_ctx.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_ctx.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_ctx.pm Mon Mar 7 17:58:09 2005
@@ -6,18 +6,18 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use APR::Brigade ();
use APR::Bucket ();
use APR::BucketType ();
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
use Apache::TestTrace;
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use APR::Const -compile => ':common';
use constant BLOCK_SIZE => 5003;
@@ -82,7 +82,7 @@
my $rv = $filter->next->pass_brigade($bb_ctx);
return $rv unless $rv == APR::SUCCESS;
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -107,7 +107,7 @@
$r->rflush; # so the filter reads a chunk at a time
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_filebucket.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_filebucket.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_filebucket.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_bbs_filebucket.pm Mon Mar 7 17:58:09 2005
@@ -5,17 +5,17 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter;
-use Apache::URI ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter;
+use Apache2::URI ();
use APR::Brigade ();
use APR::Bucket ();
use Apache::TestTrace;
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
use APR::Const -compile => qw(SUCCESS);
use constant BLOCK_SIZE => 5003;
@@ -52,10 +52,10 @@
$r->content_type('text/plain');
my $file = $r->args;
- Apache::URI::unescape_url($file);
+ Apache2::URI::unescape_url($file);
$r->sendfile($file);
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_init_basic.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_init_basic.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_init_basic.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_init_basic.pm Mon Mar 7 17:58:09 2005
@@ -6,14 +6,14 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant READ_SIZE => 1024;
@@ -31,7 +31,7 @@
#warn "**** init is exiting\n";
- return Apache::OK;
+ return Apache2::OK;
}
# testing whether we can get the pre handler callback in evolved way
@@ -56,7 +56,7 @@
#warn "**** filter is exiting\n";
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -67,7 +67,7 @@
$r->content_type('text/plain');
my $data;
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$data = TestCommon::Utils::read_post($r);
}
@@ -76,7 +76,7 @@
#warn "**** content is exiting\n";
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm Mon Mar 7 17:58:09 2005
@@ -1,27 +1,27 @@
package TestFilter::out_str_api;
-# Test Apache::FilterRec and Apache::Filter accessors
+# Test Apache2::FilterRec and Apache::Filter accessors
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
-use Apache::FilterRec ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
+use Apache2::FilterRec ();
use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest;
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
my $response_data = "blah blah blah";
#XXX: else pp_untie complains:
#untie attempted while %d inner references still exist
-sub Apache::Filter::UNTIE {}
-sub Apache::Filter::PRINTF {}
+sub Apache2::Filter::UNTIE {}
+sub Apache2::Filter::PRINTF {}
sub handler {
my $filter = shift;
@@ -37,12 +37,12 @@
ok t_cmp($data, $response_data, "response data");
- ok $filter->isa('Apache::Filter');
+ ok $filter->isa('Apache2::Filter');
{
my $frec = $filter->frec;
- ok $frec->isa('Apache::FilterRec');
+ ok $frec->isa('Apache2::FilterRec');
ok t_cmp($frec->name, "modperl_request_output", '$frec->name');
my $next = $filter->next;
@@ -59,7 +59,7 @@
my $r = $filter->r;
- ok $r->isa('Apache::RequestRec');
+ ok $r->isa('Apache2::RequestRec');
my $path = '/' . Apache::TestRequest::module2path(__PACKAGE__);
ok t_cmp($r->uri, $path, "path");
@@ -69,11 +69,11 @@
# we have done the job
$filter->remove;
- Apache::OK;
+ Apache2::OK;
}
sub pass_through {
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
sub response {
@@ -82,7 +82,7 @@
$r->content_type('text/plain');
$r->puts($response_data);
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_ctx.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_ctx.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_ctx.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_ctx.pm Mon Mar 7 17:58:09 2005
@@ -6,15 +6,15 @@
use strict;
use warnings;# FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
use APR::Brigade ();
use APR::Bucket ();
-use base qw(Apache::Filter);
+use base qw(Apache2::Filter);
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use APR::Const -compile => ':common';
use constant BLOCK_SIZE => 5003;
@@ -56,7 +56,7 @@
$filter->ctx($ctx);
}
- return Apache::OK;
+ return Apache2::OK;
}
@@ -82,7 +82,7 @@
$r->rflush; # so the filter reads a chunk at a time
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_declined.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_declined.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_declined.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_declined.pm Mon Mar 7 17:58:09 2005
@@ -6,12 +6,12 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use Apache::Filter ();
+use Apache2::Filter ();
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
use constant READ_SIZE => 1024;
@@ -29,13 +29,13 @@
$filter->r->notes->set(invoked => $ctx->{invoked});
#warn "decline filter was invoked $ctx->{invoked} times\n";
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
# this filter ignores all the data that comes through, though on the
# last invocation it prints how many times the filter 'decline' was called
# which it could count by itself, but we want to test that
-# 'return Apache::DECLINED' works properly in output filters
+# 'return Apache2::DECLINED' works properly in output filters
sub black_hole {
my $filter = shift;
@@ -54,7 +54,7 @@
$filter->print($invoked);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -70,7 +70,7 @@
$r->rflush; # this sends the data in the buffer + flush bucket
}
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_eval.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_eval.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_eval.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_eval.pm Mon Mar 7 17:58:09 2005
@@ -8,18 +8,18 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use Apache::Test;
use Apache::TestUtil;
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
# dummy pass_through filter was good enough to trigger the problem
sub handler {
- return Apache::DECLINED;
+ return Apache2::DECLINED;
}
sub response {
@@ -33,7 +33,7 @@
$r->rflush;
ok t_cmp($@, qr/Undefined subroutine/, "some croak");
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_lc.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_lc.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_lc.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_lc.pm Mon Mar 7 17:58:09 2005
@@ -3,11 +3,11 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Filter ();
+use Apache2::Filter ();
use TestCommon::Utils;
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
sub handler {
my $filter = shift;
@@ -21,7 +21,7 @@
$filter->print(lc $buffer);
}
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_remove.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_remove.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_remove.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_remove.pm Mon Mar 7 17:58:09 2005
@@ -6,12 +6,12 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
-use Apache::Filter ();
+use Apache2::Filter ();
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
use constant READ_SIZE => 1024;
@@ -26,7 +26,7 @@
$filter->remove;
- return Apache::OK;
+ return Apache2::OK;
}
# this filter inserts underscores after each character it receives
@@ -39,7 +39,7 @@
$filter->print($buffer);
}
- return Apache::OK;
+ return Apache2::OK;
}
@@ -55,7 +55,7 @@
$r->rflush; # this sends the data in the buffer + flush bucket
$r->print("bar");
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_eos.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_eos.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_eos.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_eos.pm Mon Mar 7 17:58:09 2005
@@ -6,13 +6,13 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
my $prefix = 'PREFIX_';
my $suffix = '_SUFFIX';
@@ -32,7 +32,7 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub add_suffix {
@@ -50,7 +50,7 @@
$filter->ctx(1);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
@@ -58,11 +58,11 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_mix.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_mix.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_mix.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_req_mix.pm Mon Mar 7 17:58:09 2005
@@ -36,11 +36,11 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Filter ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
sub adjust {
my $filter = shift;
@@ -52,7 +52,7 @@
$filter->print($buffer);
}
- Apache::OK;
+ Apache2::OK;
}
sub handler {
@@ -60,11 +60,11 @@
$r->content_type('text/plain');
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
$r->print(TestCommon::Utils::read_post($r));
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_reverse.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_reverse.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_reverse.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_reverse.pm Mon Mar 7 17:58:09 2005
@@ -7,13 +7,13 @@
use strict;
use warnings FATAL => 'all';
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Filter ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Filter ();
use TestCommon::Utils ();
-use Apache::Const -compile => qw(OK M_POST);
+use Apache2::Const -compile => qw(OK M_POST);
use constant BUFF_LEN => 2;
@@ -40,7 +40,7 @@
$f->ctx($leftover) if defined $leftover;
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -50,12 +50,12 @@
# unbuffer stdout, so we get the data split across several bbs
local $_ = 1;
- if ($r->method_number == Apache::M_POST) {
+ if ($r->method_number == Apache2::M_POST) {
my $data = TestCommon::Utils::read_post($r);
$r->print($_) for grep length $_, split /(.{5})/, $data;
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_default.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_default.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_default.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_default.pm Mon Mar 7 17:58:09 2005
@@ -6,13 +6,13 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::SubRequest ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::SubRequest ();
-use Apache::Filter ();
+use Apache2::Filter ();
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
# include the contents of a subrequest
# in the filter, a la mod_include's
@@ -48,7 +48,7 @@
$filter->ctx(1);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -63,7 +63,7 @@
$r->rflush;
$r->print("more content\n");
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_modperl.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_modperl.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_modperl.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_subreq_modperl.pm Mon Mar 7 17:58:09 2005
@@ -6,13 +6,13 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::SubRequest ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::SubRequest ();
-use Apache::Filter ();
+use Apache2::Filter ();
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
# include the contents of a subrequest
# in the filter, a la mod_include's
@@ -48,7 +48,7 @@
$filter->ctx(1);
}
- return Apache::OK;
+ return Apache2::OK;
}
sub subrequest {
@@ -58,7 +58,7 @@
$r->content_type('text/plain');
$r->print("modperl subrequest\n");
- return Apache::OK;
+ return Apache2::OK;
}
sub response {
@@ -73,7 +73,7 @@
$r->rflush;
$r->print("more content\n");
- Apache::OK;
+ Apache2::OK;
}
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/access.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/access.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/access.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/access.pm Mon Mar 7 17:58:09 2005
@@ -9,11 +9,11 @@
use warnings FATAL => 'all';
use APR::Table ();
-use Apache::Access ();
-use Apache::RequestRec ();
+use Apache2::Access ();
+use Apache2::RequestRec ();
use Apache::TestTrace;
-use Apache::Const -compile => qw(OK FORBIDDEN);
+use Apache2::Const -compile => qw(OK FORBIDDEN);
my $allowed_ips = qr{^(10|127)\.};
@@ -24,13 +24,13 @@
debug "access: " . ($fake_ip =~ $allowed_ips ? "OK\n" : "FORBIDDEN\n");
- return Apache::FORBIDDEN unless $fake_ip =~ $allowed_ips;
+ return Apache2::FORBIDDEN unless $fake_ip =~ $allowed_ips;
- Apache::OK;
+ Apache2::OK;
}
-sub fixup { debug "fixup\n"; Apache::OK }
-sub init { debug "init\n"; Apache::OK }
+sub fixup { debug "fixup\n"; Apache2::OK }
+sub init { debug "init\n"; Apache2::OK }
1;
__DATA__
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_basic.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_basic.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_basic.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_basic.pm Mon Mar 7 17:58:09 2005
@@ -3,29 +3,29 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Access ();
+use Apache2::Access ();
-use Apache::Const -compile => qw(OK HTTP_UNAUTHORIZED SERVER_ERROR);
+use Apache2::Const -compile => qw(OK HTTP_UNAUTHORIZED SERVER_ERROR);
sub handler {
my $r = shift;
my($rc, $sent_pw) = $r->get_basic_auth_pw;
- return $rc if $rc != Apache::OK;
+ return $rc if $rc != Apache2::OK;
my $user = $r->user;
my $requirement = $r->requires->[0]->{requirement};
- return Apache::SERVER_ERROR unless $requirement eq 'valid-user';
+ return Apache2::SERVER_ERROR unless $requirement eq 'valid-user';
unless ($user eq 'dougm' and $sent_pw eq 'foo') {
$r->note_basic_auth_failure;
- return Apache::HTTP_UNAUTHORIZED;
+ return Apache2::HTTP_UNAUTHORIZED;
}
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_digest.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_digest.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_digest.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authen_digest.pm Mon Mar 7 17:58:09 2005
@@ -3,10 +3,10 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Access ();
-use Apache::RequestRec ();
+use Apache2::Access ();
+use Apache2::RequestRec ();
-use Apache::Const -compile => qw(OK HTTP_UNAUTHORIZED);
+use Apache2::Const -compile => qw(OK HTTP_UNAUTHORIZED);
sub handler {
@@ -18,10 +18,10 @@
# header checks
if ($r->args) {
$r->note_digest_auth_failure;
- return Apache::HTTP_UNAUTHORIZED;
+ return Apache2::HTTP_UNAUTHORIZED;
}
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authz.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authz.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authz.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/authz.pm Mon Mar 7 17:58:09 2005
@@ -3,24 +3,24 @@
use strict;
use warnings FATAL => 'all';
-use Apache::Access ();
+use Apache2::Access ();
-use Apache::Const -compile => qw(OK HTTP_UNAUTHORIZED);
+use Apache2::Const -compile => qw(OK HTTP_UNAUTHORIZED);
sub auth_any {
my $r = shift;
my($res, $sent_pw) = $r->get_basic_auth_pw;
- return $res if $res != Apache::OK;
+ return $res if $res != Apache2::OK;
unless($r->user and $sent_pw) {
# testing $r->note_auth_failure:
# AuthType Basic + note_auth_failure == note_basic_auth_failure;
$r->note_auth_failure;
- return Apache::HTTP_UNAUTHORIZED;
+ return Apache2::HTTP_UNAUTHORIZED;
}
- return Apache::OK;
+ return Apache2::OK;
}
sub handler {
@@ -28,13 +28,13 @@
my $user = $r->user;
- return Apache::HTTP_UNAUTHORIZED unless $user;
+ return Apache2::HTTP_UNAUTHORIZED unless $user;
my($u, @allowed) = split /\s+/, $r->requires->[0]->{requirement};
- return Apache::HTTP_UNAUTHORIZED unless grep { $_ eq $user } @allowed;
+ return Apache2::HTTP_UNAUTHORIZED unless grep { $_ eq $user } @allowed;
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup.pm Mon Mar 7 17:58:09 2005
@@ -10,11 +10,11 @@
use File::Spec::Functions qw(catfile);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
sub get_file {
catfile Apache::Test::vars("documentroot"), "hooks", "cleanup";
@@ -28,7 +28,7 @@
$r->pnotes(items => ["cleanup"," ok"]);
$r->push_handlers(PerlCleanupHandler => \&cleanup2);
- return Apache::OK;
+ return Apache2::OK;
}
sub cleanup1 {
@@ -40,7 +40,7 @@
#warn "cleanup CALLED\n";
t_write_file(get_file(), $item);
- return Apache::OK;
+ return Apache2::OK;
}
sub cleanup2 {
@@ -51,7 +51,7 @@
#warn "cleanup2 CALLED\n";
t_append_file(get_file(), $item);
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/cleanup2.pm Mon Mar 7 17:58:09 2005
@@ -11,12 +11,12 @@
use File::Spec::Functions qw(catfile);
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
use APR::Pool ();
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
use APR::Const -compile => 'SUCCESS';
my $file = catfile Apache::Test::config->{vars}->{documentroot},
@@ -34,7 +34,7 @@
$r->pool->cleanup_register(\&cleanup, $file);
- return Apache::OK;
+ return Apache2::OK;
}
sub cleanup {
@@ -44,7 +44,7 @@
die "Can't find file: $file_arg" unless -e $file_arg;
unlink $file_arg or die "failed to unlink $file_arg";
- return Apache::OK;
+ return Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/fixup.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/fixup.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/fixup.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/fixup.pm Mon Mar 7 17:58:09 2005
@@ -6,16 +6,16 @@
use Apache::Test;
use APR::Table ();
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
sub handler {
my $r = shift;
$r->notes->set(ok => 1);
- Apache::OK;
+ Apache2::OK;
}
sub response {
@@ -25,7 +25,7 @@
ok $r->notes->get('ok');
- Apache::OK;
+ Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/headerparser.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/headerparser.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/headerparser.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/hooks/TestHooks/headerparser.pm Mon Mar 7 17:58:09 2005
@@ -6,16 +6,16 @@
use Apache::Test;
use APR::Table ();
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
sub handler {
my $r = shift;
$r->notes->set(headerparser => 'set');
- Apache::OK;
+ Apache2::OK;
}
sub response {
@@ -25,7 +25,7 @@
ok $r->notes->get('headerparser') eq 'set';
- Apache::OK;
+ Apache2::OK;
}
1;
Re: CGI.pm dependency in Apache2::Status
Posted by Stas Bekman <st...@stason.org>.
Geoffrey Young wrote:
>>>the note above is the only caveat - Apache2::Status requires either
>>>libapreq or CGI.pm, and CGI.pm won't work in it's current state since
>>>it uses Apache::-based modules.
>>
>>
>>I've looked at the source, and I'm puzzled why there's even
>>a dependency on CGI or apreq2 in there. Looking at the handler's
>>treatment of the query string, it looks like the raw query string
>>is (part of) a subroutine name, so it's not in the "name=value" format.
>>For GET, that means CGI and apreq are pretty useless. Is there some
>>clever use of POST data with Apache2::Status?
>
>
> stas, do you know the history here?
Nope. I just ported it to run to mp2. I didn't add that dependency.
From a quick look it seems that $q is passed to all subs, but it's not
used at all. I could be wrong though.
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
>>the note above is the only caveat - Apache2::Status requires either
>>libapreq or CGI.pm, and CGI.pm won't work in it's current state since
>>it uses Apache::-based modules.
>
>
> I've looked at the source, and I'm puzzled why there's even
> a dependency on CGI or apreq2 in there. Looking at the handler's
> treatment of the query string, it looks like the raw query string
> is (part of) a subroutine name, so it's not in the "name=value" format.
> For GET, that means CGI and apreq are pretty useless. Is there some
> clever use of POST data with Apache2::Status?
stas, do you know the history here?
>
>
>>so, you'll need to adjust CGI.pm just to get things running again.
>
>
> This is something we will need to deal with. Once we
> can get a fixed CGI.pm on CPAN, I think we should list
> that as a prereq for mp2.
>
> In the meantime, there is some namespace aliasing cruft that
> I added to t/conf/modperl_extra.pl, mainly to work around the
> older CGI.pm. Not sure what we should do with that idea. I'm
> generally opposed to binding *Apache:: and *Apache2::, but
> doing it for a few select packages might be justifiable
> somehow.
yeah, let's think on that. I have some time to work on this today, so I'll
get on it.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Randy Kobes <ra...@theoryx5.uwinnipeg.ca>.
On Tue, 15 Mar 2005, Geoffrey Young wrote:
[ ... ]
> >
> > +1 for putting a plain-old "2" in any $ENV{MOD_PERL_FOO} you like best.
>
> ok, that's fine with me. others should feel free to weigh
> in as well, though :)
Using just "2" is fine with me as well - it serves the
purpose for now, and as you mentioned, mod_perl's $VERSION
can be used if a greater degree of accuracy is ever
required.
--
best regards,
randy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> The problem before us now is basically this: how do we extract the old
> "generations" concept *out of* the installation layout (ie MP_INST_APACHE2)
> and incorporate it directly *into* the runtime? Remember, we didn't have a
> minor-number gradation for the layout (after all, it wasn't Apache2_0.pm),
> so we shouldn't *need* one for what we're trying to do with the runtime.
> If you see a future advantage to exposing a minor API number, please
> expain that.
yes, it was thoughts about the future, but nothing I can concretely
pinpoint. I guess what I saw the possibility of was people using this new
API variable as a way to distinguish, say, which form of Apache2::Foo->bar()
to call. but they can just as easily do that with $mod_perl::VERSION I
suppose.
>
> Remember what we decided in the pmc:
>
> 1) mp2 will install in parallel with mp1,
> 2) future mp2 releases will supercede prior mp2 releases,
> 3) whoever is doing mp3 will get to decide what to do
> about the existing mp1 & mp2 codebases, when that time comes.
yeah, I wasn't trying to achieve a 2.0 versus 2.1 versus 3.0 level of
granularity. it was more users being able to say "ah, 2.13 was the minor
bump that changes things important to our app" and having $bump be a simple
integer comparison, versus saying the same thing about 2.002_14-dev.
but don't worry, I'm not all that concerned about all of this - you asked me
to explain so I did :)
>
>
>>so, I dunno. perhaps we don't need the full major/minor bits a la
>>httpd, but something between "2" and "20050315.12"
>
>
> +1 for putting a plain-old "2" in any $ENV{MOD_PERL_FOO} you like best.
ok, that's fine with me. others should feel free to weigh in as well, though :)
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
[...]
> but the idea I had was to present something that was clear and easy to
> parse that modules could rely on going forward, the thought being that
> "mod_perl/1.999_21-dev" wasn't nearly as clear or simple as "2.1"
> where 2 was some major revision (like mp2) and 1 was some minor API
> ideal.
Agreed, but "2" is tough to beat when the criterion is "easy to parse".
Keep in mind I'm just questioning the rationale for having a minor
number, because it looks confusing to me. Let me try to explain why...
The problem before us now is basically this: how do we extract the old
"generations" concept *out of* the installation layout (ie MP_INST_APACHE2)
and incorporate it directly *into* the runtime? Remember, we didn't have a
minor-number gradation for the layout (after all, it wasn't Apache2_0.pm),
so we shouldn't *need* one for what we're trying to do with the runtime.
If you see a future advantage to exposing a minor API number, please
expain that.
Remember what we decided in the pmc:
1) mp2 will install in parallel with mp1,
2) future mp2 releases will supercede prior mp2 releases,
3) whoever is doing mp3 will get to decide what to do
about the existing mp1 & mp2 codebases, when that time comes.
> so, I dunno. perhaps we don't need the full major/minor bits a la
> httpd, but something between "2" and "20050315.12"
+1 for putting a plain-old "2" in any $ENV{MOD_PERL_FOO} you like best.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> [...nice work!...]
:)
> I'm curious why we want to create a "module-magic-number" like the
> $API_VERSION you've got here. Does it convey any useful information
> beyond what's already in $VERSION?
not really. I guess I thought it was somewhat easier to parse than the
current $VERSION is all.
>
> Hmm, perhaps you are trying to kill two birds with one stone here
> (mp1-back-compat and future ABI changes in the httpd 2.x line)?
> If so, I think httpd handles ABI changes all by itself, by refusing
> to even load ABI-incompatible modules.
well, I was thinking abi on from an perl or xs pov, which httpd wouldn't
cover. but I guess you're right.
>
> As far as CGI.pm is concerned, it doesn't need this level of detail;
> it just needs to know which mod_perl module to require.
yes.
> An
> "generation" integer would probably suffice for that (or even my old
> "exists $ENV{MOD_PERL2}" idea). IOW, here's my +1 for making the
> patch set $ENV{MOD_PERL_API_VERSION} = 2 (or MOD_PERL_GENERATION
> if you prefer).
well, if we go that route I don't think we need anything beyond guaranteeing
that $ENV{MOD_PERL} is not only true, but will contain the version from here
on out. but the idea I had was to present something that was clear and easy
to parse that modules could rely on going forward, the thought being that
"mod_perl/1.999_21-dev" wasn't nearly as clear or simple as "2.1" where 2
was some major revision (like mp2) and 1 was some minor API ideal.
so, I dunno. perhaps we don't need the full major/minor bits a la httpd,
but something between "2" and "20050315.12"
?
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
[...]
> ok, attached is a patch that creates $ENV{MOD_PERL_API_VERSION} based
> on some information in mod_perl2.pm.
>
> feedback welcome.
[...nice work!...]
> Index: lib/mod_perl2.pm
> ===================================================================
> --- lib/mod_perl2.pm (revision 157559)
> +++ lib/mod_perl2.pm (working copy)
> @@ -34,6 +34,16 @@
> # $VERSION : "1.099020"
> # int $VERSION : 1.09902
> # $VERSION_TRIPLET: 1.99.20
> +
> + # mod_perl equivalent of httpd module magic number
> + # basically
> + # - bump the major version for binary-incompatible
> + # - bump the minor version for API changes
> + # - if you bump the major version, reset the minor to 0
> + our $API_VERSION_MAJOR = 20050315;
> + our $API_VERSION_MINOR = 0;
> + our $API_VERSION = join '.', $API_VERSION_MAJOR,
> + $API_VERSION_MINOR/100;
> }
>
> $mod_perl::VERSION = $mod_perl2::VERSION;
>
> ---------------------------------------------------------------------
I'm curious why we want to create a "module-magic-number" like the
$API_VERSION you've got here. Does it convey any useful information
beyond what's already in $VERSION?
Hmm, perhaps you are trying to kill two birds with one stone here
(mp1-back-compat and future ABI changes in the httpd 2.x line)?
If so, I think httpd handles ABI changes all by itself, by refusing
to even load ABI-incompatible modules.
As far as CGI.pm is concerned, it doesn't need this level of detail;
it just needs to know which mod_perl module to require. An
"generation" integer would probably suffice for that (or even my old
"exists $ENV{MOD_PERL2}" idea). IOW, here's my +1 for making the
patch set $ENV{MOD_PERL_API_VERSION} = 2 (or MOD_PERL_GENERATION
if you prefer).
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
Geoffrey Young wrote:
>>+1 for either documenting the format
>>of $ENV{MOD_PERL} so folks can parse it, or (preferably)
>>creating a new env variable that contains either the
>>version number or the API generation.
>
>
> yeah, I'm in favor of a new variable too. I'll probably get around to
> implementing it on monday then I'll post it for review. thoughts in the
> meanwhile still appreciated :)
ok, attached is a patch that creates $ENV{MOD_PERL_API_VERSION} based on
some information in mod_perl2.pm.
feedback welcome.
--Geoff
Re: CGI.pm dependency in Apache2::Status
Posted by Stas Bekman <st...@stason.org>.
Geoffrey Young wrote:
> /me notes stas' silence on all things unstable ;)
You know well that I'm against this Apache2 rename frenzy. What do you
expect me to say?
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> +1 for either documenting the format
> of $ENV{MOD_PERL} so folks can parse it, or (preferably)
> creating a new env variable that contains either the
> version number or the API generation.
yeah, I'm in favor of a new variable too. I'll probably get around to
implementing it on monday then I'll post it for review. thoughts in the
meanwhile still appreciated :)
/me notes stas' silence on all things unstable ;)
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
"Christopher H. Laco" <cl...@chrislaco.com> writes:
> Geoffrey Young wrote:
>
>>>While I'm sure my opinion is extremely low on the totem, I'd much prefer:
>>>
>>> $ENV{MOD_PERL} and $ENV{MOD_PERL_VERSION}
>> yeah, I was going to suggest something along these lines. perhaps
>> MOD_PERL_API_VERSION which we can use to affect abi compat or something. I
>> just didn't know if the overhead of another mandatory insertion into %ENV
>> was worth it, but we may be leaving ourselves with no recourse here.
>
> That's what led me to the other option of actually setting $ENV{MOD_PERL} to
> the verion instead of just true; the two birds with one stone thing.
But we can't wind the clock back for mp1, so whatever its
been producing in $ENV{MOD_PERL} isn't something we
should try to change now. +1 for either documenting the format
of $ENV{MOD_PERL} so folks can parse it, or (preferably)
creating a new env variable that contains either the
version number or the API generation.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by "Christopher H. Laco" <cl...@chrislaco.com>.
Geoffrey Young wrote:
>>While I'm sure my opinion is extremely low on the totem, I'd much prefer:
>>
>> $ENV{MOD_PERL} and $ENV{MOD_PERL_VERSION}
>
>
> yeah, I was going to suggest something along these lines. perhaps
> MOD_PERL_API_VERSION which we can use to affect abi compat or something. I
> just didn't know if the overhead of another mandatory insertion into %ENV
> was worth it, but we may be leaving ourselves with no recourse here.
That's what led me to the other option of actually setting
$ENV{MOD_PERL} to the verion instead of just true; the two birds with
one stone thing.
-=Chris
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> While I'm sure my opinion is extremely low on the totem, I'd much prefer:
>
> $ENV{MOD_PERL} and $ENV{MOD_PERL_VERSION}
yeah, I was going to suggest something along these lines. perhaps
MOD_PERL_API_VERSION which we can use to affect abi compat or something. I
just didn't know if the overhead of another mandatory insertion into %ENV
was worth it, but we may be leaving ourselves with no recourse here.
>
> But that in and of itself means just checking $ENV{MOD_PERL} in MP1
> modules isn't enough, so maybe it's not good to want. :-)
>
> I'm going to show my sillyness. What does $ENV{MOD_PERL} actually
> contain? I always do if against it, but I've never looked at it's
> contents. Could $ENV{MOD_PERL} be made to hold the MP version, or would
> that break to many things?
I think it does, though the understanding in the docs and throughout time is
merely that it is "true" when running under mod_perl, not that it contains
anything reliable.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by "Christopher H. Laco" <cl...@chrislaco.com>.
Joe Schaefer wrote:
> Hmm, maybe we could have mp2 additionally expose $ENV{MOD_PERL2}?
> Then the logic becomes
>
> if (exists $ENV{MOD_PERL2}) {
> # running mp2
>
> }
> elsif exists ($ENV{MOD_PERL}) {
> # not mp2; must be mp1 then
>
> }
> else {
> # normal mode
>
> }
>
> or whatever. The point I'm trying to make is that the runtime
> is something we control, so marking the running mod_perl API
> via some runtime variable should be a workable approach.
>
While I'm sure my opinion is extremely low on the totem, I'd much prefer:
$ENV{MOD_PERL} and $ENV{MOD_PERL_VERSION}
But that in and of itself means just checking $ENV{MOD_PERL} in MP1
modules isn't enough, so maybe it's not good to want. :-)
I'm going to show my sillyness. What does $ENV{MOD_PERL} actually
contain? I always do if against it, but I've never looked at it's
contents. Could $ENV{MOD_PERL} be made to hold the MP version, or would
that break to many things?
What happens when MOD_PERL3 comes out? ;-)
-=Chris
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
[...]
> that would mean re-parsing "mod_perl/1.29_01-dev" and
> "mod_perl/1.999.22-dev" and the like within CGI.pm, right? I guess
> so, but it feels like a lot of extra code in CGI.pm. but I guess we
> don't really have much choice.
Hmm, maybe we could have mp2 additionally expose $ENV{MOD_PERL2}?
Then the logic becomes
if (exists $ENV{MOD_PERL2}) {
# running mp2
}
elsif exists ($ENV{MOD_PERL}) {
# not mp2; must be mp1 then
}
else {
# normal mode
}
or whatever. The point I'm trying to make is that the runtime
is something we control, so marking the running mod_perl API
via some runtime variable should be a workable approach.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
Joe Schaefer wrote:
> Geoffrey Young <ge...@modperlcookbook.org> writes:
>
>
> [...]
>
>
>>now, CGI.pm can try to decide whether it is running under mp1 or mp2,
>>but unless I'm missing something it's not all that easy.
>
>
> How about having it dispatch on the *value* of $ENV{MOD_PERL} (not
> just its mere existence), since the modperl runtime can control
> that?
that would mean re-parsing "mod_perl/1.29_01-dev" and
"mod_perl/1.999.22-dev" and the like within CGI.pm, right? I guess so, but
it feels like a lot of extra code in CGI.pm. but I guess we don't really
have much choice.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
[...]
> now, CGI.pm can try to decide whether it is running under mp1 or mp2,
> but unless I'm missing something it's not all that easy.
How about having it dispatch on the *value* of $ENV{MOD_PERL} (not
just its mere existence), since the modperl runtime can control
that?
> or CGI.pm can decide to eval the mp1 or mp2 API first, but I think
> that's the heart of the problem - nobody should have to make a choice
> like that at runtime.
Agreed; it needs to just work. Even with both mp1 and mp2 installed
in the same tree and running simultaneously.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
Joe Schaefer wrote:
> Geoffrey Young <ge...@modperlcookbook.org> writes:
>
> [...]
>
>
>>so, I'm increasingly of the opinion that we should refuse to install
>>mod_perl 2.0 over any other existing mod_perl installation.
>
>
> +1 for refusing to install if a prior mp2 install exists,
done
> but
> I don't (yet) see the problem when just a prior mp1 is there.
I _think_ the issue is this...
before we called 'require mod_perl' and assumed that either
1) there was only one mod_perl in site_lib, so we could trust it, or
2) the user declared 'PerlModule Apache2' which would explicity give mp2
priority, and hence definitively tell CGI.pm which mod_perl environment it
is running under.
now, we have the possibility of both mod_perl.pm and mod_perl2.pm in the
same site_lib, which means that both can potentially be require'd
successfully. and if that happens CGI.pm needs to choose which one to belive.
now, CGI.pm can try to decide whether it is running under mp1 or mp2, but
unless I'm missing something it's not all that easy. or CGI.pm can decide to
eval the mp1 or mp2 API first, but I think that's the heart of the problem -
nobody should have to make a choice like that at runtime.
anyway, I'm just thinking out loud here, so if anyone has a solution I'm all
ears.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
[...]
> so, I'm increasingly of the opinion that we should refuse to install
> mod_perl 2.0 over any other existing mod_perl installation.
+1 for refusing to install if a prior mp2 install exists, but
I don't (yet) see the problem when just a prior mp1 is there.
> make them start from a new perl tree, remove the old tree, or
> whatever. just minimize our mailing list burden by doing this up
> front.
Amen to that.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: CGI.pm dependency in Apache2::Status
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> This is something we will need to deal with. Once we
> can get a fixed CGI.pm on CPAN, I think we should list
> that as a prereq for mp2.
ok, I've been looking at how to fix this and I'm not sure I have the answer.
CGI.pm says this currently:
if (exists $ENV{MOD_PERL}) {
eval "require mod_perl";
if (defined $mod_perl::VERSION) {
if ($mod_perl::VERSION >= 1.99) {
$MOD_PERL = 2;
require Apache::Response;
require Apache::RequestRec;
require Apache::RequestUtil;
require APR::Pool;
} else {
$MOD_PERL = 1;
require Apache;
}
}
}
now, I was going to change this to
eval "require mod_perl";
eval "require mod_perl2";
if (defined $mod_perl::VERSION) {
if ($mod_perl::VERSION >= 1.99) {
require Apache::Response;
...
}
elsif ($mod_perl2::VERSION) {
require Apache2::Response;
...
} else {
...
}
but I'm not so sure I like it - it means that we can potentially be juggling
around 3 different mod_perl versions within the same site_lib, which is just
doomed.
but, that approach will work just fine if mod_perl refuses to install over
an existing mod_perl.pm, either mp1 or prior mp2 releases...
we are, of course, going to have a _huge_ migration effort on our hands once
the current path is released - people with Apache::Response and
Apache2::Response both in site_lib and their "porting" goes just fine until
they move to a new box and see they missed Apache2:: renames all over the
place. all in all, this strikes me as having a larger backlash in the
community than started all of this.
so, I'm increasingly of the opinion that we should refuse to install
mod_perl 2.0 over any other existing mod_perl installation. make them start
from a new perl tree, remove the old tree, or whatever. just minimize our
mailing list burden by doing this up front.
thoughts?
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
CGI.pm dependency in Apache2::Status (was: Re: svn commit: r156472
...)
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
> geoff@apache.org wrote:
[...]
>> note you will need to alter CGI.pm to require Apache2 modules
>> just to get the server to start
>
> ok, these were pretty massive commits but this is the important part -
> the test suite is up and running again, with (the expected) large
> number of failures.
At this point I hope we're not very far from achieving 100% passing
on the test suite, but my mp2 tuits for this week are pretty much
exhausted now.
> the note above is the only caveat - Apache2::Status requires either
> libapreq or CGI.pm, and CGI.pm won't work in it's current state since
> it uses Apache::-based modules.
I've looked at the source, and I'm puzzled why there's even
a dependency on CGI or apreq2 in there. Looking at the handler's
treatment of the query string, it looks like the raw query string
is (part of) a subroutine name, so it's not in the "name=value" format.
For GET, that means CGI and apreq are pretty useless. Is there some
clever use of POST data with Apache2::Status?
> so, you'll need to adjust CGI.pm just to get things running again.
This is something we will need to deal with. Once we
can get a fixed CGI.pm on CPAN, I think we should list
that as a prereq for mp2.
In the meantime, there is some namespace aliasing cruft that
I added to t/conf/modperl_extra.pl, mainly to work around the
older CGI.pm. Not sure what we should do with that idea. I'm
generally opposed to binding *Apache:: and *Apache2::, but
doing it for a few select packages might be justifiable
somehow.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156472 [1/4] - in perl/modperl/branches/apache2-rename-unstable/t:
conf/ filter/TestFilter/ hooks/TestHooks/ htdocs/includes-registry/ htdocs/vhost/
lib/TestCommon/ preconnection/TestPreConnection/ protocol/TestProtocol/ response/TestAPI/
response/TestAPR/ response/TestApache/ response/TestCompat/ response/TestDirective/
response/TestError/ response/TestModperl/ response/TestModules/ response/TestPerl/
response/TestUser/ response/TestVhost/
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
geoff@apache.org wrote:
> Author: geoff
> Date: Mon Mar 7 17:58:09 2005
> New Revision: 156472
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=156472
> Log:
> do the minimum required to get the test server started so
> the tests will run.
>
> note you will need to alter CGI.pm to require Apache2 modules
> just to get the server to start
ok, these were pretty massive commits but this is the important part - the
test suite is up and running again, with (the expected) large number of
failures.
the note above is the only caveat - Apache2::Status requires either libapreq
or CGI.pm, and CGI.pm won't work in it's current state since it uses
Apache::-based modules. so, you'll need to adjust CGI.pm just to get things
running again.
we should really consider what this means for the masses. perhaps looking
into getting more intelligent about the use of Apache2::Status within the
test suite.
anyway, nice work joe - I did this all in about an hour, which wouldn't have
been possible without all your hard work.
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org