perl-embperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject cvs commit: embperl/test/html/registry Execute.htm
Date Tue, 22 Feb 2005 16:34:29 GMT
richter     2005/02/22 08:34:29

  Modified:    .        Changes.pod eputil.c
               test/cmp Execute.htm
               test/conf httpd.conf.src startup.pl
               test/html/registry Execute.htm
  Log:
  - fix httpd startup when mod_perl is linked staticly and mod_dso is also
  used
  - Add Test for $req_rec inside Registry and Execute
  
  Revision  Changes    Path
  1.260     +3 -0      embperl/Changes.pod
  
  Index: Changes.pod
  ===================================================================
  RCS file: /home/cvs/embperl/Changes.pod,v
  retrieving revision 1.259
  retrieving revision 1.260
  diff -u -r1.259 -r1.260
  --- Changes.pod	17 Jan 2005 06:24:40 -0000	1.259
  +++ Changes.pod	22 Feb 2005 16:34:28 -0000	1.260
  @@ -14,6 +14,9 @@
        non exists. Requested by Robert.
      - Let embpmsgid.pl parse out language tags of gettext, sort output
        and don't convert chars > 128 to octal values. Requested by Robert. 
  +   - Fixed make test module load problem for mod_perl tests, when
  +     mod_perl is staticly linked into Apache
  +   - Documentation updates and cleanup 
   
   =head1 2.0rc2  21. November 2004
   
  
  
  
  1.44      +3 -1      embperl/eputil.c
  
  Index: eputil.c
  ===================================================================
  RCS file: /home/cvs/embperl/eputil.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- eputil.c	17 Jan 2005 06:24:40 -0000	1.43
  +++ eputil.c	22 Feb 2005 16:34:29 -0000	1.44
  @@ -1806,7 +1806,9 @@
   
               ppSV = hv_fetch(pHV, (char *)sMsgId, strlen (sMsgId), 0) ;  
               if (ppSV != NULL)
  +	        {
                   return SvOK(*ppSV)?SvPV (*ppSV, l):NULL ;
  +                }
               }
           }
       return NULL ;
  
  
  
  1.6       +24 -1     embperl/test/cmp/Execute.htm
  
  Index: Execute.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/cmp/Execute.htm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Execute.htm	22 Oct 2002 05:29:09 -0000	1.5
  +++ Execute.htm	22 Feb 2005 16:34:29 -0000	1.6
  @@ -110,5 +110,28 @@
   
   
   </H3>
  -<H1> 10.) Done :-)</H1>
  +<H1> 10.) Test  inside Execute</H1>
  +
  +<html>
  +<head>
  +<title>Test for $req_rec in Embperl</title>
  +</head>
  +
  +$conf = &lt;undef&gt; <br> 
  +^\$_\[0\] = Embperl::Req=HASH\(0x 
  +$_[1] = &lt;undef&gt; <br> 
  +
  +^\$rec_rec  = Apache::RequestRec=SCALAR\(0x
  +^\$\$rec_rec = \d+<br>
  +
  +^Apache->request    = Apache::RequestRec=SCALAR\(0x
  +^\$\{Apache->request\} = \d+<br>
  +
  +${Apache->request} = $$req_rec ?  no <br>
  +
  +^test/html/incif.htm
  +</body>
  +</html>
  +
  +<H1> 11.) Done :-)</H1>
   </body></html>
  
  
  
  1.56      +12 -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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- httpd.conf.src	13 Nov 2004 16:47:08 -0000	1.55
  +++ httpd.conf.src	22 Feb 2005 16:34:29 -0000	1.56
  @@ -38,7 +38,17 @@
   
   if ($EPMODPERL && ($EPMODPERL !~ /perl_module/) && !$MP2)
       {
  -    print OFH "PerlModule Embperl\n" ;
  +    print OFH <<EOD ;
  +
  +PerlSetEnv EMBPERL_SRC \"$EPPATH\"
  +SetEnv EMBPERL_SRC \"$EPPATH\"
  +PerlSetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\" 
  +SetEnv DMALLOC_OPTIONS \"log=$EPPATH/test/tmp/httpd.dmalloc.log,debug=0x3f03\" 
  +
  +#Load Embperl first, when mod_perl is staticly linked;
  +PerlRequire \"$EPPATH/test/conf/$EPSTARTUP\"
  +EOD
  +
       }
   
   print OFH "$EPMODPERL\n" ;
  
  
  
  1.22      +1 -1      embperl/test/conf/startup.pl
  
  Index: startup.pl
  ===================================================================
  RCS file: /home/cvs/embperl/test/conf/startup.pl,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- startup.pl	8 Jul 2004 08:31:00 -0000	1.21
  +++ startup.pl	22 Feb 2005 16:34:29 -0000	1.22
  @@ -39,6 +39,7 @@
   	eval 'use Apache2' ;
           require ModPerl::Registry ;
           }
  +
       } ;
   
   
  @@ -56,7 +57,6 @@
   $testshare = "Shared Data" ;
   $cp -> share ('$testshare') ;  
   
  -
   ##Embperl::Execute ({ inputfile  => "$ENV{EMBPERL_SRC}/test/html/div.htm", import =>
0, input_escmode => 7 }) ;
   
   
  
  
  
  1.7       +6 -1      embperl/test/html/registry/Execute.htm
  
  Index: Execute.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/html/registry/Execute.htm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Execute.htm	8 Mar 2004 15:41:43 -0000	1.6
  +++ Execute.htm	22 Feb 2005 16:34:29 -0000	1.7
  @@ -128,7 +128,12 @@
   
   print "\n<H3>$out</H3>\n" ;
   
  -print "\n<H1> 10.) Done :-)</H1>\n" ;
  +print "\n<H1> 10.) Test $req_rec inside Execute</H1>\n" ;
  +
  +Embperl::Execute ('../reqrec.htm') ;
  +
  +
  +print "\n<H1> 11.) Done :-)</H1>\n" ;
   
   
   print "</body></html>\n";
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org


Mime
View raw message