[Phplib-commit] CVS: php-lib/php/session session3.inc,1.6,1.7

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

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

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

Index: session3.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib/php/session/session3.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** session3.inc	2001/08/18 09:47:19	1.6
--- session3.inc	2001/08/26 04:50:40	1.7
***************
*** 285,289 ****
          while ( "array" == $l ) {
            ## Structural recursion
!           $this->serialize($var."['".ereg_replace("([\\'])", "\\\\1", $k)."']", &$str);
            eval("\$l = gettype(list(\$k)=each(\$$var));");
          }
--- 285,289 ----
          while ( "array" == $l ) {
            ## Structural recursion
!           $this->serialize($var."['".ereg_replace("([\\'])", "\\\\1", $k)."']", $str);
            eval("\$l = gettype(list(\$k)=each(\$$var));");
          }
***************
*** 301,305 ****
              reset($'.$var.');
              while ( list($k) = each($'.$var.') ) {
!               $this->serialize( "${var}->".$k, &$str );
              }
            }
--- 301,305 ----
              reset($'.$var.');
              while ( list($k) = each($'.$var.') ) {
!               $this->serialize( "${var}->".$k, $str );
              }
            }
***************
*** 340,345 ****
      $str="";
  
!     $this->serialize("this->in",&$str);
!     $this->serialize("this->pt",&$str);
  
      reset($this->pt);
--- 340,345 ----
      $str="";
  
!     $this->serialize("this->in", $str);
!     $this->serialize("this->pt", $str);
  
      reset($this->pt);
***************
*** 347,351 ****
        $thing=trim($thing);
        if ( $thing ) {
!         $this->serialize("GLOBALS['".$thing."']",&$str);
        }
      }
--- 347,351 ----
        $thing=trim($thing);
        if ( $thing ) {
!         $this->serialize("GLOBALS['".$thing."']", $str);
        }
      }