Author: randyk
Date: Sat Apr 2 15:03:00 2005
New Revision: 159843
URL: http://svn.apache.org/viewcvs?view=rev&rev=159843
Log:
s/Apache/Apache2/
Modified:
perl/modperl/docs/trunk/src/docs/2.0/os/win32/config.pod
perl/modperl/docs/trunk/src/docs/2.0/os/win32/install.pod
Modified: perl/modperl/docs/trunk/src/docs/2.0/os/win32/config.pod
URL:
http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/os/win32/config.pod?view=diff&r1=159842&r2=159843
==============================================================================
--- perl/modperl/docs/trunk/src/docs/2.0/os/win32/config.pod (original)
+++ perl/modperl/docs/trunk/src/docs/2.0/os/win32/config.pod Sat Apr 2
15:03:00 2005
@@ -31,19 +31,18 @@
where a sample start-up script F<C:/Apache2/conf/extra.pl> is
- use Apache2 ();
use ModPerl::Util ();
- use Apache::RequestRec ();
- use Apache::RequestIO ();
- use Apache::RequestUtil ();
- use Apache::ServerRec ();
- use Apache::ServerUtil ();
- use Apache::Connection ();
- use Apache::Log ();
- use Apache::Const -compile => ':common';
+ use Apache2::RequestRec ();
+ use Apache2::RequestIO ();
+ use Apache2::RequestUtil ();
+ use Apache2::ServerRec ();
+ use Apache2::ServerUtil ();
+ use Apache2::Connection ();
+ use Apache2::Log ();
+ use Apache2::Const -compile => ':common';
use APR::Const -compile => ':common';
use APR::Table ();
- use Apache::compat ();
+ use Apache2::compat ();
use ModPerl::Registry ();
use CGI ();
1;
@@ -52,7 +51,7 @@
directories underneath, eg, F</Perl/site/lib/Apache2/> used when
building mod_perl 2.0 with an C<MP_INST_APACHE2=1> option to C<perl
Makefile.PL> (the C<PPM> packages discussed above were built this
-way). C<Apache::compat> is used to provide backwards compatibility
+way). C<Apache2::compat> is used to provide backwards compatibility
with mod_perl 1.0. C<ModPerl::Registry>, named so as not to conflict
with C<Apache::Registry> of mod_perl 1.0, is used for registry
scripts.
@@ -132,12 +131,12 @@
illustrates the use of mod_perl as a content handler. Create a file
F<Hello.pm> as follows:
- package Apache::Hello;
+ package Apache2::Hello;
use strict;
- use Apache::RequestRec (); # for $r->content_type
- use Apache::RequestIO (); # for $r->puts
- use Apache::Const -compile => ':common';
+ use Apache2::RequestRec (); # for $r->content_type
+ use Apache2::RequestIO (); # for $r->puts
+ use Apache2::Const -compile => ':common';
sub handler {
my $r = shift;
@@ -150,7 +149,7 @@
Hello from <B>$package</B>! The time is $time.
</BODY></HTML>
END
- return Apache::OK;
+ return Apache2::OK;
}
1;
@@ -159,17 +158,17 @@
directory. Next put the following directives in
F<C:/Apache2/conf/httpd.conf>:
- PerlModule Apache::Hello
+ PerlModule Apache2::Hello
<Location /hello>
SetHandler modperl
- PerlResponseHandler Apache::Hello
+ PerlResponseHandler Apache2::Hello
</Location>
With this, calls to
http://localhost/hello
-will use C<Apache::Hello> to deliver the content.
+will use C<Apache2::Hello> to deliver the content.
=head1 See Also
Modified: perl/modperl/docs/trunk/src/docs/2.0/os/win32/install.pod
URL:
http://svn.apache.org/viewcvs/perl/modperl/docs/trunk/src/docs/2.0/os/win32/install.pod?view=diff&r1=159842&r2=159843
==============================================================================
--- perl/modperl/docs/trunk/src/docs/2.0/os/win32/install.pod (original)
+++ perl/modperl/docs/trunk/src/docs/2.0/os/win32/install.pod Sat Apr 2
15:03:00 2005
@@ -106,17 +106,7 @@
will install the necessary mod_perl 2.0 files into your Perl directory
tree, and also copy F<src/modules/perl/mod_perl.so> into
-your F</Path/to/Apache2/modules/> directory. If you are installing
-mod_perl 2.0 on a system that also contains mod_perl 1.0, then some
-mod_perl 1.0 files will be overwritten by this procedure. This can be
-avoided by preparing the build as
-
- C:\modperl_src> perl Makefile.PL MP_AP_PREFIX=\Path\to\Apache2
MP_INST_APACHE2=1
-
-which will subsequently lead to the mod_perl 2.0 files being installed
-under an F<Apache2> subdirectory in your Perl tree. You will then
-have to employ either a C<use Apache2;> line in your scripts/packages
-or else a C<PerlModule Apache2> directive in Apache's F<httpd.conf>.
+your F</Path/to/Apache2/modules/> directory.
If this build fails, or you want features not present in the official
releases, you may want to try the sources obtained from cvs - see the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
