richter at locus
Mar 28, 2000, 9:47 PM
Post #1 of 1
(325 views)
Permalink
|
|
cvs commit: embperl/emacs embperl.el
|
|
richter 00/03/28 20:47:08
Modified: . Changes.pod Embperl.pm EmbperlObject.pm Makefile.PL
TODO test.pl
Embperl Mail.pm Module.pm
emacs embperl.el
Log:
- Makefile.PL warns if you build with a DSO mod_perl < 1.22
- make test checks that test files are readable by Apache.
- now all tests pass with perl 5.6
Revision Changes Path
1.106 +2 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- Changes.pod 2000/03/28 19:14:07 1.105
+++ Changes.pod 2000/03/29 04:47:06 1.106
@@ -16,7 +16,8 @@
Apache 1.3.12
- The outputfile parameter now also works when running under
mod_perl. Spotted by Ilia Lobsanov.
-
+ - Makefile.PL warns if you build with a DSO mod_perl < 1.22
+ - make test checks that test files are readable by Apache.
=head1 1.3b2 (BETA) 11. Feb 2000
1.92 +1 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Embperl.pm 2000/03/28 19:46:03 1.91
+++ Embperl.pm 2000/03/29 04:47:06 1.92
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.91 2000/03/28 19:46:03 richter Exp $
+# $Id: Embperl.pm,v 1.92 2000/03/29 04:47:06 richter Exp $
#
###################################################################################
@@ -1229,7 +1229,7 @@
$seen{$package} = 1 ;
$packfile = GVFile (*{"$package\::__ANON__"}) ;
- $packfile = '-> No Perl in Source <-' if ($packfile eq ('_<' . __FILE__)) ;
+ $packfile = '-> No Perl in Source <-' if ($packfile eq ('_<' . __FILE__) || $packfile eq __FILE__) ;
$addcleanup = \%{"$package\:\:CLEANUP"} ;
$addcleanup -> {'CLEANUP'} = 0 ;
if ($Debugflags & dbgShowCleanup)
1.16 +0 -0 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- EmbperlObject.pm 2000/03/28 19:46:04 1.15
+++ EmbperlObject.pm 2000/03/29 04:47:06 1.16
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlObject.pm,v 1.15 2000/03/28 19:46:04 richter Exp $
+# $Id: EmbperlObject.pm,v 1.16 2000/03/29 04:47:06 richter Exp $
#
###################################################################################
1.23 +9 -2 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.PL 1999/11/03 07:53:30 1.22
+++ Makefile.PL 2000/03/29 04:47:06 1.23
@@ -614,14 +614,16 @@
+ $use_dso = 0 ;
#if (!$win32 && -e "$apache_src/modules/perl/libperl.so" && !grep (/mod_perl.c/, @modules))
if (!$win32 && ($EPMODPERL =~ /perl_module/))
{
#$EPMODPERL="LoadModule perl_module $apache_src/modules/perl/libperl.so" ;
- $EPSTARTUP ='startup_dso.pl' ;
+ #$EPSTARTUP ='startup_dso.pl' ;
print " + mod_perl was build with USE_DSO\n" ;
$dynlib->{'OTHERLDFLAGS'} = "-bI:mod_perl.exp -bI:$apache_src/support/httpd.exp" if ($aix);
- }
+ $use_dso = 1 ;
+ }
if ($EPSTRONGHOLD)
@@ -683,6 +685,11 @@
if ($win32 && $MPVer lt "1.12")
{
print "-> Please upgrade to an higher version of mod_perl on Win32\n" ;
+ }
+ if ($use_dso && $MPVer lt "1.22")
+ {
+ print "-> You MUST upgrade to mod_perl 1.22 or higher when mod_perl is build with USE_DSO!!\n" ;
+ $EPSTARTUP ='startup_dso.pl' ;
}
}
1.89 +0 -6 embperl/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/embperl/TODO,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- TODO 2000/03/28 19:14:08 1.88
+++ TODO 2000/03/29 04:47:06 1.89
@@ -33,8 +33,6 @@
- return value from sub
-- build with perl > 5.005_61
-
- remove \n in perl code? when and how?
- url/html escaping [Eugene B. Byrganov 4.11.99]
@@ -71,8 +69,6 @@
----
- test FORBIDDEN
-- check permissions of test/html
-
Bugs
----
- Embperl version number [Eric CHOLET]
@@ -106,8 +102,6 @@
Docs
----
- [- -] [+ +] etc all turns into _perl_code_ in html [S Page 13.9.99]
-
-- maxrwo, maxcol [Ed Geenberg, Cliff Raymann 20.12.99]
- File::Spec for EmbperlObject
1.56 +16 -4 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- test.pl 2000/03/28 19:46:04 1.55
+++ test.pl 2000/03/29 04:47:06 1.56
@@ -22,8 +22,8 @@
'errdoc/errdoc.htm???8?262144',
'rawinput/rawinput.htm????16',
'var.htm',
-# 'varerr.htm???-1',
-# 'varerr.htm???2',
+ 'varerr.htm???-1',
+ 'varerr.htm???2',
'escape.htm',
'spaces.htm',
'tagscan.htm',
@@ -668,7 +668,7 @@
next if ($file =~ /sess\.htm/) ;
next if ($DProf && ($file =~ /safe/)) ;
next if ($DProf && ($file =~ /opmask/)) ;
- #$errcnt = 12 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
+ $errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
$debug ||= $defaultdebug ;
$page = "$inpath/$file" ;
@@ -716,6 +716,7 @@
{
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
+ $org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
$err = CmpFiles ($outfile, $org, $errin) ;
}
@@ -986,7 +987,9 @@
close ERR ;
open (ERR, "$httpderr") ;
<ERR> ; # skip first line
- }
+
+ $httpduid = getpwnam ($EPUSER) if (!$EPWIN32) ;
+ }
elsif ($err == 0 && $EPHTTPD eq '')
{
print "\n\nSkiping tests for mod_perl, because Embperl is not build for it.\n" ;
@@ -1025,6 +1028,7 @@
#next if ($file eq 'notallow.xhtm' && $loc eq $cgiloc && $EPWIN32) ;
next if ($file =~ /opmask/ && $EPSTARTUP =~ /_dso/) ;
next if ($file eq 'clearsess.htm' && !$looptest) ;
+ $errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
if ($file =~ /sess\.htm/)
{
next if ($loc eq $cgiloc && $EPSESSIONCLASS ne 'Embperl') ;
@@ -1070,6 +1074,13 @@
$content = "Hi there!" ;
}
+ if (!$EPWIN32 && $loc eq $embploc && $file ne 'notfound.htm')
+ {
+ print "ERROR: Missing read permission for file $inpath/$file\n" if (!-r "$inpath/$file") ;
+ local $> = $httpduid ;
+ print "ERROR: $inpath/$file must be readable by $EPUSER (uid=$httpduid)\n" if (!-r "$inpath/$file") ;
+ }
+
$n_req++ ;
$t1 = HTML::Embperl::Clock () ;
$m = REQ ($loc, $file, $query_info, $outfile, $content, $upload) ;
@@ -1099,6 +1110,7 @@
{
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
+ $org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
#print "Compare $page with $org\n" ;
$err = CmpFiles ($outfile, $org) ;
1.15 +0 -0 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Mail.pm 2000/03/28 19:46:05 1.14
+++ Mail.pm 2000/03/29 04:47:07 1.15
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.14 2000/03/28 19:46:05 richter Exp $
+# $Id: Mail.pm,v 1.15 2000/03/29 04:47:07 richter Exp $
#
###################################################################################
1.16 +0 -0 embperl/Embperl/Module.pm
Index: Module.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Module.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Module.pm 2000/03/28 19:46:05 1.15
+++ Module.pm 2000/03/29 04:47:07 1.16
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Module.pm,v 1.15 2000/03/28 19:46:05 richter Exp $
+# $Id: Module.pm,v 1.16 2000/03/29 04:47:07 richter Exp $
#
###################################################################################
@@ -25,7 +25,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Module.pm,v 1.15 2000/03/28 19:46:05 richter Exp $
+# $Id: Module.pm,v 1.16 2000/03/29 04:47:07 richter Exp $
#
###################################################################################
1.84 +0 -0 embperl/emacs/embperl.el
Index: embperl.el
===================================================================
RCS file: /home/cvs/embperl/emacs/embperl.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- embperl.el 2000/03/28 19:46:06 1.83
+++ embperl.el 2000/03/29 04:47:08 1.84
@@ -19,9 +19,9 @@
;; Author : Erik Arneson (erik [at] mind)
;; Created On : Wed Jul 22 17:16:39 PDT 1998
;; Last Modified By: Erik Arneson
-;; Last Modified On: $Date: 2000/03/28 19:46:06 $
+;; Last Modified On: $Date: 2000/03/29 04:47:08 $
;; Version : 1.00
-;; $Id: embperl.el,v 1.83 2000/03/28 19:46:06 richter Exp $
+;; $Id: embperl.el,v 1.84 2000/03/29 04:47:08 richter Exp $
;;
;; Please note that this software is very beta and rather broken. I
;; don't know how useful it will be, although I definitely plan on
|
