Minor patch to fix ApacheHandler.pm to work under recent mod_perl 2.0
Christopher Nehren <[email protected]>
| Newsgroups | gmane.comp.web.mason.devel |
|---|---|
| Organization | Pigritia Solutions |
| Message-ID | <[email protected]> |
Please find attached a one-line diff which allows a user to run Mason under the recent mod_perl 2.0 API. I haven't had much chance to test it on a real site as I'm actually just starting out with Mason. However, all of the tests that come with Mason do pass. -- I abhor a system designed for the "user", if that word is a coded pejorative meaning "stupid and unsophisticated". -- Ken Thompson If you ask the wrong people questions, you get "Joel on Software". Unix is user friendly. However, it isn't idiot friendly.
ApacheHandler_dirconfig_fix.diff
(text/plain, 561 B)
Index: ApacheHandler.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/ApacheHandler.pm,v
retrieving revision 1.327
diff -u -r1.327 ApacheHandler.pm
--- ApacheHandler.pm 10 Jun 2005 22:22:11 -0000 1.327
+++ ApacheHandler.pm 21 Jun 2005 01:36:23 -0000
@@ -345,7 +345,7 @@
{
my ($package, $r) = @_;
- my $config = $r->dir_config;
+ my $config = $r ? $r->dir_config : _get_apache_server->dir_config;
#
# If the user has virtual hosts, each with a different document
signature.asc
(application/pgp-signature, 187 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQFCt5vek/lo7zvzJioRApqPAJ99d9cUyv5NyrQUfL86t+ifqX1M9gCfS3fd ww9SbOHLOAf/Ikyy8YJg3jc= =QGC6 -----END PGP SIGNATURE-----