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...@apache.org on 2004/08/16 07:58:30 UTC

cvs commit: embperl/eg/web config.pl

richter     2004/08/15 22:58:30

  Modified:    .        Changes.pod
               Embperl/Recipe EmbperlXSLT.pm
               eg/web   config.pl
  Log:
  add single quotes to xslt param
  
  Revision  Changes    Path
  1.244     +4 -1      embperl/Changes.pod
  
  Index: Changes.pod
  ===================================================================
  RCS file: /home/cvs/embperl/Changes.pod,v
  retrieving revision 1.243
  retrieving revision 1.244
  diff -u -r1.243 -r1.244
  --- Changes.pod	9 Aug 2004 19:44:44 -0000	1.243
  +++ Changes.pod	16 Aug 2004 05:58:30 -0000	1.244
  @@ -14,8 +14,11 @@
      - Added more verbose error informations for PerlHash error
      - Fixed problem when unloading Embperl.so under Apache, which cause
        Perl Hash error and/or segfault.
  -   - Fixed SegFault that occured when a Perl warning should be logged during
  +   - Fixed SegFault that occured when a Perl warning should be logged during
        initialisation.
  +   - Added single quotes arround xslt paramenters that are automaticly
  +     generated from %fdat to avoid security problems.
  +   - Fixed some memory leaks
   
   =head1 2.0b11  15. March 2004
   
  
  
  
  1.4       +3 -2      embperl/Embperl/Recipe/EmbperlXSLT.pm
  
  Index: EmbperlXSLT.pm
  ===================================================================
  RCS file: /home/cvs/embperl/Embperl/Recipe/EmbperlXSLT.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EmbperlXSLT.pm	23 Jan 2004 06:50:57 -0000	1.3
  +++ EmbperlXSLT.pm	16 Aug 2004 05:58:30 -0000	1.4
  @@ -53,7 +53,8 @@
   
       push @$ep, {'type'   =>  'eptostring' } ;
       push @$ep, {'type'   =>  $xsltproc . '-parse-xml', } ;
  -    push @$ep, {'type'   =>  $xsltproc, stylesheet => \@stylesheet, $param -> xsltparam?():(param => \%Embperl::fdat) } ;
  +    push @$ep, {'type'   =>  $xsltproc, stylesheet => \@stylesheet, $param -> xsltparam?():
  +                (param => { map { $_ => "'$Embperl::fdat{$_}'" } keys %Embperl::fdat }) } ;
   
       return $ep ;
       }
  
  
  
  1.8       +10 -10    embperl/eg/web/config.pl
  
  Index: config.pl
  ===================================================================
  RCS file: /home/cvs/embperl/eg/web/config.pl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- config.pl	23 Jan 2004 08:39:40 -0000	1.7
  +++ config.pl	16 Aug 2004 05:58:30 -0000	1.8
  @@ -27,15 +27,15 @@
       $self -> {root}      = $ENV{EMBPERL_SRC} . '/' ;
       
       # check if Embperl 1.3 is installed
  -    my $lib_1_3 = dirname ($INC{'Apache.pm'})  ;
  -    if (-e ($lib_1_3 . '/HTML/Embperl.pod'))
  -        {
  -        $self -> {lib_1_3}     = $lib_1_3 ;
  -        }
  -    else
  -        {
  -        $self -> {lib_1_3}     = '' ;
  -        }
  +    if ($INC{'Apache.pm'})
  +	{
  +        my $lib_1_3 = dirname ($INC{'Apache.pm'})  ;
  +        if (-e ($lib_1_3 . '/HTML/Embperl.pod'))
  +            {
  +            $self -> {lib_1_3}     = $lib_1_3 ;
  +            }
  +	}
  +    $self -> {lib_1_3} ||= '' ;
   
       # check if DBIx::Recordset is installed
       my $lib_dbix = $lib_1_3  ;
  @@ -43,7 +43,7 @@
           {
           $self -> {lib_dbix}     = $lib_dbix ;
           }
  -    elsif (-e (dirname($lib_dbix) . '/DBIx/Intrors.pod'))
  +    elsif ($lib_dbix && (-e (dirname($lib_dbix) . '/DBIx/Intrors.pod')))
           {
           $self -> {lib_dbix}     = dirname($lib_dbix) ;
           }
  
  
  

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