cvs: php4 / apidoc-zend.txt /main fopen-wrappers.c

joey Thu Oct 19 08:05:44 2000 EDT Modified files: /php4 apidoc-zend.txt /php4/main fopen-wrappers.c Log: Close bug #7325. Patches by djm@web.us.uu.net. Index: php4/apidoc-zend.txt diff -u php4/apidoc-zend.txt:1.3 php4/apidoc-zend.txt:1.4 --- php4/apidoc-zend.txt:1.3 Fri Dec 24 09:39:23 1999 +++ php4/apidoc-zend.txt Thu Oct 19 08:05:44 2000 @@ -238,7 +238,7 @@ and "bah" respectively - note that all defaults are always given as strings. That doesn't reduce your ability to use integer values, simply specify them as strings. "foo" is marked so that it can be changed by -anyone at any time (PHP_INI_ALL), whereas "foo" is marked so it can be +anyone at any time (PHP_INI_ALL), whereas "bar" is marked so it can be changed only at startup in the php3.ini only, presumably, by the system administrator (PHP_INI_SYSTEM). When "foo" changes, no function is called. Access to it is done using the Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.98 php4/main/fopen-wrappers.c:1.99 --- php4/main/fopen-wrappers.c:1.98 Fri Oct 13 03:04:17 2000 +++ php4/main/fopen-wrappers.c Thu Oct 19 08:05:44 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.98 2000/10/13 10:04:17 hholzgra Exp $ */ +/* $Id: fopen-wrappers.c,v 1.99 2000/10/19 15:05:44 joey Exp $ */ #include "php.h" #include "php_globals.h" @@ -217,7 +217,7 @@ ptr = end; } - php_error(E_WARNING, "open_basedir restriction in effect. File is in wrong directory."); + php_error(E_WARNING, "open_basedir restriction in effect. File is in wrong directory"); efree(pathbuf); errno = EPERM; /* we deny permission to open it */ return -1;