CVS update: php31/ext/standard
| From: | steffann | Date: | Fri, 14 Aug 1998 23:57:41 +0000 |
| Subject: | CVS update: php31/ext/standard | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-251@lists.php.net to get a copy of this message | ||
Date: Friday August 14, 1998 @ 19:57
Author: steffann
Update of /repository/php31/ext/standard
In directory asf:/tmp/cvs-serv14398/ext/standard
Modified Files:
dir.c filestat.c image.c info.c
Log Message:
Change the name of fopen_basedir here too
Index: php31/ext/standard/dir.c
diff -c php31/ext/standard/dir.c:2.1 php31/ext/standard/dir.c:2.2
*** php31/ext/standard/dir.c:2.1 Fri Aug 14 13:29:58 1998
--- php31/ext/standard/dir.c Fri Aug 14 19:57:40 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dir.c,v 2.1 1998/08/14 17:29:58 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dir.c,v 2.2 1998/08/14 23:57:40 steffann Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 94,101 ****
}
convert_to_string(arg);
! /* Check fopen_basedir */
! if (_php3_check_fopen_basedir(arg->value.str.val)) RETURN_FALSE;
dirp = opendir(arg->value.str.val);
if (!dirp) {
--- 94,101 ----
}
convert_to_string(arg);
! /* Check open_basedir */
! if (_php3_check_open_basedir(arg->value.str.val)) RETURN_FALSE;
dirp = opendir(arg->value.str.val);
if (!dirp) {
***************
*** 241,248 ****
}
convert_to_string(arg);
! /* Check fopen_basedir */
! if (_php3_check_fopen_basedir(arg->value.str.val)) RETURN_FALSE;
dirp = opendir(arg->value.str.val);
if (!dirp) {
--- 241,248 ----
}
convert_to_string(arg);
! /* Check open_basedir */
! if (_php3_check_open_basedir(arg->value.str.val)) RETURN_FALSE;
dirp = opendir(arg->value.str.val);
if (!dirp) {
Index: php31/ext/standard/filestat.c
diff -c php31/ext/standard/filestat.c:2.3 php31/ext/standard/filestat.c:2.4
*** php31/ext/standard/filestat.c:2.3 Fri Aug 14 00:32:05 1998
--- php31/ext/standard/filestat.c Fri Aug 14 19:57:40 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: filestat.c,v 2.3 1998/08/14 04:32:05 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: filestat.c,v 2.4 1998/08/14 23:57:40 steffann Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 149,155 ****
}
/* #endif */
/* Check the basedir */
! if (_php3_check_fopen_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chown(filename->value.str.val, -1, gid);
if (ret == -1) {
--- 149,155 ----
}
/* #endif */
/* Check the basedir */
! if (_php3_check_open_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chown(filename->value.str.val, -1, gid);
if (ret == -1) {
***************
*** 193,199 ****
}
/* Check the basedir */
! if (_php3_check_fopen_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chown(filename->value.str.val, uid, -1);
if (ret == -1) {
--- 193,199 ----
}
/* Check the basedir */
! if (_php3_check_open_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chown(filename->value.str.val, uid, -1);
if (ret == -1) {
***************
*** 224,230 ****
}
/* Check the basedir */
! if (_php3_check_fopen_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chmod(filename->value.str.val, mode->value.lval);
if (ret == -1) {
--- 224,230 ----
}
/* Check the basedir */
! if (_php3_check_open_basedir(filename->value.str.val)) RETURN_FALSE;
ret = chmod(filename->value.str.val, mode->value.lval);
if (ret == -1) {
***************
*** 275,281 ****
}
/* Check the basedir */
! if (_php3_check_fopen_basedir(filename->value.str.val)) RETURN_FALSE;
/* create the file if it doesn't exist already */
ret = stat(filename->value.str.val, &sb);
--- 275,281 ----
}
/* Check the basedir */
! if (_php3_check_open_basedir(filename->value.str.val)) RETURN_FALSE;
/* create the file if it doesn't exist already */
ret = stat(filename->value.str.val, &sb);
Index: php31/ext/standard/image.c
diff -c php31/ext/standard/image.c:2.1 php31/ext/standard/image.c:2.2
*** php31/ext/standard/image.c:2.1 Fri Aug 14 13:29:59 1998
--- php31/ext/standard/image.c Fri Aug 14 19:57:40 1998
***************
*** 26,32 ****
| Authors: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
! /* $Id: image.c,v 2.1 1998/08/14 17:29:59 shane Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
--- 26,32 ----
| Authors: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
! /* $Id: image.c,v 2.2 1998/08/14 23:57:40 steffann Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
***************
*** 237,244 ****
}
convert_to_string(arg1);
! /* Check fopen_basedir */
! if (_php3_check_fopen_basedir(arg1->value.str.val)) return;
if ((filehandle = open(arg1->value.str.val, O_RDONLY)) < 0) {
php3_error(E_WARNING, "Unable to open %s", arg1->value.str.val);
--- 237,244 ----
}
convert_to_string(arg1);
! /* Check open_basedir */
! if (_php3_check_open_basedir(arg1->value.str.val)) return;
if ((filehandle = open(arg1->value.str.val, O_RDONLY)) < 0) {
php3_error(E_WARNING, "Unable to open %s", arg1->value.str.val);
Index: php31/ext/standard/info.c
diff -c php31/ext/standard/info.c:2.1 php31/ext/standard/info.c:2.2
*** php31/ext/standard/info.c:2.1 Fri Aug 14 13:08:22 1998
--- php31/ext/standard/info.c Fri Aug 14 19:57:41 1998
***************
*** 140,146 ****
PHP3_CONF_STR("doc_root", php3_ini_master.doc_root, GLOBAL(php3_ini)->doc_root);
PHP3_CONF_STR("user_dir", php3_ini_master.user_dir, GLOBAL(php3_ini)->user_dir);
PHP3_CONF_LONG("safe_mode", php3_ini_master.safe_mode, GLOBAL(php3_ini)->safe_mode);
! PHP3_CONF_STR("fopen_basedir", php3_ini_master.fopen_basedir,
GLOBAL(php3_ini)->fopen_basedir);
PHP3_CONF_LONG("track_vars", php3_ini_master.track_vars,
GLOBAL(php3_ini)->track_vars);
PHP3_CONF_STR("safe_mode_exec_dir", php3_ini_master.safe_mode_exec_dir,
GLOBAL(php3_ini)->safe_mode_exec_dir);
PHP3_CONF_STR("cgi_ext", php3_ini_master.cgi_ext, GLOBAL(php3_ini)->cgi_ext);
--- 140,146 ----
PHP3_CONF_STR("doc_root", php3_ini_master.doc_root, GLOBAL(php3_ini)->doc_root);
PHP3_CONF_STR("user_dir", php3_ini_master.user_dir, GLOBAL(php3_ini)->user_dir);
PHP3_CONF_LONG("safe_mode", php3_ini_master.safe_mode, GLOBAL(php3_ini)->safe_mode);
! PHP3_CONF_STR("open_basedir", php3_ini_master.open_basedir,
GLOBAL(php3_ini)->open_basedir);
PHP3_CONF_LONG("track_vars", php3_ini_master.track_vars,
GLOBAL(php3_ini)->track_vars);
PHP3_CONF_STR("safe_mode_exec_dir", php3_ini_master.safe_mode_exec_dir,
GLOBAL(php3_ini)->safe_mode_exec_dir);
PHP3_CONF_STR("cgi_ext", php3_ini_master.cgi_ext, GLOBAL(php3_ini)->cgi_ext);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net