Re: cvs: php4 / NEWS php.ini-dist /ext/pcre php_pcre.c /ext/standard assert.c basic_functions.c

On Tue, 12 Sep 2000, Zeev Suraski wrote: > zeev Tue Sep 12 13:48:33 2000 EDT > > Modified files: > /php4 NEWS php.ini-dist > /php4/ext/pcre php_pcre.c > /php4/ext/standard assert.c basic_functions.c > Log: > - Made eval() and several other runtime-evaluated code portions report the > nature and location of errors more accurately (Stas) > > Index: php4/php.ini-dist > diff -u php4/php.ini-dist:1.48 php4/php.ini-dist:1.49 > --- php4/php.ini-dist:1.48 Sat Sep 9 08:02:14 2000 > +++ php4/php.ini-dist Tue Sep 12 13:48:32 2000 > @@ -185,7 +185,14 @@ > ;;;;;;;;;;;;;;;;; > ; Data Handling ; > ;;;;;;;;;;;;;;;;; > +<<<<<<< php.ini-dist > +track_vars = On ; enable the $HTTP_*_VARS[] arrays, where * is one of > + ; ENV, POST, GET, COOKIE or SERVER. > + ; This is the preferred way of accessing form variables, > + ; and prevents common security bugs many developers tend to make. > +======= > ; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 > +>>>>>>> 1.47 > variables_order = "EGPCS" ; This directive describes the order in which PHP > registers > ; GET, POST, Cookie, Environment and Built-in variables (G, P, You got some merge conflict text stuck in by accident. -adam -- / adam maccabee trachtenberg | visit college life online \ \ adam@student.net | http://www.student.com /