[Phplib-commit] CVS: php-lib-stable/php session.inc,1.10,1.11

[Richard A. <ric...@us...>]

Update of /cvsroot/phplib/php-lib-stable/php
In directory usw-pr-cvs1:/tmp/cvs-serv10155

Modified Files:
	session.inc 
Log Message:
fix the call-time-pass-by-reference bug in PHP4

Index: session.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib-stable/php/session.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** session.inc	2001/08/18 09:42:59	1.10
--- session.inc	2001/08/26 04:50:25	1.11
***************
*** 268,272 ****
          while ( "array" == $l ) {
            ## Structural recursion
!           $this->serialize($var."['".ereg_replace("([\\'])", "\\\\1", $k)."']", &$str);
            eval("\$l = gettype(list(\$k)=each(\$$var));");
          }
--- 268,272 ----
          while ( "array" == $l ) {
            ## Structural recursion
!           $this->serialize($var."['".ereg_replace("([\\'])", "\\\\1", $k)."']", $str);
            eval("\$l = gettype(list(\$k)=each(\$$var));");
          }
***************
*** 279,283 ****
          while ( $l ) {
            ## Structural recursion.
!           $this->serialize($var."->".$l,&$str);
            eval("\$l = next(\$${var}->persistent_slots);");
          }
--- 279,283 ----
          while ( $l ) {
            ## Structural recursion.
!           $this->serialize($var."->".$l, $str);
            eval("\$l = next(\$${var}->persistent_slots);");
          }
***************
*** 308,313 ****
      $str="";
  
!     $this->serialize("this->in",&$str);
!     $this->serialize("this->pt",&$str);
  
      reset($this->pt);
--- 308,313 ----
      $str="";
  
!     $this->serialize("this->in", $str);
!     $this->serialize("this->pt", $str);
  
      reset($this->pt);
***************
*** 315,319 ****
        $thing=trim($thing);
        if ( $thing ) {
!         $this->serialize("GLOBALS['".$thing."']",&$str);
        }
      }
--- 315,319 ----
        $thing=trim($thing);
        if ( $thing ) {
!         $this->serialize("GLOBALS['".$thing."']", $str);
        }
      }