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/12/21 08:41:21 UTC

cvs commit: embperl/test/html getsess.htm mdatsess.htm

richter     00/12/20 23:41:20

  Modified:    .        Tag: Embperl2c DOM.xs Embperl.pm epnames.h
               test/conf Tag: Embperl2c httpd.conf.src
               test/html Tag: Embperl2c getsess.htm mdatsess.htm
  Log:
  Embperl 2 - fix output of magic vars in Perl 5.004
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +8 -1      embperl/DOM.xs
  
  Index: DOM.xs
  ===================================================================
  RCS file: /home/cvs/embperl/DOM.xs,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- DOM.xs	2000/12/18 12:43:21	1.1.2.6
  +++ DOM.xs	2000/12/21 07:41:15	1.1.2.7
  @@ -59,6 +59,7 @@
       STRLEN l ;
       char * s  ;
   PPCODE:
  +    SvGETMAGIC_P4(sText) ;
       s = SV2String (sText, l) ;
       Node_replaceChildWithCDATA (DomTree_self(pDomNode -> xDomTree), -1, pDomNode -> xNode, s, l, (pCurrReq -> nCurrEscMode & 3)== 3?1 + (pCurrReq -> nCurrEscMode & 4):pCurrReq -> nCurrEscMode, nflgModified | nflgReturn) ;
       pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
  @@ -77,6 +78,7 @@
       STRLEN l ;
       char * s  ;
   PPCODE:
  +    SvGETMAGIC_P4(sText) ;
       s = SV2String (sText, l) ;
       Node_replaceChildWithCDATA (DomTree_self(xDomTree), -1, xOldChild, s, l, (pCurrReq -> nCurrEscMode & 3)== 3?1 + (pCurrReq -> nCurrEscMode & 4):pCurrReq -> nCurrEscMode, nflgModified | nflgReturn) ;
       pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
  @@ -94,6 +96,7 @@
       STRLEN l ;
       char * s  ;
   PPCODE:
  +    SvGETMAGIC_P4(sText) ;
       s = SV2String (sText, l) ;
       Node_replaceChildWithCDATA (DomTree_self(pCurrReq -> xCurrDomTree), -1, xOldChild, s, l, (pCurrReq -> nCurrEscMode & 3)== 3?1 + (pCurrReq -> nCurrEscMode & 4):pCurrReq -> nCurrEscMode, nflgModified | nflgReturn) ;
       pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
  @@ -111,6 +114,7 @@
   PREINIT:
       SV * sRet  ;
   PPCODE:
  +    SvGETMAGIC_P4(sText) ;
       sRet = Node_replaceChildWithUrlDATA (pDomNode -> xDomTree, pDomNode -> xNode,sText) ;
   
       ST(0) = sRet ;
  @@ -121,8 +125,11 @@
       int xDomTree
       int xOldChild
       SV * sText
  +PREINIT:
  +    SV * sRet  ;
   PPCODE:
  -    SV * sRet = Node_replaceChildWithUrlDATA (xDomTree, xOldChild,sText) ;
  +    SvGETMAGIC_P4(sText) ;
  +    sRet = Node_replaceChildWithUrlDATA (xDomTree, xOldChild,sText) ;
   
       ST(0) = sRet ;
       XSRETURN(1) ;
  
  
  
  1.118.4.21 +3 -3      embperl/Embperl.pm
  
  Index: Embperl.pm
  ===================================================================
  RCS file: /home/cvs/embperl/Embperl.pm,v
  retrieving revision 1.118.4.20
  retrieving revision 1.118.4.21
  diff -u -r1.118.4.20 -r1.118.4.21
  --- Embperl.pm	2000/12/19 09:11:02	1.118.4.20
  +++ Embperl.pm	2000/12/21 07:41:15	1.118.4.21
  @@ -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.118.4.20 2000/12/19 09:11:02 richter Exp $
  +#   $Id: Embperl.pm,v 1.118.4.21 2000/12/21 07:41:15 richter Exp $
   #
   ###################################################################################
   
  @@ -86,9 +86,9 @@
   
   
   ##ep2##
  -$VERSION = '2.0a17' ;
  +$VERSION = '2.0a19' ;
   ##/ep2##
  -##ep1##$VERSION = '1.3b8_dev';
  +##ep1##$VERSION = '1.3.0';
   
   # HTML::Embperl cannot be bootstrapped in nonlazy mode except
   # under mod_perl, because its dependencies import symbols like ap_palloc
  
  
  
  1.19.4.3  +5 -0      embperl/epnames.h
  
  Index: epnames.h
  ===================================================================
  RCS file: /home/cvs/embperl/epnames.h,v
  retrieving revision 1.19.4.2
  retrieving revision 1.19.4.3
  diff -u -r1.19.4.2 -r1.19.4.3
  --- epnames.h	2000/11/13 18:38:43	1.19.4.2
  +++ epnames.h	2000/12/21 07:41:16	1.19.4.3
  @@ -205,6 +205,7 @@
   #define maxo PL_maxo
   #endif
   
  +
   #if PERL_SUBVERSION >= 50 || PERL_VERSION >= 6
   
   #ifndef na
  @@ -219,6 +220,8 @@
   
   #endif
   
  +#define SvGETMAGIC_P4(x)
  +
   
   #else  /* PERL_VERSION > 5 */
   
  @@ -230,6 +233,8 @@
   #define dTHR
   #endif
   
  +#define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
  +#define SvGETMAGIC_P4(x) SvGETMAGIC(x)
   
   #endif /* PERL_VERSION > 5 */
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.4.6  +1 -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.24.4.5
  retrieving revision 1.24.4.6
  diff -u -r1.24.4.5 -r1.24.4.6
  --- httpd.conf.src	2000/12/18 11:38:48	1.24.4.5
  +++ httpd.conf.src	2000/12/21 07:41:19	1.24.4.6
  @@ -73,6 +73,7 @@
   	{
   print OFH <<EOD ;
   
  +#PerlSetEnv EMBPERL_SESSION_CLASSES "MemoryStore NullLocker"
   PerlSetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
   PerlSetEnv EMBPERL_SESSION_ARGS "Directory=$EPPATH/test/tmp"
   SetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.6.2   +21 -3     embperl/test/html/getsess.htm
  
  Index: getsess.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/html/getsess.htm,v
  retrieving revision 1.7.6.1
  retrieving revision 1.7.6.2
  diff -u -r1.7.6.1 -r1.7.6.2
  --- getsess.htm	2000/12/18 11:38:58	1.7.6.1
  +++ getsess.htm	2000/12/21 07:41:20	1.7.6.2
  @@ -5,7 +5,26 @@
   
   
   <body>
  +	
  +	[#
  +	[- $s = $Apache::Session::Win32::sessions  || $Apache::Session::MemoryStore::store  -]
  +	[- @ks = sort keys %$s -]
  +	sessions:
  +	<table>
  +		<tr>
  +			<td>[+ $ks[$row] +]</td><td>[+ $sh = $s -> {$ks[$row] || ''} +]</td><td>[$if ref($sh) eq 'HASH' $][+ do { my @tmp = map { "$_ = $sh->{$_}" } keys (%$sh) ; join (', ', @tmp) } +][$endif$]</td>
  +		</tr>
  +	</table>
  +
  +		tied (%mdat) [+ $m = tied (%mdat) +]  <br>
  +		ref          [+ ref ($m) +]  <br>
  +		content      [+ do { my @tmp = map { "$_ = $mdat{$_}" } keys (%mdat) ; join (', ', @tmp) } +]  <br>
  +		tied (%udat) [+ $u = tied (%udat) +]  <br>
  +		ref          [+ ref ($u) +]  <br>
  +		content      [+ do { my @tmp = map { "$_ = $udat{$_}" } keys (%udat) ; join (', ', @tmp) } +]  <br>
   
  +	a=[+ scalar (do {$udat{'a'}}) +][+ $aa +]
  +	#]
   
   	fdat:<br>
   	[- @ks = sort keys %fdat -]
  @@ -41,14 +60,13 @@
   
   
   	[- $s = $Apache::Session::Win32::sessions  || $Apache::Session::MemoryStore::store  -]
  -
   	[- @ks = sort keys %$s -]
  -
   	sessions:
   	<table>
   		<tr>
  -			<td>[+ $ks[$row] +]</td><td>[+ $s -> {$ks[$row] || ''} +]</td>
  +			<td>[+ $ks[$row] +]</td><td>[+ $sh = $s -> {$ks[$row] || ''} +]</td><td>[$if ref($sh) eq 'HASH' $][+ do { my @tmp = map { "$_ = $sh->{$_}" } keys (%$sh) ; join (', ', @tmp) } +][$endif$]</td>
   		</tr>
   	</table>
  +
   </body>
   </html>
  
  
  
  1.2.6.2   +9 -0      embperl/test/html/mdatsess.htm
  
  Index: mdatsess.htm
  ===================================================================
  RCS file: /home/cvs/embperl/test/html/mdatsess.htm,v
  retrieving revision 1.2.6.1
  retrieving revision 1.2.6.2
  diff -u -r1.2.6.1 -r1.2.6.2
  --- mdatsess.htm	2000/12/18 11:39:00	1.2.6.1
  +++ mdatsess.htm	2000/12/21 07:41:20	1.2.6.2
  @@ -23,5 +23,14 @@
   
           [- $mdat{cnt}++  -]
   
  +		[#
  +		tied (%mdat) [+ $m = tied (%mdat) +]  <br>
  +		ref          [+ ref ($m) +]  <br>
  +		content      [+ do { my @tmp = map { "$_ = $mdat{$_}" } keys (%mdat) ; join (', ', @tmp) } +]  <br>
  +		tied (%udat) [+ $u = tied (%udat) +]  <br>
  +		ref          [+ ref ($u) +]  <br>
  +		content      [+ do { my @tmp = map { "$_ = $udat{$_}" } keys (%udat) ; join (', ', @tmp) } +]  <br>
  +		#]
  +
   </body>
   </html>