richter 00/04/17 14:03:19
Modified: . Changes.pod Embperl.pm EmbperlObject.pm MANIFEST
Makefile.PL ep.h epnames.h test.pl
Embperl Mail.pm Module.pm
emacs embperl.el
test/cmp escape.htm
test/conf httpd.conf.src
Added: test/cmp epopage1.htm epopage2.htm
test/html/EmbperlObject epobase.htm epofoot.htm epohead.htm
epopage1.htm
test/html/EmbperlObject/sub epohead.htm epopage2.htm
Log:
- Rearrange Patch from Randy Kobes that makes Embperl compile with
Apache 1.3.12 and Perl 5.6 on Win32.
- Removed some -w warnings form EmbperlObject
- Added tests for EmbperlObject
Revision Changes Path
1.111 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- Changes.pod 2000/04/17 03:26:56 1.110
+++ Changes.pod 2000/04/17 21:03:15 1.111
@@ -33,6 +33,9 @@
"Powered by Embperl".
- Added Patch from Randy Kobes that makes Embperl compile with
Apache 1.3.12 and Perl 5.6 on Win32.
+ - Removed some -w warnings form EmbperlObject
+ - Added tests for EmbperlObject
+
=head1 1.3b2 (BETA) 11. Feb 2000
1.98 +0 -0 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Embperl.pm 2000/04/17 03:26:56 1.97
+++ Embperl.pm 2000/04/17 21:03:15 1.98
@@ -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.97 2000/04/17 03:26:56 richter Exp $
+# $Id: Embperl.pm,v 1.98 2000/04/17 21:03:15 richter Exp $
#
###################################################################################
1.22 +4 -2 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- EmbperlObject.pm 2000/04/17 03:26:56 1.21
+++ EmbperlObject.pm 2000/04/17 21:03:15 1.22
@@ -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.21 2000/04/17 03:26:56 richter Exp $
+# $Id: EmbperlObject.pm,v 1.22 2000/04/17 21:03:15 richter Exp $
#
###################################################################################
@@ -55,6 +55,8 @@
sub norm_path
{
+ return '' if (!$_[0]) ;
+
my $path = File::Spec -> canonpath (shift) ;
$path =~ s/\\/\//g ;
$path = $1 if ($path =~ /^\s*(.*?)\s*$/) ;
@@ -97,8 +99,8 @@
my $basename = $ENV{EMBPERL_OBJECT_BASE} ;
$basename =~ s/%modifier%/$mod/ ;
- my $addpath = $ENV{EMBPERL_OBJECT_ADDPATH} ;
- my @addpath = split /:/, $addpath ;
+ my $addpath = $ENV{EMBPERL_OBJECT_ADDPATH} ;
+ my @addpath = $addpath?split (/:/, $addpath):() ;
my $directory ;
my $rootdir = norm_path ($r -> document_root) ;
my $stopdir = norm_path ($ENV{EMBPERL_OBJECT_STOPDIR}) ;
1.39 +8 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- MANIFEST 2000/04/14 12:27:41 1.38
+++ MANIFEST 2000/04/17 21:03:15 1.39
@@ -130,6 +130,12 @@
test/html/mdatsess.htm
test/html/execgetsess.htm
test/html/clearsess.htm
+test/html/EmbperlObject/epobase.htm
+test/html/EmbperlObject/epohead.htm
+test/html/EmbperlObject/epofoot.htm
+test/html/EmbperlObject/epopage1.htm
+test/html/EmbperlObject/sub/epohead.htm
+test/html/EmbperlObject/sub/epopage2.htm
test/cmp/ascii
test/cmp/pure.htm
test/cmp/plain.htm
@@ -197,6 +203,8 @@
test/cmp/execgetsess.htm
test/cmp/errdoc.htm
test/cmp/clearsess.htm
+test/cmp/epopage1.htm
+test/cmp/epopage2.htm
test/conf/httpd.conf.src
test/conf/startup.pl
test/conf/startup_dso.pl
1.27 +1 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.PL 2000/04/17 03:26:56 1.26
+++ Makefile.PL 2000/04/17 21:03:15 1.27
@@ -782,7 +782,7 @@
close FH ;
}
-$d .= ' -DPERL_IS_5_6 ' if $] >= 5.006;
+# $d .= ' -DPERL_IS_5_6 ' if $] >= 5.006;
if ($win32)
{ # Check for winsock2api
1.22 +0 -122 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ep.h 2000/04/17 03:26:56 1.21
+++ ep.h 2000/04/17 21:03:15 1.22
@@ -61,68 +61,7 @@
#undef FALSE
#endif
-#ifdef WIN32
-#ifdef uid_t
-#define apache_uid_t uid_t
-#undef uid_t
-#endif
-#define uid_t apache_uid_t
-
-#ifdef gid_t
-#define apache_gid_t gid_t
-#undef gid_t
-#endif
-#define gid_t apache_gid_t
-
-#ifdef mode_t
-#define apache_mode_t mode_t
-#undef mode_t
-#endif
-#define mode_t apache_mode_t
-
-#ifdef stat
-#define apache_stat stat
-#undef stat
-#endif
-
-#ifdef sleep
-#define apache_sleep sleep
-#undef sleep
-#endif
-
-#ifdef PERL_IS_5_6
-
-#ifdef opendir
-#define apache_opendir opendir
-#undef opendir
-#endif
-
-#ifdef readdir
-#define apache_readdir readdir
-#undef readdir
-#endif
-
-#ifdef closedir
-#define apache_closedir closedir
-#undef closedir
-#endif
-
-#ifdef crypt
-#define apache_crypt crypt
-#undef crypt
-#endif
-
-#ifdef errno
-#define apache_errno errno
-#undef errno
-#endif
-
-#endif /* endif PERL_IS_56 */
-
-#endif /* endif WIN32 */
-
-
#include <httpd.h>
#include <http_config.h>
#include <http_protocol.h>
@@ -140,67 +79,6 @@
#include "epdat.h"
#include "embperl.h"
-#ifdef WIN32
-
-#undef uid_t
-#ifdef apache_uid_t
-#define uid_t apache_uid_t
-#undef apache_uid_t
-#endif
-
-#undef gid_t
-#ifdef apache_gid_t
-#define gid_t apache_gid_t
-#undef apache_gid_t
-#endif
-
-#undef mode_t
-#ifdef apache_mode_t
-#define gid_t apache_mode_t
-#undef apache_mode_t
-#endif
-
-#ifdef apache_stat
-#undef stat
-#define stat apache_stat
-#undef apache_stat
-#endif
-
-#ifdef apache_sleep
-#undef sleep
-#define sleep apache_sleep
-#undef apache_sleep
-#endif
-
-#ifdef PERL_IS_5_6
-
-#ifdef apache_opendir
-#undef opendir
-#define opendir apache_opendir
-#undef apache_opendir
-#endif
-
-#ifdef apache_readdir
-#undef readdir
-#define readdir apache_readdir
-#undef apache_readdir
-#endif
-
-#ifdef apache_closedir
-#undef closedir
-#define closedir apache_closedir
-#undef apache_closedir
-#endif
-
-#ifdef apache_crypt
-#undef crypt
-#define crypt apache_crypt
-#undef apache_crypt
-#endif
-
-#endif /* endif PERL_IS_5_6 */
-
-#endif /* endif WIN32 */
#ifdef WIN32
#define PATH_MAX _MAX_DIR
1.17 +67 -0 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- epnames.h 2000/01/04 06:10:02 1.16
+++ epnames.h 2000/04/17 21:03:15 1.17
@@ -204,3 +204,70 @@
#endif /* PERL_VERSION > 5 */
+
+
+#ifdef APACHE
+
+#ifdef WIN32
+
+#undef uid_t
+#ifdef apache_uid_t
+#define uid_t apache_uid_t
+#undef apache_uid_t
+#endif
+
+#undef gid_t
+#ifdef apache_gid_t
+#define gid_t apache_gid_t
+#undef apache_gid_t
+#endif
+
+#undef mode_t
+#ifdef apache_mode_t
+#define gid_t apache_mode_t
+#undef apache_mode_t
+#endif
+
+#ifdef apache_stat
+#undef stat
+#define stat apache_stat
+#undef apache_stat
+#endif
+
+#ifdef apache_sleep
+#undef sleep
+#define sleep apache_sleep
+#undef apache_sleep
+#endif
+
+#if PERL_VERSION >= 6
+
+#ifdef apache_opendir
+#undef opendir
+#define opendir apache_opendir
+#undef apache_opendir
+#endif
+
+#ifdef apache_readdir
+#undef readdir
+#define readdir apache_readdir
+#undef apache_readdir
+#endif
+
+#ifdef apache_closedir
+#undef closedir
+#define closedir apache_closedir
+#undef apache_closedir
+#endif
+
+#ifdef apache_crypt
+#undef crypt
+#define crypt apache_crypt
+#undef apache_crypt
+#endif
+
+#endif /* endif PERL_IS_5_6 */
+
+#endif /* endif WIN32 */
+
+#endif /* APACHE */
\ No newline at end of file
1.57 +15 -7 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- test.pl 2000/03/29 04:47:06 1.56
+++ test.pl 2000/04/17 21:03:15 1.57
@@ -94,6 +94,8 @@
'mdatsess.htm?cnt=3',
'execgetsess.htm',
'clearsess.htm',
+ 'EmbperlObject/epopage1.htm',
+ 'EmbperlObject/sub/epopage2.htm',
) ;
@@ -653,9 +655,11 @@
$n = 0 ;
$t_offline = 0 ;
$n_offline = 0 ;
- foreach $url (@tests)
+ $testnum = -1 ;
+ foreach $url (@tests)
{
- ($file, $query_info, $debug, $errcnt, $option, $ns) = split (/\?/, $url) ;
+ $testnum++ ;
+ ($file, $query_info, $debug, $errcnt, $option, $ns) = split (/\?/,
$url) ;
next if ($file eq 'http.htm') ;
next if ($file eq 'taint.htm') ;
next if ($file eq 'reqrec.htm') ;
@@ -666,6 +670,7 @@
next if ($file =~ /registry/) ;
next if ($file =~ /match/) ;
next if ($file =~ /sess\.htm/) ;
+ next if ($file =~ /EmbperlObject/) ;
next if ($DProf && ($file =~ /safe/)) ;
next if ($DProf && ($file =~ /opmask/)) ;
$errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
@@ -686,7 +691,7 @@
$page, $query_info || '') ;
unshift (@testargs, 'dbgbreak') if ($dbgbreak) ;
- $txt = $file . ($debug != $defaultdebug ?"-d $debug ":"") . '...' ;
+ $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug ":"") .
'...' ;
$txt .= ' ' x (30 - length ($txt)) ;
print $txt ;
@@ -1009,9 +1014,11 @@
$t_req = 0 ;
$n_req = 0 ;
$n = 0 ;
- foreach $url (@tests)
+ $testnum = -1 ;
+ foreach $url (@tests)
{
- ($file, $query_info, $debug, $errcnt) = split (/\?/, $url) ;
+ $testnum++ ;
+ ($file, $query_info, $debug, $errcnt) = split (/\?/, $url) ;
next if ($file =~ /\// && $loc eq $cgiloc) ;
next if ($file eq 'taint.htm' && $loc eq $cgiloc) ;
@@ -1028,6 +1035,7 @@
#next if ($file eq 'notallow.xhtm' && $loc eq $cgiloc && $EPWIN32) ;
next if ($file =~ /opmask/ && $EPSTARTUP =~ /_dso/) ;
next if ($file eq 'clearsess.htm' && !$looptest) ;
+ next if (($file =~ /EmbperlObject/) && $loc eq $cgiloc) ;
$errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
if ($file =~ /sess\.htm/)
{
@@ -1036,7 +1044,7 @@
{
$txt2 = "$file...";
$txt2 .= ' ' x (29 - length ($txt2)) ;
- print "$txt2 skip on this plattform\n" ;
+ print "#$testnum $txt2 skip on this plattform\n" ;
next ;
}
}
@@ -1060,7 +1068,7 @@
$notseen = 1 ;
}
- $txt = "$file" . ($debug != $defaultdebug ?"-d $debug ":"") . '...' ;
+ $txt = "#$testnum $file" . ($debug != $defaultdebug ?"-d $debug ":"") .
'...' ;
$txt .= ' ' x (30 - length ($txt)) ;
print $txt ;
unlink ($outfile) ;
1.21 +0 -0 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Mail.pm 2000/04/17 03:26:57 1.20
+++ Mail.pm 2000/04/17 21:03:16 1.21
@@ -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.20 2000/04/17 03:26:57 richter Exp $
+# $Id: Mail.pm,v 1.21 2000/04/17 21:03:16 richter Exp $
#
###################################################################################
1.22 +0 -0 embperl/Embperl/Module.pm
Index: Module.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Module.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Module.pm 2000/04/17 03:26:57 1.21
+++ Module.pm 2000/04/17 21:03:16 1.22
@@ -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.21 2000/04/17 03:26:57 richter Exp $
+# $Id: Module.pm,v 1.22 2000/04/17 21:03:16 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.21 2000/04/17 03:26:57 richter Exp $
+# $Id: Module.pm,v 1.22 2000/04/17 21:03:16 richter Exp $
#
###################################################################################
1.90 +0 -0 embperl/emacs/embperl.el
Index: embperl.el
===================================================================
RCS file: /home/cvs/embperl/emacs/embperl.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- embperl.el 2000/04/17 03:26:58 1.89
+++ embperl.el 2000/04/17 21:03:17 1.90
@@ -19,9 +19,9 @@
;; Author : Erik Arneson ([EMAIL PROTECTED])
;; Created On : Wed Jul 22 17:16:39 PDT 1998
;; Last Modified By: Erik Arneson
-;; Last Modified On: $Date: 2000/04/17 03:26:58 $
+;; Last Modified On: $Date: 2000/04/17 21:03:17 $
;; Version : 1.00
-;; $Id: embperl.el,v 1.89 2000/04/17 03:26:58 richter Exp $
+;; $Id: embperl.el,v 1.90 2000/04/17 21:03:17 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
1.14 +1 -1 embperl/test/cmp/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/escape.htm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- escape.htm 2000/04/13 21:37:02 1.13
+++ escape.htm 2000/04/17 21:03:17 1.14
@@ -195,4 +195,4 @@
</body>
</html>
-
+
1.1 embperl/test/cmp/epopage1.htm
Index: epopage1.htm
===================================================================
<html>
<head>
<title>Example</title>
</head>
<body>
<h1>head from foo</h1>
PAGE 1
<hr> Footer <hr>
</body>
</html>
1.1 embperl/test/cmp/epopage2.htm
Index: epopage2.htm
===================================================================
<html>
<head>
<title>Example</title>
</head>
<body>
<h1>another head from sub</h1>
PAGE 2
<hr> Footer <hr>
</body>
</html>
1.19 +2 -2 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- httpd.conf.src 2000/04/17 03:26:58 1.18
+++ httpd.conf.src 2000/04/17 21:03:18 1.19
@@ -266,9 +266,9 @@
</Location>
-<Location /EmbperlObject>
+<Location /embperl/EmbperlObject>
PerlSetEnv EMBPERL_OBJECT_BASE epobase.htm
-PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?|\\.epl\$\"
+PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
PerlHandler HTML::EmbperlObject
Options ExecCGI
1.1 embperl/test/html/EmbperlObject/epobase.htm
Index: epobase.htm
===================================================================
<html>
<head>
<title>Example</title>
</head>
<body>
[- Execute ('epohead.htm') -]
[- Execute ('*') -]
[- Execute ('epofoot.htm') -]
</body>
</html>
1.1 embperl/test/html/EmbperlObject/epofoot.htm
Index: epofoot.htm
===================================================================
<hr> Footer <hr>
1.1 embperl/test/html/EmbperlObject/epohead.htm
Index: epohead.htm
===================================================================
<h1>head from foo</h1>
1.1 embperl/test/html/EmbperlObject/epopage1.htm
Index: epopage1.htm
===================================================================
PAGE 1
1.1 embperl/test/html/EmbperlObject/sub/epohead.htm
Index: epohead.htm
===================================================================
<h1>another head from sub</h1>
1.1 embperl/test/html/EmbperlObject/sub/epopage2.htm
Index: epopage2.htm
===================================================================
PAGE 2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
