Mason

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv14138

Modified Files:
      Tag: mason-1-0-branch
	Changes 
Log Message:
singularize


Index: Changes
===================================================================
RCS file: /cvsroot/mason/mason/dist/Changes,v
retrieving revision 1.54.2.9.2.9
retrieving revision 1.54.2.9.2.10
diff -u -r1.54.2.9.2.9 -r1.54.2.9.2.10
--- Changes	2001/03/28 01:00:10	1.54.2.9.2.9
+++ Changes	2001/03/28 04:06:22	1.54.2.9.2.10
@@ -22,7 +22,7 @@
 - Added basic validation of arguments to Parser, Interp,
 and ApacheHandler constructors.
 - Added interp->die_handler, allowing you to install your own
-subroutine as $SIG{__DIE__} to catch errors during components
+subroutine as $SIG{__DIE__} to catch errors during component
 execution.  Alternately, you can simply turn the special error
 handling off.  L{Interp/die_handler}
 - Added interp->use_dhandlers and interp->use_autohandlers, more

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv4099

Modified Files:
      Tag: mason-1-0-branch
	05-request.t 
Log Message:
fix to eliminate ctrl-m characters from file test

Index: 05-request.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/05-request.t,v
retrieving revision 1.5.2.5.2.1
retrieving revision 1.5.2.5.2.2
diff -u -r1.5.2.5.2.1 -r1.5.2.5.2.2
--- 05-request.t	2001/02/21 18:56:30	1.5.2.5.2.1
+++ 05-request.t	2001/03/28 02:26:56	1.5.2.5.2.2
@@ -146,15 +146,18 @@
 		      component => <<'EOF',
 Now I will print myself:
 
-<% $m->file("file") %>
+% my $output = $m->file("file");
+% $output =~ s/\cM//g;
+<% $output %>
 EOF
 		      expect => <<'EOF',
 Now I will print myself:
 
 Now I will print myself:
 
-<% $m->file("file") %>
-
+% my $output = $m->file("file");
+% $output =~ s/\cM//g;
+<% $output %>
 EOF
 		    );
 
@@ -376,7 +379,7 @@
 /shared does not exist.
 
 Output via the out function.
-/request/file outputs 70+ characters.
+/request/file outputs 120+ characters.
 
 No time difference.

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv2521

Modified Files:
      Tag: mason-1-0-branch
	12-taint.t 
Log Message:
skip taint test if alarm not implemented

Index: 12-taint.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/12-taint.t,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- 12-taint.t	2001/03/28 00:34:42	1.1.2.1.2.1
+++ 12-taint.t	2001/03/28 02:12:33	1.1.2.1.2.2
@@ -24,6 +24,13 @@
 
 use HTML::Mason::Parser;
 
+# Clear alarms, and skip test if alarm not implemented
+eval {alarm 0};
+if ($@) {
+    print "1..0\n";
+    exit;
+}
+
 print "1..1\n";
 
 my $parser = HTML::Mason::Parser->new;

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv28056

Modified Files:
      Tag: mason-1-0-branch
	CREDITS Changes 
Log Message:
fixes to Credits, Changes

Index: CREDITS
===================================================================
RCS file: /cvsroot/mason/mason/dist/CREDITS,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.6.2.1
diff -u -r1.17.2.6 -r1.17.2.6.2.1
--- CREDITS	2001/01/05 23:56:14	1.17.2.6
+++ CREDITS	2001/03/28 01:00:10	1.17.2.6.2.1
@@ -75,9 +75,10 @@
 
 John Arnold (John_Arnold@...)
 Oleg Bartunov (oleg@...)
-John BEPPU <beppu@...>
+John Beppu (beppu@...)
+Paolo Campanella (npaolo@...)
 Sean Cazzell (cazzell@...)
-Caleb Crome <ccrome@...>
+Caleb Crome (ccrome@...)
 Joe Edmonds (jedmonds@...)
 Ewan Edwards (eskwayrd@...)
 Pascal Eeftinck (arcade@...)
@@ -98,7 +99,7 @@
 Randal Schwartz (merlyn@...)
 Jeremy Taylor (jtaylor@...)
 Renzo Toma (renzo.toma@...)
-Denis Shaposhnikov <dsh@...>
+Denis Shaposhnikov (dsh@...)
 Lee Semel (lsemel@...)
 Michael Shulman (viritrilbia@...)
 Scott Straley (scott@...)

Index: Changes
===================================================================
RCS file: /cvsroot/mason/mason/dist/Changes,v
retrieving revision 1.54.2.9.2.8
retrieving revision 1.54.2.9.2.9
diff -u -r1.54.2.9.2.8 -r1.54.2.9.2.9
--- Changes	2001/03/28 00:58:19	1.54.2.9.2.8
+++ Changes	2001/03/28 01:00:10	1.54.2.9.2.9
@@ -32,7 +32,7 @@
 - Wrapped each component call in eval, allowing us to simplify the
 request stack code.  No visible user change.
 - Documented that you cannot call return() from a <%shared> or <%once>
-section.  (reported by Paolo Campanella [paolo@...])
+section.  (reported by Paolo Campanella)
 - Fixed documentation of escaped newline behavior.
 - Fixed incorrect code for using mod_perl args method in
 eg/session_handler.pl.

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv27889

Modified Files:
      Tag: mason-1-0-branch
	Changes 
Log Message:
fixed up Changes

Index: Changes
===================================================================
RCS file: /cvsroot/mason/mason/dist/Changes,v
retrieving revision 1.54.2.9.2.7
retrieving revision 1.54.2.9.2.8
diff -u -r1.54.2.9.2.7 -r1.54.2.9.2.8
--- Changes	2001/03/25 00:19:48	1.54.2.9.2.7
+++ Changes	2001/03/28 00:58:19	1.54.2.9.2.8
@@ -5,30 +5,34 @@
 
 ** denotes an incompatible change
 
-1.01
+1.01  Tue Mar 27 16:55:46 PST 2001
 
 - Implemented configuration of Mason from httpd.conf via PerlSetVar
 directives.  This removes the need for a handler.pl file in many
 cases.  L{Admin/CONFIGURING MASON VIA httpd.conf}.
-- Added two new parameters to the Interp object, 'use_autohandlers'
-and 'use_dhandlers'.
-- Added a new parameter to the Interp object, 'die_handler'.  This
-allows you to install your own subroutine as $SIG{__DIE__} to catch
-errors during components execution.  Alternately, you can simply turn
-the special error handling off.  L{Interp/die_handler}
 - Revamped ApacheHandler tests to use a real Apache web server and
 mod_perl (assuming this is installed).  This allows for much better
 testing of Mason.  However, the test suite takes a bit longer to run
 as starting and stopping the server can take a second or two each
 time.
-- Documented that you cannot call return() from a <%shared> or <%once>
-section.  (reported by Paolo Campanella [paolo@...])
 - ** Fixed handling of POST requests with query strings via CGI.pm;
 the query string arguments were previously ignored, and are now merged
 with POST arguments. This is an incompatible change only for those
 whose code relied on the arguments missing.
+- Added basic validation of arguments to Parser, Interp,
+and ApacheHandler constructors.
+- Added interp->die_handler, allowing you to install your own
+subroutine as $SIG{__DIE__} to catch errors during components
+execution.  Alternately, you can simply turn the special error
+handling off.  L{Interp/die_handler}
+- Added interp->use_dhandlers and interp->use_autohandlers, more
+intuitive ways to turn on/off dhandlers and autohandlers.
+- Eliminated interp->verbose_compile_error, which is no longer needed
+and has not worked for some time.
 - Wrapped each component call in eval, allowing us to simplify the
 request stack code.  No visible user change.
+- Documented that you cannot call return() from a <%shared> or <%once>
+section.  (reported by Paolo Campanella [paolo@...])
 - Fixed documentation of escaped newline behavior.
 - Fixed incorrect code for using mod_perl args method in
 eg/session_handler.pl.

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv25686

Modified Files:
      Tag: mason-1-0-branch
	12-taint.t 
Log Message:
explicitly use libs PERL5LIB env var


Index: 12-taint.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/12-taint.t,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -r1.1.2.1 -r1.1.2.1.2.1
--- 12-taint.t	2000/11/22 02:14:36	1.1.2.1
+++ 12-taint.t	2001/03/28 00:34:42	1.1.2.1.2.1
@@ -2,9 +2,26 @@
 
 use strict;
 
-$ENV{PATH} = '';
+BEGIN
+{
+    $ENV{PATH} = '';
+
+    my $libs = 'use lib qw( ';
+    $libs .= join ' ', "./blib/lib", "./t/lib";
+    if ($ENV{PERL5LIB})
+    {
+	$libs .= ' ';
+	$libs .= join ' ', (split /:|;/, $ENV{PERL5LIB});
+    }
+    $libs .= ' );';
 
-use lib 'blib/lib';
+    ($libs) = $libs =~ /(.*)/;
+
+    # explicitly use these because otherwise taint mode causes them to
+    # be ignored
+    eval $libs;
+}
+
 use HTML::Mason::Parser;
 
 print "1..1\n";
@@ -38,3 +55,4 @@
 {
     print "ok 1\n";
 }
+

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv12308

Modified Files:
      Tag: mason-1-0-branch
	makeconfig.pl 
Log Message:
make sure PERL5LIB dirs are seen for tests without a handler.pl


Index: makeconfig.pl
===================================================================
RCS file: /cvsroot/mason/mason/dist/makeconfig.pl,v
retrieving revision 1.7.4.11
retrieving revision 1.7.4.12
diff -u -r1.7.4.11 -r1.7.4.12
--- makeconfig.pl	2001/03/27 22:38:01	1.7.4.11
+++ makeconfig.pl	2001/03/27 22:41:03	1.7.4.12
@@ -240,8 +240,14 @@
     mkdir $APACHE{data_dir}, 0755
 	or die "Can't make dir '$APACHE{comp_root}': $!";
 
+    my $libs = _libs();
+
     my $include .= <<"EOF";
 
+<Perl>
+ $libs
+</Perl>
+
 <IfDefine CGI>
   PerlRequire $APACHE{apache_dir}/mason_handler_CGI.pl
   SetHandler  perl-script
@@ -317,14 +323,7 @@
     open F, ">$handler_file"
 	or die "Can't write to '$handler_file': $!";
 
-    my $cwd = cwd();
-    my $libs = 'use lib qw( ';
-    $libs .= join ' ', "$cwd/blib/lib", "$cwd/t/lib";
-    if ($ENV{PERL5LIB})
-    {
-	$libs .= join ' ', (split /:|;/, $ENV{PERL5LIB});
-    }
-    $libs .= ' );';
+    my $libs = _libs();
 
     print F <<"EOF";
 package HTML::Mason;
@@ -380,6 +379,21 @@
 }
 EOF
     close F;
+}
+
+sub _libs
+{
+    my $cwd = cwd();
+    my $libs = 'use lib qw( ';
+    $libs .= join ' ', "$cwd/blib/lib", "$cwd/t/lib";
+    if ($ENV{PERL5LIB})
+    {
+	$libs .= ' ';
+	$libs .= join ' ', (split /:|;/, $ENV{PERL5LIB});
+    }
+    $libs .= ' );';
+
+    return $libs;
 }
 
 1;

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv11879

Modified Files:
      Tag: mason-1-0-branch
	makeconfig.pl 
Log Message:
make sure lib dirs contaning code to be tested come before user libraries


Index: makeconfig.pl
===================================================================
RCS file: /cvsroot/mason/mason/dist/makeconfig.pl,v
retrieving revision 1.7.4.10
retrieving revision 1.7.4.11
diff -u -r1.7.4.10 -r1.7.4.11
--- makeconfig.pl	2001/03/27 01:01:40	1.7.4.10
+++ makeconfig.pl	2001/03/27 22:38:01	1.7.4.11
@@ -317,13 +317,14 @@
     open F, ">$handler_file"
 	or die "Can't write to '$handler_file': $!";
 
-    my $libs = '';
+    my $cwd = cwd();
+    my $libs = 'use lib qw( ';
+    $libs .= join ' ', "$cwd/blib/lib", "$cwd/t/lib";
     if ($ENV{PERL5LIB})
     {
-	$libs = 'use lib qw( ';
 	$libs .= join ' ', (split /:|;/, $ENV{PERL5LIB});
-	$libs .= ' );';
     }
+    $libs .= ' );';
 
     print F <<"EOF";
 package HTML::Mason;

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv27534

Modified Files:
      Tag: mason-1-0-branch
	Admin.pod 
Log Message:
pluralize


Index: Admin.pod
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Admin.pod,v
retrieving revision 1.35.4.2.2.24
retrieving revision 1.35.4.2.2.25
diff -u -r1.35.4.2.2.24 -r1.35.4.2.2.25
--- Admin.pod	2001/03/27 01:26:26	1.35.4.2.2.24
+++ Admin.pod	2001/03/27 18:47:44	1.35.4.2.2.25
@@ -1298,7 +1298,7 @@
 memory and performance impact. On development servers this shouldn't
 matter; on production servers you may wish to profile the two schemes.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
 Jonathan Swartz, swartz@... and Dave Rolsky, autarch@...

Update of /cvsroot/mason/mason/dist/lib/Bundle/HTML
In directory usw-pr-cvs1:/tmp/cvs-serv15935

Modified Files:
      Tag: mason-1-0-branch
	Mason.pm 
Log Message:
up ver num and add Params::Validate


Index: Mason.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/Bundle/HTML/Mason.pm,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- Mason.pm	2000/02/21 19:54:29	1.7
+++ Mason.pm	2001/03/27 01:52:15	1.7.4.1
@@ -2,7 +2,7 @@
 
 package Bundle::HTML::Mason;
 
-$VERSION = '0.04';
+$VERSION = '0.05';
 
 1;
 
@@ -21,6 +21,8 @@
 Data::Dumper
 
 MLDBM
+
+Params::Validate
 
 HTML::Mason

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv15405

Modified Files:
      Tag: mason-1-0-branch
	Interp.pm 
Log Message:
remove warning accidentally left in from debugging


Index: Interp.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pm,v
retrieving revision 1.60.4.7.2.11
retrieving revision 1.60.4.7.2.12
diff -u -r1.60.4.7.2.11 -r1.60.4.7.2.12
--- Interp.pm	2001/03/27 01:26:26	1.60.4.7.2.11
+++ Interp.pm	2001/03/27 01:49:37	1.60.4.7.2.12
@@ -353,7 +353,6 @@
 	return $code_cache->{$fq_path}->{comp};
     } else {
 	$objfilemod = (defined($objfile) and $objisfile) ? $objstat[9] : 0;
-	warn "OBJMOD: $objfilemod    SRCMOD: $srcmod\n";
 	#
 	# Load the component from source or object file.
 	#

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv15216/lib/HTML/Mason

Modified Files:
      Tag: mason-1-0-branch
	Tests.pm 
Log Message:
remove File::Spec dependency


Index: Tests.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Tests.pm,v
retrieving revision 1.4.2.4.2.3
retrieving revision 1.4.2.4.2.4
diff -u -r1.4.2.4.2.3 -r1.4.2.4.2.4
--- Tests.pm	2001/02/20 21:14:10	1.4.2.4.2.3
+++ Tests.pm	2001/03/27 01:48:24	1.4.2.4.2.4
@@ -5,7 +5,6 @@
 use Cwd;
 
 use File::Path;
-use File::Spec;
 
 use HTML::Mason;
 
@@ -238,12 +237,12 @@
 
     if (ref $proto)
     {
-	$proto->{base_path} ||= File::Spec->catdir( cwd(), 'mason_tests' );
+	$proto->{base_path} ||= join '/',  cwd(), 'mason_tests';
 	return $proto->{base_path};
     }
     else
     {
-	return File::Spec->catdir( cwd(), 'mason_tests' );
+	return join '/', cwd(), 'mason_tests';
     }
 }
 
@@ -251,14 +250,14 @@
 {
     my $proto = shift;
 
-    return File::Spec->catdir( $proto->base_path, 'comps' );
+    return join '/', $proto->base_path, 'comps';
 }
 
 sub data_dir
 {
     my $proto = shift;
 
-    return File::Spec->catdir( $proto->base_path, 'data' );
+    return join '/', $proto->base_path, 'data';
 }
 
 sub _write_shared_comps
@@ -272,7 +271,7 @@
 	my @path = split m(/), $comp->{path};
 	my $file = pop @path;
 
-	my $dir = File::Spec->catdir( $self->comp_root, @path );
+	my $dir = join '/', $self->comp_root, @path;
 
 	$self->write_comp( $comp->{path}, $dir, $file, $comp->{component} );
     }
@@ -293,7 +292,7 @@
 	my @path = split m(/), $supp->{path};
 	my $file = pop @path;
 
-	my $dir = File::Spec->catdir( $self->comp_root, $self->{name}, @path );
+	my $dir = join '/', $self->comp_root, $self->{name}, @path;
 
 	$self->write_comp( $supp->{path}, $dir, $file, $supp->{component} );
     }
@@ -307,7 +306,7 @@
     my @path = split m(/), $test->{path};
     my $file = pop @path;
 
-    my $dir = File::Spec->catdir( $self->comp_root, $self->{name}, @path );
+    my $dir = join '/', $self->comp_root, $self->{name}, @path;
     unless ( -d $dir )
     {
 	print "Making dir: $dir\n" if $DEBUG;
@@ -330,7 +329,7 @@
 	    or die "Unable to create directory '$dir': $!";
     }
 
-    my $real_file = File::Spec->catfile( $dir, $file );
+    my $real_file = join '/', $dir, $file;
 
     print "Making component $path at $real_file\n"
 	if $DEBUG;

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv15216

Modified Files:
      Tag: mason-1-0-branch
	Makefile.PL 
Log Message:
remove File::Spec dependency


Index: Makefile.PL
===================================================================
RCS file: /cvsroot/mason/mason/dist/Makefile.PL,v
retrieving revision 1.12.2.3.2.3
retrieving revision 1.12.2.3.2.4
diff -u -r1.12.2.3.2.3 -r1.12.2.3.2.4
--- Makefile.PL	2001/03/26 22:54:13	1.12.2.3.2.3
+++ Makefile.PL	2001/03/27 01:48:24	1.12.2.3.2.4
@@ -15,11 +15,6 @@
 	. "*** Mason requires version 2.08, or later, of Data::Dumper\n"
 	. "    from CPAN/modules/by-module/Data/Data-Dumper-x.x.tar.gz\n\n";
 
-chk_version(File::Spec => '0.80') or
-    warn  "\n"
-	. "*** Mason requires version 0.80, or later, of File::Spec\n"
-	. "    from CPAN/modules/by-module/Data/File-Spec-x.x.tar.gz\n\n";
-
 chk_version(Params::Validate => '0.02') or
     warn  "\n"
 	. "*** Mason requires version 0.02, or later, of Params::Validate\n"
@@ -36,7 +31,7 @@
 WriteMakefile(
     'NAME'    => 'HTML::Mason',
     'VERSION_FROM' => 'lib/HTML/Mason.pm', # finds $VERSION
-    'PREREQ_PM' => { MLDBM => 2.0, Data::Dumper => 2.08, 'File::Spec' => 0.8, 'Params::Validate' => 0.02 },
+    'PREREQ_PM' => { MLDBM => 2.0, Data::Dumper => 2.08, 'Params::Validate' => 0.02 },
 
     # %APACHE is created when setup_mod_perl_tests() is called.  The
     # code that does this creation is in makeconfig.pl.

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv13209/dist/lib/HTML/Mason

Modified Files:
	Admin.pod Interp.pm Interp.pod 
Log Message:
eliminate verbose_compile_error (merged from branch)

Index: Admin.pod
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Admin.pod,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Admin.pod	2001/03/23 01:09:56	1.41
+++ Admin.pod	2001/03/27 01:28:17	1.42
@@ -249,10 +249,6 @@
 
 Corresponds to the C<use_reload_file> parameter.
 
-=item * MasonVerboseCompileError - boolean
-
-Corresponds to the C<verbose_compile_error> parameter.
-
 =back
 
 =head2 ApacheHandler Parameters

Index: Interp.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pm,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Interp.pm	2001/03/18 05:19:59	1.67
+++ Interp.pm	2001/03/27 01:28:17	1.68
@@ -39,8 +39,7 @@
 			  resolver
 			  static_file_root
 			  use_object_files
-			  use_reload_file
-			  verbose_compile_error ) ],
+			  use_reload_file ) ],
       );
 
 # Fields that can be set in new method, with defaults
@@ -65,8 +64,7 @@
      resolver => undef,     
      static_file_root => undef,
      use_object_files => 1,
-     use_reload_file => 0,
-     verbose_compile_error => 0
+     use_reload_file => 0
      );
 
 sub new

Index: Interp.pod
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pod,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Interp.pod	2001/03/23 01:15:56	1.28
+++ Interp.pod	2001/03/27 01:28:17	1.29
@@ -197,12 +197,6 @@
 timestamp checking on component source files, relying instead on an
 explicitly updated L<Admin/reload file>.
 
-=item verbose_compile_error
-
-True or undef, default is undef. If true, component compile errors are
-followed with the full component source, annotated with line numbers,
-to better interpret the error message. Does not affect runtime errors.
-
 =back
 
 =head1 ACCESSOR METHODS

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv13082/lib/HTML/Mason

Modified Files:
      Tag: mason-1-0-branch
	Admin.pod ApacheHandler.pm Interp.pm Interp.pod 
Log Message:
eliminate verbose_compile_error, which hasn't worked for a little while and is no longer needed

Index: Admin.pod
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Admin.pod,v
retrieving revision 1.35.4.2.2.23
retrieving revision 1.35.4.2.2.24
diff -u -r1.35.4.2.2.23 -r1.35.4.2.2.24
--- Admin.pod	2001/03/23 21:43:44	1.35.4.2.2.23
+++ Admin.pod	2001/03/27 01:26:26	1.35.4.2.2.24
@@ -271,10 +271,6 @@
 
 Corresponds to the C<use_reload_file> parameter.
 
-=item * MasonVerboseCompileError - boolean
-
-Corresponds to the C<verbose_compile_error> parameter.
-
 =back
 
 =head2 ApacheHandler Parameters

Index: ApacheHandler.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/ApacheHandler.pm,v
retrieving revision 1.68.4.11.2.11
retrieving revision 1.68.4.11.2.12
diff -u -r1.68.4.11.2.11 -r1.68.4.11.2.12
--- ApacheHandler.pm	2001/03/26 19:06:12	1.68.4.11.2.11
+++ ApacheHandler.pm	2001/03/27 01:26:26	1.68.4.11.2.12
@@ -233,7 +233,6 @@
     $p{use_dhandlers}         = _get_boolean_param('UseDhandlers');
     $p{use_object_files}      = _get_boolean_param('UseObjectFiles');
     $p{use_reload_file}       = _get_boolean_param('UseReloadFile');
-    $p{verbose_compile_error} = _get_boolean_param('VerboseCompileError');
 
     my @comp_root = _get_list_param('CompRoot', 1);
     if (@comp_root == 1)

Index: Interp.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pm,v
retrieving revision 1.60.4.7.2.10
retrieving revision 1.60.4.7.2.11
diff -u -r1.60.4.7.2.10 -r1.60.4.7.2.11
--- Interp.pm	2001/03/26 22:50:14	1.60.4.7.2.10
+++ Interp.pm	2001/03/27 01:26:26	1.60.4.7.2.11
@@ -41,8 +41,7 @@
 			  static_file_root
 			  use_data_cache
 			  use_object_files
-			  use_reload_file
-			  verbose_compile_error ) ],
+			  use_reload_file ) ],
       );
 
 # Fields that can be set in new method, with defaults
@@ -70,8 +69,7 @@
      use_data_cache => 1,
      use_dhandlers => 1,
      use_object_files => 1,
-     use_reload_file => 0,
-     verbose_compile_error => 0
+     use_reload_file => 0
      );
 
 sub new
@@ -113,7 +111,6 @@
 		use_dhandlers => { type => SCALAR | UNDEF, optional => 1 },
 		use_object_files => { type => SCALAR | UNDEF, optional => 1 },
 		use_reload_file => { type => SCALAR | UNDEF, optional => 1 },
-		verbose_compile_error => { type => SCALAR | UNDEF, optional => 1 },
 
 		comp_root => { type => SCALAR | ARRAYREF },
 		data_dir => { type => SCALAR },
@@ -417,16 +414,6 @@
     my ($self, $filename, $err) = @_;
 
     my $msg = sprintf("Error during compilation of %s:\n%s\n",$filename, $err);
-
-    if ($self->verbose_compile_error) {
-	my $comp = read_file($filename);
-	my $x = 1;
-	my @lines = split /\n/, $comp;
-	my $max = length (scalar @lines);
-	$msg .= join "\n", map { sprintf("%-${max}s: %s", $x++, $_) } @lines;
-	$msg .= "\n";
-    }
-
     die $msg;
 }
 

Index: Interp.pod
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pod,v
retrieving revision 1.23.4.5.2.4
retrieving revision 1.23.4.5.2.5
diff -u -r1.23.4.5.2.4 -r1.23.4.5.2.5
--- Interp.pod	2001/03/23 21:43:44	1.23.4.5.2.4
+++ Interp.pod	2001/03/27 01:26:26	1.23.4.5.2.5
@@ -207,12 +207,6 @@
 timestamp checking on component source files, relying instead on an
 explicitly updated L<Admin/reload file>.
 
-=item verbose_compile_error
-
-True or undef, default is undef. If true, component compile errors are
-followed with the full component source, annotated with line numbers,
-to better interpret the error message. Does not affect runtime errors.
-
 =back
 
 =head1 ACCESSOR METHODS

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv10595/t

Modified Files:
      Tag: mason-1-0-branch
	08-ah.t 
Log Message:
no, I really meant to remove that stuff


Index: 08-ah.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/08-ah.t,v
retrieving revision 1.15.2.6.2.11
retrieving revision 1.15.2.6.2.12
diff -u -r1.15.2.6.2.11 -r1.15.2.6.2.12
--- 08-ah.t	2001/03/27 01:01:40	1.15.2.6.2.11
+++ 08-ah.t	2001/03/27 01:04:06	1.15.2.6.2.12
@@ -43,7 +43,7 @@
     my $both_no_handler_tests = 8;
     my $cgi_only_no_handler_tests = 2;
     my $apr_only_no_handler_tests = 2;
-    my $multi_conf_tests = 5;
+    my $multi_conf_tests = 4;
 
     my $total = $both_tests + $both_no_handler_tests;
     $total += $cgi_only_tests + $cgi_only_no_handler_tests;
@@ -198,11 +198,6 @@
 Shouldn't ever run
 EOF
 	      );
-
-    write_comp( 'multiconf3/use_reload_file', <<'EOF',
-use_reload_file is <% $m->interp->use_reload_file %>
-EOF
-	      );
 }
 
 sub write_comp
@@ -547,17 +542,6 @@
     $actual = filter_response($response, 0);
     ok( $actual =~ /404 not found/i,
 	"Attempt to request a non-existent component should not work with dhandlers turned off" );
-
-    $response = Apache::test->fetch('/comps/multiconf3/use_reload_file');
-    $actual = filter_response($response, 0);
-    $success = HTML::Mason::Tests->check_output( actual => $actual,
-						 expect => <<'EOF',
-X-Mason-Test: Initial value
-use_reload_file is 1
-Status code: 0
-EOF
-					       );
-    ok($success);
 
     kill_httpd(1);
 }

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv10193/t

Modified Files:
      Tag: mason-1-0-branch
	08-ah.t 
Log Message:
remove verbose_compile_error test.  no replacement because making this work with use_reload_file was too annoying.  My personal testing with verbose_compile_error tells me that boolean httpd.conf params _are_ working


Index: 08-ah.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/08-ah.t,v
retrieving revision 1.15.2.6.2.10
retrieving revision 1.15.2.6.2.11
diff -u -r1.15.2.6.2.10 -r1.15.2.6.2.11
--- 08-ah.t	2001/03/26 22:53:41	1.15.2.6.2.10
+++ 08-ah.t	2001/03/27 01:01:40	1.15.2.6.2.11
@@ -199,8 +199,8 @@
 EOF
 	      );
 
-    write_comp( 'multiconf3/compile_error', <<'EOF',
-<% if { %>
+    write_comp( 'multiconf3/use_reload_file', <<'EOF',
+use_reload_file is <% $m->interp->use_reload_file %>
 EOF
 	      );
 }
@@ -548,10 +548,16 @@
     ok( $actual =~ /404 not found/i,
 	"Attempt to request a non-existent component should not work with dhandlers turned off" );
 
-    $response = Apache::test->fetch('/comps/multiconf3/compile_error');
+    $response = Apache::test->fetch('/comps/multiconf3/use_reload_file');
     $actual = filter_response($response, 0);
-    ok( $actual =~ /1: &lt;% if { %&gt;/,
-	"A compile error occurred but the component file's source wasn't shown" );
+    $success = HTML::Mason::Tests->check_output( actual => $actual,
+						 expect => <<'EOF',
+X-Mason-Test: Initial value
+use_reload_file is 1
+Status code: 0
+EOF
+					       );
+    ok($success);
 
     kill_httpd(1);
 }

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv10193

Modified Files:
      Tag: mason-1-0-branch
	makeconfig.pl 
Log Message:
remove verbose_compile_error test.  no replacement because making this work with use_reload_file was too annoying.  My personal testing with verbose_compile_error tells me that boolean httpd.conf params _are_ working


Index: makeconfig.pl
===================================================================
RCS file: /cvsroot/mason/mason/dist/makeconfig.pl,v
retrieving revision 1.7.4.9
retrieving revision 1.7.4.10
diff -u -r1.7.4.9 -r1.7.4.10
--- makeconfig.pl	2001/03/26 22:53:41	1.7.4.9
+++ makeconfig.pl	2001/03/27 01:01:40	1.7.4.10
@@ -297,15 +297,6 @@
     PerlHandler HTML::Mason::ApacheHandler
   </Location>
 
-  <Location /comps/multiconf3>
-    PerlSetVar  MasonCompRoot "$APACHE{comp_root}/multiconf3"
-    PerlSetVar  MasonDataDir  "$APACHE{data_dir}/multiconf3"
-    PerlSetVar  MasonVerboseCompileError 1
-    SetHandler  perl-script
-    PerlModule  HTML::Mason::ApacheHandler
-    PerlHandler HTML::Mason::ApacheHandler
-  </Location>
-
 </IfDefine>
 
 EOF

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv27514

Modified Files:
      Tag: mason-1-0-branch
	Makefile.PL 
Log Message:
tidy up comments


Index: Makefile.PL
===================================================================
RCS file: /cvsroot/mason/mason/dist/Makefile.PL,v
retrieving revision 1.12.2.3.2.2
retrieving revision 1.12.2.3.2.3
diff -u -r1.12.2.3.2.2 -r1.12.2.3.2.3
--- Makefile.PL	2001/03/06 23:57:51	1.12.2.3.2.2
+++ Makefile.PL	2001/03/26 22:54:13	1.12.2.3.2.3
@@ -55,9 +55,11 @@
 
     $test =~ s/(runtests \@ARGV;)/\$\$ENV{MASON_VERBOSE}=\$(TEST_VERBOSE); $1/;
 
-    # %APACHE & $APACHE{apache_dir} are globals set in makeconfig.pl.
+    # %APACHE is set in makeconfig.pl.
     # If we are not going to test with Apache there is no harm in
     # setting this anyway.
+
+    # The PORT env var is used by Apache::test.  Don't delete it!
     my $port = $APACHE{port} || 8228;
     $APACHE{apache_dir} ||= '';
     $test =~ s/(runtests \@ARGV;)/\$\$ENV{MASON_VERBOSE}=\$(TEST_VERBOSE); \$\$ENV{PORT}=$port; \$\$ENV{APACHE_DIR}=q^$APACHE{apache_dir}^; $1/;

Update of /cvsroot/mason/mason/dist
In directory usw-pr-cvs1:/tmp/cvs-serv27343

Modified Files:
      Tag: mason-1-0-branch
	makeconfig.pl 
Log Message:
implement verbose_compile_error test (also tests boolean httpd.conf options work with 1/0)


Index: makeconfig.pl
===================================================================
RCS file: /cvsroot/mason/mason/dist/makeconfig.pl,v
retrieving revision 1.7.4.8
retrieving revision 1.7.4.9
diff -u -r1.7.4.8 -r1.7.4.9
--- makeconfig.pl	2001/03/23 21:44:19	1.7.4.8
+++ makeconfig.pl	2001/03/26 22:53:41	1.7.4.9
@@ -296,6 +296,16 @@
     PerlModule  HTML::Mason::ApacheHandler
     PerlHandler HTML::Mason::ApacheHandler
   </Location>
+
+  <Location /comps/multiconf3>
+    PerlSetVar  MasonCompRoot "$APACHE{comp_root}/multiconf3"
+    PerlSetVar  MasonDataDir  "$APACHE{data_dir}/multiconf3"
+    PerlSetVar  MasonVerboseCompileError 1
+    SetHandler  perl-script
+    PerlModule  HTML::Mason::ApacheHandler
+    PerlHandler HTML::Mason::ApacheHandler
+  </Location>
+
 </IfDefine>
 
 EOF

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv27343/t

Modified Files:
      Tag: mason-1-0-branch
	08-ah.t 
Log Message:
implement verbose_compile_error test (also tests boolean httpd.conf options work with 1/0)


Index: 08-ah.t
===================================================================
RCS file: /cvsroot/mason/mason/dist/t/08-ah.t,v
retrieving revision 1.15.2.6.2.9
retrieving revision 1.15.2.6.2.10
diff -u -r1.15.2.6.2.9 -r1.15.2.6.2.10
--- 08-ah.t	2001/03/23 21:44:19	1.15.2.6.2.9
+++ 08-ah.t	2001/03/26 22:53:41	1.15.2.6.2.10
@@ -43,7 +43,7 @@
     my $both_no_handler_tests = 8;
     my $cgi_only_no_handler_tests = 2;
     my $apr_only_no_handler_tests = 2;
-    my $multi_conf_tests = 4;
+    my $multi_conf_tests = 5;
 
     my $total = $both_tests + $both_no_handler_tests;
     $total += $cgi_only_tests + $cgi_only_no_handler_tests;
@@ -198,6 +198,11 @@
 Shouldn't ever run
 EOF
 	      );
+
+    write_comp( 'multiconf3/compile_error', <<'EOF',
+<% if { %>
+EOF
+	      );
 }
 
 sub write_comp
@@ -542,6 +547,11 @@
     $actual = filter_response($response, 0);
     ok( $actual =~ /404 not found/i,
 	"Attempt to request a non-existent component should not work with dhandlers turned off" );
+
+    $response = Apache::test->fetch('/comps/multiconf3/compile_error');
+    $actual = filter_response($response, 0);
+    ok( $actual =~ /1: &lt;% if { %&gt;/,
+	"A compile error occurred but the component file's source wasn't shown" );
 
     kill_httpd(1);
 }

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv26787

Modified Files:
      Tag: mason-1-0-branch
	Interp.pm 
Log Message:
implement verbose compilation error param


Index: Interp.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pm,v
retrieving revision 1.60.4.7.2.9
retrieving revision 1.60.4.7.2.10
diff -u -r1.60.4.7.2.9 -r1.60.4.7.2.10
--- Interp.pm	2001/03/26 19:06:25	1.60.4.7.2.9
+++ Interp.pm	2001/03/26 22:50:14	1.60.4.7.2.10
@@ -10,7 +10,7 @@
 use File::Path;
 use File::Basename;
 use HTML::Mason::Parser;
-use HTML::Mason::Tools qw(is_absolute_path);
+use HTML::Mason::Tools qw(is_absolute_path read_file);
 use HTML::Mason::Commands qw();
 use HTML::Mason::Config;
 use HTML::Mason::Resolver::File;
@@ -323,7 +323,7 @@
 	
 	$self->write_system_log('COMP_LOAD', $fq_path);	# log the load event
 	my $comp = $self->{parser}->eval_object_text(object_file=>$objfile, error=>\$err)
-	    or die "Error while loading '$objfile' at runtime:\n$err\n";
+	    or $self->_compilation_error($objfile, $err);
 	$comp->assign_runtime_properties($self,$fq_path);
 	
 	$code_cache->{$fq_path}->{comp} = $comp;
@@ -356,7 +356,7 @@
 	return $code_cache->{$fq_path}->{comp};
     } else {
 	$objfilemod = (defined($objfile) and $objisfile) ? $objstat[9] : 0;
-	
+	warn "OBJMOD: $objfilemod    SRCMOD: $srcmod\n";
 	#
 	# Load the component from source or object file.
 	#
@@ -374,7 +374,7 @@
 		my @newfiles;
 		my @params = $resolver->get_source_params(@lookup_info);
 		my $objText = $parser->parse_component(@params,error=>\$err)
-		    or die sprintf("Error during compilation of %s:\n%s\n",$resolver->get_source_description(@lookup_info),$err);
+		    or $self->_compilation_error( $resolver->get_source_description(@lookup_info),$err );
 		$parser->write_object_file(object_text=>$objText, object_file=>$objfile);
 	    }
 	    $comp = $parser->eval_object_text(object_file=>$objfile, error=>\$err);
@@ -385,7 +385,7 @@
 		    $objfilemod = 0;
 		    goto update_object;
 		} else {
-		    die "Error while loading '$objfile' at runtime:\n$err\n";
+		    $self->_compilation_error( $resolver->get_source_description(@lookup_info),$err );
 		}
 	    }
 	} else {
@@ -394,7 +394,7 @@
 	    #
 	    my @params = $resolver->get_source_params(@lookup_info);
 	    $comp = $self->parser->make_component(@params,error=>\$err)
-		or die sprintf("Error during compilation of %s:\n%s\n",$resolver->get_source_description(@lookup_info),$err);
+		or $self->_compilation_error( $resolver->get_source_description(@lookup_info),$err );
 	}
 	$comp->assign_runtime_properties($self,$fq_path);
 
@@ -411,6 +411,23 @@
 	}
 	return $comp;
     }
+}
+
+sub _compilation_error {
+    my ($self, $filename, $err) = @_;
+
+    my $msg = sprintf("Error during compilation of %s:\n%s\n",$filename, $err);
+
+    if ($self->verbose_compile_error) {
+	my $comp = read_file($filename);
+	my $x = 1;
+	my @lines = split /\n/, $comp;
+	my $max = length (scalar @lines);
+	$msg .= join "\n", map { sprintf("%-${max}s: %s", $x++, $_) } @lines;
+	$msg .= "\n";
+    }
+
+    die $msg;
 }
 
 #

Update of /cvsroot/mason/mason/dist/t
In directory usw-pr-cvs1:/tmp/cvs-serv11273

Removed Files:
      Tag: mason-1-0-branch
	test-common.pl 
Log Message:
no longer used

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv15313

Modified Files:
      Tag: mason-1-0-branch
	Interp.pm 
Log Message:
do some minimal validation for out_mode param


Index: Interp.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/Interp.pm,v
retrieving revision 1.60.4.7.2.8
retrieving revision 1.60.4.7.2.9
diff -u -r1.60.4.7.2.8 -r1.60.4.7.2.9
--- Interp.pm	2001/03/23 21:43:44	1.60.4.7.2.8
+++ Interp.pm	2001/03/26 19:06:25	1.60.4.7.2.9
@@ -121,6 +121,10 @@
 	    );
 
     my (%options) = @_;
+
+    die "out_mode parameter must be either 'batch' or 'stream'\n"
+	if defined $options{out_mode} && $options{out_mode} ne 'batch' && $options{out_mode} ne 'stream';
+
     while (my ($key,$value) = each(%options)) {
 	next if $key =~ /out_method|system_log_events/;
 	$self->{$key} = $value;

Update of /cvsroot/mason/mason/dist/lib/HTML/Mason
In directory usw-pr-cvs1:/tmp/cvs-serv15140

Modified Files:
      Tag: mason-1-0-branch
	ApacheHandler.pm 
Log Message:
don't do option validation in httpd.conf reading
don't allow On/Off for boolean params


Index: ApacheHandler.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/lib/HTML/Mason/ApacheHandler.pm,v
retrieving revision 1.68.4.11.2.10
retrieving revision 1.68.4.11.2.11
diff -u -r1.68.4.11.2.10 -r1.68.4.11.2.11
--- ApacheHandler.pm	2001/03/23 21:43:44	1.68.4.11.2.10
+++ ApacheHandler.pm	2001/03/26 19:06:12	1.68.4.11.2.11
@@ -193,11 +193,7 @@
     $p{debug_handler_script} = _get_string_param('DebugHandlerScript');
     $p{debug_mode} = _get_string_param('DebugMode');
     $p{debug_perl_binary} = _get_string_param('DebugPerlBinary');
-
     $p{error_mode} = _get_string_param('ErrorMode');
-    die "Configuration parameter MasonErrorMode must be either 'batch' or 'stream'\n"
-	if defined $p{out_mode} && $p{out_mode} ne 'html' && $p{out_mode} ne 'fatal';
-
     $p{top_level_predicate} = _get_code_param('TopLevelPredicate');
 
     foreach (keys %p)
@@ -225,11 +221,7 @@
     $p{die_handler}         = _get_code_param('DieHandler');
     $p{max_recurse}         = _get_string_param('MaxRecurse');
     $p{out_method}          = _get_code_param('OutMethod');
-
     $p{out_mode}            = _get_string_param('OutMode');
-    die "Configuration parameter MasonOutMode must be either 'batch' or 'stream'\n"
-	if defined $p{out_mode} && $p{out_mode} ne 'batch' && $p{out_mode} ne 'stream';
-
     $p{preloads}              = [ _get_list_param('Preloads') ];
     delete $p{preloads} unless @{ $p{preloads} };
     $p{static_file_root}      = _get_string_param('StaticFileRoot');
@@ -315,18 +307,8 @@
 sub _get_boolean_param
 {
     my ($p, $val) = _get_val(@_[0, 1]);
-
-    return undef unless defined $val;
-
-    $val = lc $val;
 
-    if ($val)
-    {
-	die "Configuration parameter '$p' must be either 'On' or 'Off'\n"
-	    unless $val eq 'on' || $val eq 'off';
-    }
-
-    return $val eq 'on' ? 1 : 0;
+    return $val;
 }
 
 sub _get_code_param
@@ -398,6 +380,9 @@
 	    );
 
     my (%options) = @_;
+
+    die "error_mode parameter must be either 'html' or 'fatal'\n"
+	if exists $options{error_mode} && $options{error_mode} ne 'html' && $options{error_mode} ne 'fatal';
 
     while (my ($key,$value) = each(%options)) {
 	$self->{$key} = $value;