Author: geoff Date: Fri Apr 8 06:02:24 2005 New Revision: 160554 URL: http://svn.apache.org/viewcvs?view=rev&rev=160554 Log: rename Apache2->request and Apache2->server to Apache2::RequestUtil->request and Apache2::ServerUtil->server
also, remove Apache2.pod and Apache.pod, since the Apache/Apache2 virtual class is now gone Removed: perl/modperl/docs/trunk/src/docs/2.0/api/Apache.pod perl/modperl/docs/trunk/src/docs/2.0/api/Apache2.pod Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/Log.pod perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/RequestUtil.pod perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerRec.pod perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerUtil.pod perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/porting.pod perl/modperl/docs/trunk/src/docs/2.0/api/ModPerl/Registry.pod perl/modperl/docs/trunk/src/docs/2.0/api/config.cfg perl/modperl/docs/trunk/src/docs/2.0/user/config/config.pod perl/modperl/docs/trunk/src/docs/2.0/user/config/custom.pod perl/modperl/docs/trunk/src/docs/2.0/user/porting/compat.pod Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/Log.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/Log.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/Log.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/Log.pod Fri Apr 8 06:02:24 2005 @@ -14,7 +14,7 @@ use Apache2::Const -compile => qw(OK :log); use APR::Const -compile => qw(:error SUCCESS); - my $s = Apache2->server; + my $s = Apache2::ServerUtil->server; $s->log_error("server: log_error"); $s->log_serror(__FILE__, __LINE__, Apache2::Const::LOG_ERR, @@ -754,7 +754,7 @@ use Apache2::RequestUtil (); sub handler { my $r = shift; - Apache2->request($r); + Apache2::RequestUtil->request($r); ... Outside HTTP handlers at the moment it is not possible, to get hold of Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/RequestUtil.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/RequestUtil.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/RequestUtil.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/RequestUtil.pod Fri Apr 8 06:02:24 2005 @@ -71,7 +71,7 @@ $sig = $r->psignature($prefix); # get the global request object (requires PerlOptions +GlobalRequest) - $r = Apache2->request; + $r = Apache2::RequestUtil->request; # insert auth credentials into the request as if the client did that $r->set_basic_credentials($username, $password); @@ -851,8 +851,8 @@ object|docs::2.0::api::Apache2::RequestRec>> ) object for the current request. - $r = Apache2->request; - Apache2->request($new_r); + $r = Apache2::RequestUtil->request; + Apache2::RequestUtil->request($new_r); =over 4 Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerRec.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerRec.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerRec.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerRec.pod Fri Apr 8 06:02:24 2005 @@ -33,7 +33,7 @@ $timeout = $s->timeout(); $loglevel = $s->loglevel(); - my $server = Apache2->server; + my $server = Apache2::ServerUtil->server; my $vhosts = 0; for (my $s = $server->next; $s; $s = $s->next) { $vhosts++; @@ -417,7 +417,7 @@ use Apache2::ServerRec (); use Apache2::ServerUtil (); - my $server = Apache2->server; + my $server = Apache2::ServerUtil->server; my $vhosts = 0; for (my $s = $server->next; $s; $s = $s->next) { $vhosts++; Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerUtil.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerUtil.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerUtil.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/ServerUtil.pod Fri Apr 8 06:02:24 2005 @@ -8,7 +8,7 @@ =head1 Synopsis use Apache2::ServerUtil (); - $s = Apache2->server; + $s = Apache2::ServerUtil->server; # push config $s->add_config(['ServerTokens off']); @@ -111,7 +111,7 @@ PerlResponseHandler Apache2::MyExample </Location> EOC - Apache2->server->add_config([split /\n/, $conf]); + Apache2::ServerUtil->server->add_config([split /\n/, $conf]); @@ -157,7 +157,7 @@ use Apache2::ServerUtil (); use Apache2::Const -compile => 'OK'; - Apache2->server->push_handlers( + Apache2::ServerUtil->server->push_handlers( PerlPostConfigHandler => \&add_my_version); sub add_my_version { @@ -644,7 +644,7 @@ Get the main server's object - $main_s = Apache2->server(); + $main_s = Apache2::ServerUtil->server(); =over 4 Modified: perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/porting.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/porting.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/porting.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/Apache2/porting.pod Fri Apr 8 06:02:24 2005 @@ -63,7 +63,7 @@ reproduce the problem try to use an earlier phase, e.g. C<PerlPostConfigHandler>: - Apache2->server->push_handlers(PerlPostConfigHandler => \&porting_autoload); + Apache2::ServerUtil->server->push_handlers(PerlPostConfigHandler => \&porting_autoload); META: Though there is a better solution at work, which assigns AUTOLOAD for each class separately, instead of using UNIVERSAL. See Modified: perl/modperl/docs/trunk/src/docs/2.0/api/ModPerl/Registry.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/ModPerl/Registry.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/ModPerl/Registry.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/ModPerl/Registry.pod Fri Apr 8 06:02:24 2005 @@ -29,7 +29,7 @@ For example: - my $r = Apache2->request; + my $r = Apache2::RequestUtil->request; $r->content_type("text/html"); $r->send_http_header; $r->print("mod_perl rules!"); Modified: perl/modperl/docs/trunk/src/docs/2.0/api/config.cfg URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/api/config.cfg?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/api/config.cfg (original) +++ perl/modperl/docs/trunk/src/docs/2.0/api/config.cfg Fri Apr 8 06:02:24 2005 @@ -17,7 +17,6 @@ group => 'Apache2:: Core API', chapters => [qw( - Apache2.pod Apache2/Access.pod Apache2/CmdParms.pod Apache2/Command.pod Modified: perl/modperl/docs/trunk/src/docs/2.0/user/config/config.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/user/config/config.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/user/config/config.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/user/config/config.pod Fri Apr 8 06:02:24 2005 @@ -398,7 +398,7 @@ sub handler { my $r = shift; - Apache2->request($r); + Apache2::RequestUtil->request($r); ... } @@ -525,7 +525,7 @@ setupenvoff.pl -------------- use Data::Dumper; - my $r = Apache2->request(); + my $r = Apache2::RequestUtil->request(); $r->content_type('text/plain'); print Dumper(\%ENV); Modified: perl/modperl/docs/trunk/src/docs/2.0/user/config/custom.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/user/config/custom.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/user/config/custom.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/user/config/custom.pod Fri Apr 8 06:02:24 2005 @@ -836,7 +836,7 @@ ... if ($s->is_virtual) { my $base_srv_cfg = Apache2::Module::get_config('MyApache2::MyParameters', - Apache2->server); + Apache2::ServerUtil->server); print $base_srv_cfg->{name}; } @@ -1160,7 +1160,7 @@ my $srv_cfg = get_config($s); if ($s->is_virtual) { - $secs{"1: Main Server"} = get_config(Apache2->server); + $secs{"1: Main Server"} = get_config(Apache2::ServerUtil->server); $secs{"2: Virtual Host"} = $srv_cfg; $secs{"3: Location"} = $dir_cfg; } Modified: perl/modperl/docs/trunk/src/docs/2.0/user/porting/compat.pod URL: http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/user/porting/compat.pod?view=diff&r1=160553&r2=160554 ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/user/porting/compat.pod (original) +++ perl/modperl/docs/trunk/src/docs/2.0/user/porting/compat.pod Fri Apr 8 06:02:24 2005 @@ -641,8 +641,8 @@ #... sub handler { my $r = shift; - Apache2->request($r); - # do some calls that rely on Apache2->request being available + Apache2::RequestUtil->request($r); + # do some calls that rely on Apache2::RequestUtil->request being available #... } @@ -694,7 +694,7 @@ or: - Apache2->server->get_handlers(...); + Apache2::ServerUtil->server->get_handlers(...); C<Apache-E<gt>get_handlers> is avalable via C<L<Apache2::compat|docs::2.0::api::Apache2::compat>>. @@ -713,7 +713,7 @@ or: - Apache2->server->push_handlers(...); + Apache2::ServerUtil->server->push_handlers(...); C<Apache-E<gt>push_handlers> is avalable via C<L<Apache2::compat|docs::2.0::api::Apache2::compat>>. @@ -733,7 +733,7 @@ or: - Apache2->server->set_handlers(...); + Apache2::ServerUtil->server->set_handlers(...); C<Apache-E<gt>set_handlers> is avalable via C<L<Apache2::compat|docs::2.0::api::Apache2::compat>>. @@ -764,7 +764,7 @@ C<L<$s-E<gt>add_config|docs::2.0::api::Apache2::ServerUtil/C_add_config_>>: require Apache2::ServerUtil; - Apache2->server->add_config(['require valid-user']); + Apache2::ServerUtil->server->add_config(['require valid-user']); C<Apache-E<gt>httpd_conf> is avalable via C<L<Apache2::compat|docs::2.0::api::Apache2::compat>>. @@ -820,7 +820,7 @@ use C<L<Apache2::Log::log_error()|docs::2.0::api::Apache2::Log/C__s_E_gt_log_error_>>: - Apache2->server->log_error + Apache2::ServerUtil->server->log_error instead. See the C<L<Apache2::Log|docs::2.0::api::Apache2::Log>> manpage. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]