Close bug #7325. Patches by djm@web.us.uu.net.

diff --git a/apidoc-zend.txt b/apidoc-zend.txt
index 1b4a4f7f91d7dff8c6025f6cfad6dec76e181c26..6cd4999dca379c838982008dc12638b2fb2e38a9 100644 (file)
--- a/apidoc-zend.txt
+++ b/apidoc-zend.txt
@@ -238,7 +238,7 @@ registers two INI entries - "foo" and "bar".  They're given defaults "1"
 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

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 716f3ba679d64b7ddbf1dbb5e502a5c895bb4908..609107e53104353d3a8dffd489e5787820912b37 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -217,7 +217,7 @@ PHPAPI int php_check_open_basedir(char *path)
 
                        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;