geoff 2004/01/19 12:04:32
Modified: src/docs/2.0/api/Apache ServerUtil.pod
src/docs/2.0/api/ModPerl RegistryLoader.pod
src/docs/2.0/user/handlers http.pod server.pod
src/docs/2.0/user/install install.pod
src/docs/2.0/user/performance prevent.pod
src/docs/2.0/user/porting compat.pod
Log:
Apache::server_root_relative is now Apache::Server::server_root_relative
Revision Changes Path
1.15 +1 -1 modperl-docs/src/docs/2.0/api/Apache/ServerUtil.pod
Index: ServerUtil.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/api/Apache/ServerUtil.pod,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ServerUtil.pod 19 Jan 2004 19:22:25 -0000 1.14
+++ ServerUtil.pod 19 Jan 2004 20:04:32 -0000 1.15
@@ -162,7 +162,7 @@
C<$fname> is appended to the value of C<ServerRoot> and returned. For
example:
- my $log_dir = Apache::server_root_relative($r->pool, 'logs');
+ my $log_dir = Apache::Server::server_root_relative($r->pool, 'logs');
If C<$fname> is not specified, the value of C<ServerRoot> is returned
with a trailing C</>. (it's the same as using C<''> as C<$fname>'s
1.3 +3 -3 modperl-docs/src/docs/2.0/api/ModPerl/RegistryLoader.pod
Index: RegistryLoader.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/api/ModPerl/RegistryLoader.pod,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegistryLoader.pod 15 Jan 2004 14:33:40 -0000 1.2
+++ RegistryLoader.pod 19 Jan 2004 20:04:32 -0000 1.3
@@ -21,7 +21,7 @@
sub trans {
my $uri = shift;
$uri =~ s|^/registry/|cgi-bin/|;
- return Apache::server_root_relative(APR::Pool->new, $uri);
+ return Apache::Server::server_root_relative(APR::Pool->new, $uri);
}
my $rl = ModPerl::RegistryLoader->new(
package => 'ModPerl::Registry',
@@ -135,12 +135,12 @@
my $pool = APR::Pool->new;
- my $dir = Apache::server_root_relative($pool, "cgi-bin");
+ my $dir = Apache::Server::server_root_relative($pool, "cgi-bin");
sub trans {
my $uri = shift;
$uri =~ s|^/registry/|cgi-bin/|;
- return Apache::server_root_relative($pool, $uri);
+ return Apache::Server::server_root_relative($pool, $uri);
}
my $rl = ModPerl::RegistryLoader->new(
1.29 +2 -2 modperl-docs/src/docs/2.0/user/handlers/http.pod
Index: http.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/user/handlers/http.pod,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- http.pod 19 Jan 2004 16:57:45 -0000 1.28
+++ http.pod 19 Jan 2004 20:04:32 -0000 1.29
@@ -149,7 +149,7 @@
my $r = shift;
$r->content_type('text/plain');
- my $conf_file = catfile Apache::server_root_relative($r->pool, 'conf'),
+ my $conf_file = catfile Apache::Server::server_root_relative($r->pool,
'conf'),
"httpd.conf";
printf "$conf_file is %0.2f minutes old", 60*24*(-M $conf_file);
@@ -1189,7 +1189,7 @@
$r->connection->remote_ip, scalar(localtime),
$r->uri, $r->status, $r->bytes_sent;
- my $log_path = Apache::server_root_relative($r->pool,
+ my $log_path = Apache::Server::server_root_relative($r->pool,
"logs/$username.log");
open my $fh, ">>$log_path" or die "can't open $log_path: $!";
flock $fh, LOCK_EX;
1.11 +3 -3 modperl-docs/src/docs/2.0/user/handlers/server.pod
Index: server.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/user/handlers/server.pod,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- server.pod 16 Sep 2003 18:43:08 -0000 1.10
+++ server.pod 19 Jan 2004 20:04:32 -0000 1.11
@@ -66,7 +66,7 @@
sub open_logs {
my($conf_pool, $log_pool, $temp_pool, $s) = @_;
- my $log_path = Apache::server_root_relative($conf_pool, $log_file);
+ my $log_path = Apache::Server::server_root_relative($conf_pool,
$log_file);
$s->warn("opening the log file: $log_path");
open $log_fh, ">>$log_path" or die "can't open $log_path: $!";
@@ -201,7 +201,7 @@
sub open_logs {
my($conf_pool, $log_pool, $temp_pool, $s) = @_;
- my $log_path = Apache::server_root_relative($conf_pool, $log_file);
+ my $log_path = Apache::Server::server_root_relative($conf_pool,
$log_file);
$s->warn("opening the log file: $log_path");
open $log_fh, ">>$log_path" or die "can't open $log_path: $!";
@@ -212,7 +212,7 @@
}
In our example the handler uses the function
-C<Apache::server_root_relative()> to set the full path to the log
+C<Apache::Server::server_root_relative()> to set the full path to the log
file, which is then opened for appending and set to unbuffered
mode. Finally it logs the fact that it's running in the parent
process.
1.51 +2 -2 modperl-docs/src/docs/2.0/user/install/install.pod
Index: install.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/user/install/install.pod,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- install.pod 22 Nov 2003 21:57:11 -0000 1.50
+++ install.pod 19 Jan 2004 20:04:32 -0000 1.51
@@ -441,8 +441,8 @@
use Apache::ServerUtil ();
use Apache::Process ();
my $pool = Apache->server->process->pool;
- push @INC, Apache::server_root_relative($pool, "");
- push @INC, Apache::server_root_relative($pool, "lib/perl");
+ push @INC, Apache::Server::server_root_relative($pool, "");
+ push @INC, Apache::Server::server_root_relative($pool, "lib/perl");
in I<startup.pl>.
1.2 +2 -2 modperl-docs/src/docs/2.0/user/performance/prevent.pod
Index: prevent.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/user/performance/prevent.pod,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prevent.pod 12 Mar 2003 06:37:07 -0000 1.1
+++ prevent.pod 19 Jan 2004 20:04:32 -0000 1.2
@@ -31,11 +31,11 @@
can. Never use server pools during request, when you can use a request
pool. For example inside an HTTP handler, don't call:
- my $conf_dir = Apache::server_root_relative($s->pool, 'conf');
+ my $conf_dir = Apache::Server::server_root_relative($s->pool, 'conf');
when you can call:
- my $conf_dir = Apache::server_root_relative($r->pool, 'conf');
+ my $conf_dir = Apache::Server::server_root_relative($r->pool, 'conf');
Of course on special occasions, you may want to have something
allocated off the server pool if you want the allocated memory to
1.37 +4 -4 modperl-docs/src/docs/2.0/user/porting/compat.pod
Index: compat.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/user/porting/compat.pod,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- compat.pod 19 Jan 2004 19:00:51 -0000 1.36
+++ compat.pod 19 Jan 2004 20:04:32 -0000 1.37
@@ -978,13 +978,13 @@
=head2 C<$r-E<gt>server_root_relative>
-C<Apache::server_root_relative> is a function in 2.0 and its first
+C<Apache::Server::server_root_relative> is a function in 2.0 and its first
argument is the I<pool> object. For example:
# during request
- my $conf_dir = Apache::server_root_relative($r->pool, 'conf');
+ my $conf_dir = Apache::Server::server_root_relative($r->pool, 'conf');
# during startup
- my $conf_dir = Apache::server_root_relative($s->pool, 'conf');
+ my $conf_dir = Apache::Server::server_root_relative($s->pool, 'conf');
Alternatively:
@@ -997,7 +997,7 @@
my $conf_dir = Apache->server_root_relative('conf');
-is no longer valid - C<Apache::server_root_relative> must be called
+is no longer valid - C<Apache::Server::server_root_relative> must be called
from either one of C<$r>, C<$s>, or C<$c>, or be explicitly
passed a pool.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
