You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@locus.apache.org on 2000/06/05 12:07:03 UTC
cvs commit: embperl/test/conf httpd.conf.src
richter 00/06/05 03:07:02
Modified: . Tag: Embperl2 Changes.pod Embperl.pm Makefile.PL
epcomp.c epeval.c eputil.c
test/conf Tag: Embperl2 httpd.conf.src
Log:
Embperl 2
Revision Changes Path
No revision
No revision
1.115.2.6 +1 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.115.2.5
retrieving revision 1.115.2.6
diff -u -r1.115.2.5 -r1.115.2.6
--- Changes.pod 2000/06/04 19:42:39 1.115.2.5
+++ Changes.pod 2000/06/05 10:06:53 1.115.2.6
@@ -37,7 +37,7 @@
- optUndefToEmptyValue is always set and cannot be disabled.
-
+ - make test works with Apache that has mod_jserv compiled in
1.104.2.6 +3 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.104.2.5
retrieving revision 1.104.2.6
diff -u -r1.104.2.5 -r1.104.2.6
--- Embperl.pm 2000/05/19 13:35:25 1.104.2.5
+++ Embperl.pm 2000/06/05 10:06:54 1.104.2.6
@@ -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.104.2.5 2000/05/19 13:35:25 richter Exp $
+# $Id: Embperl.pm,v 1.104.2.6 2000/06/05 10:06:54 richter Exp $
#
###################################################################################
@@ -1862,6 +1862,8 @@
package Apache::Embperl;
*handler = \&HTML::Embperl::handler ;
+
+sub hello { print "Hello world\n" } ;
#
#
1.28.2.7 +1 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -r1.28.2.6 -r1.28.2.7
--- Makefile.PL 2000/06/04 19:42:40 1.28.2.6
+++ Makefile.PL 2000/06/05 10:06:54 1.28.2.7
@@ -294,7 +294,7 @@
}
else
{
- $ccdebug = '-g -wall' ;
+ $ccdebug = '-g' ;
$lddebug = '-g' ;
}
}
1.1.2.24 +5 -2 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- epcomp.c 2000/06/05 07:22:54 1.1.2.23
+++ epcomp.c 2000/06/05 10:06:55 1.1.2.24
@@ -782,6 +782,7 @@
clock_t cl4 ;
int bCheckpointPending = 0 ;
+ tainted = 0 ;
/* Already Parsed ? */
ppSV = hv_fetch(r -> Buf.pFile -> pCacheHash, "SRCDOM", 6, 1) ;
@@ -795,7 +796,8 @@
return rcEvalErr ;
}
- if (*ppSV == NULL || SvTYPE (*ppSV) != SVt_IV)
+ lprintf (r, "ppSV=%s type=%d\n", *ppSV?"ok":"NULL", *ppSV?SvTYPE (*ppSV):-1) ;
+ if (*ppSV == NULL || SvTYPE (*ppSV) != SVt_IV)
{
if ((rc = ParseFile (r)) != ok)
return rc ;
@@ -803,7 +805,8 @@
cl2 = clock () ;
*ppSV = newSViv(r -> xCurrDomTree) ;
- SvREFCNT_inc (*ppSV) ;
+ /* SvREFCNT_inc (*ppSV) ; */
+ lprintf (r, "IV ppSV=%s type=%d\n", *ppSV?"ok":"NULL", *ppSV?SvTYPE (*ppSV):-1) ;
pDomTree = r -> pCurrDomTree ;
xNode = Node_firstChild (pDomTree, r -> xDocument) ;
1.20.2.3 +1 -0 embperl/epeval.c
Index: epeval.c
===================================================================
RCS file: /home/cvs/embperl/epeval.c,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- epeval.c 2000/05/16 12:44:21 1.20.2.2
+++ epeval.c 2000/06/05 10:06:55 1.20.2.3
@@ -789,6 +789,7 @@
return rcEvalErr ;
}
+ lprintf (r, "CV ppSV=%s type=%d\n", *ppSV?"ok":"NULL", *ppSV?SvTYPE (*ppSV):0) ;
if (*ppSV == NULL || SvTYPE (*ppSV) != SVt_PVCV)
{
if ((rc = EvalOnly (r, sArg, ppSV, G_SCALAR, "")) != ok)
1.14.2.6 +1 -1 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -r1.14.2.5 -r1.14.2.6
--- eputil.c 2000/06/05 07:22:54 1.14.2.5
+++ eputil.c 2000/06/05 10:06:56 1.14.2.6
@@ -565,7 +565,7 @@
{
SV ** ppSV ;
- IV l ;
+ STRLEN l ;
ppSV = hv_fetch(pHash, (char *)sKey, strlen (sKey), 0) ;
if (ppSV != NULL)
No revision
No revision
1.19.2.1 +13 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- httpd.conf.src 2000/04/17 21:03:18 1.19
+++ httpd.conf.src 2000/06/05 10:07:01 1.19.2.1
@@ -99,6 +99,7 @@
PerlHandler HTML::Embperl
Options ExecCGI
PerlSetEnv LOC embperl
+PerlSetEnv EMBPERL_OPTIONS 128
</Location>
<Location /embperl/safe>
@@ -274,6 +275,11 @@
Options ExecCGI
</Location>
+<Location /modperl/hello>
+SetHandler perl-script
+PerlHandler Apache::Embperl::hello
+Options ExecCGI
+</Location>
<Location /eg>
@@ -310,3 +316,10 @@
}
+print OFH <<EOD ;
+<IfModule mod_jserv.c>
+ApJServManual on
+ApJServSecretKey DISABLED
+ApJServLogFile /dev/null
+</IfModule>
+EOD