andi Sun Feb 19 00:55:21 2006 UTC
Modified files:
/php-src/ext/com_dotnet com_persist.c
/php-src/ext/curl interface.c
/php-src/ext/dbase dbase.c
/php-src/ext/fdf fdf.c
/php-src/ext/filepro filepro.c
/php-src/ext/gd php_gd.h
/php-src/ext/ming ming.c
/php-src/ext/oci8 oci8_interface.c oci8_lob.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/openssl openssl.c
/php-src/ext/pdo_sqlite sqlite_driver.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/posix posix.c
/php-src/ext/pspell pspell.c
/php-src/ext/session session.c
/php-src/ext/sqlite pdo_sqlite2.c sess_sqlite.c sqlite.c
/php-src/ext/standard basic_functions.c dir.c file.c filestat.c
link.c
/php-src/ext/tidy tidy.c
Log:
Start nuking safe_mode. Still a lot of work to do...
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_persist.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/com_dotnet/com_persist.c
diff -u php-src/ext/com_dotnet/com_persist.c:1.7
php-src/ext/com_dotnet/com_persist.c:1.8
--- php-src/ext/com_dotnet/com_persist.c:1.7 Wed Feb 1 07:42:13 2006
+++ php-src/ext/com_dotnet/com_persist.c Sun Feb 19 00:55:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_persist.c,v 1.7 2006/02/01 07:42:13 sebastian Exp $ */
+/* $Id: com_persist.c,v 1.8 2006/02/19 00:55:19 andi Exp $ */
/* Infrastructure for working with persistent COM objects.
* Implements: IStream* wrapper for PHP streams.
@@ -390,10 +390,6 @@
if (filename) {
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
-
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
RETURN_FALSE;
@@ -451,14 +447,11 @@
php_com_throw_exception(E_INVALIDARG, "Invalid
arguments" TSRMLS_CC);
return;
}
-
+
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ efree(fullpath);
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.74&r2=1.75&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.74 php-src/ext/curl/interface.c:1.75
--- php-src/ext/curl/interface.c:1.74 Thu Jan 26 13:20:56 2006
+++ php-src/ext/curl/interface.c Sun Feb 19 00:55:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.74 2006/01/26 13:20:56 mike Exp $ */
+/* $Id: interface.c,v 1.75 2006/02/19 00:55:19 andi Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -157,8 +157,8 @@
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
- if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&
\
- strncasecmp(str, "file:", sizeof("file:") - 1) == 0)
\
+ if (((PG(open_basedir) && *PG(open_basedir))) &&
\
+ strncasecmp(str, "file:", sizeof("file:") - 1) == 0)
\
{
\
php_url *tmp_url;
\
\
@@ -167,8 +167,7 @@
RETURN_FALSE;
\
}
\
\
- if (tmp_url->query || tmp_url->fragment ||
php_check_open_basedir(tmp_url->path TSRMLS_CC) ||
\
- (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+",
CHECKUID_CHECK_MODE_PARAM)) \
+ if (tmp_url->query || tmp_url->fragment ||
php_check_open_basedir(tmp_url->path TSRMLS_CC)) \
) {
\
php_url_free(tmp_url);
\
RETURN_FALSE;
\
@@ -1283,7 +1282,7 @@
if (*postval == '@') {
++postval;
/* safe_mode / open_basedir
check */
- if
(php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) &&
!php_checkuid(postval, "rb+", CHECKUID_CHECK_MODE_PARAM))) {
+ if
(php_check_open_basedir(postval TSRMLS_CC)) {
RETURN_FALSE;
}
error = curl_formadd(&first,
&last,
@@ -1369,7 +1368,7 @@
convert_to_string_ex(zvalue);
- if (php_check_open_basedir(Z_STRVAL_PP(zvalue)
TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+",
CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(Z_STRVAL_PP(zvalue)
TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/dbase/dbase.c?r1=1.76&r2=1.77&diff_format=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.76 php-src/ext/dbase/dbase.c:1.77
--- php-src/ext/dbase/dbase.c:1.76 Sun Jan 1 13:09:49 2006
+++ php-src/ext/dbase/dbase.c Sun Feb 19 00:55:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.76 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: dbase.c,v 1.77 2006/02/19 00:55:19 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -134,10 +134,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(dbf_name) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -590,10 +586,6 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array as
second parameter");
RETURN_FALSE;
}
-
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/fdf/fdf.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.92 php-src/ext/fdf/fdf.c:1.93
--- php-src/ext/fdf/fdf.c:1.92 Sun Jan 1 13:09:50 2006
+++ php-src/ext/fdf/fdf.c Sun Feb 19 00:55:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.92 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: fdf.c,v 1.93 2006/02/19 00:55:19 andi Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -239,7 +239,7 @@
convert_to_string_ex(file);
- if (php_check_open_basedir(Z_STRVAL_PP(file) TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(file), "wb+",
CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(Z_STRVAL_PP(file) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -530,7 +530,7 @@
convert_to_long_ex(face);
convert_to_string_ex(filename);
- if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(filename), "wb+",
CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -585,7 +585,7 @@
ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf);
- if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) &&
!php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(filename TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -725,7 +725,7 @@
return;
}
- if (php_check_open_basedir(filename TSRMLS_CC) || (PG(safe_mode) &&
!php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(filename TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -802,7 +802,7 @@
ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf);
if(filename) {
- if (php_check_open_basedir(filename TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(filename, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(filename TSRMLS_CC)) {
RETURN_FALSE;
}
err = FDFSave(fdf, filename);
@@ -922,7 +922,7 @@
convert_to_string_ex(template);
convert_to_long_ex(rename);
- if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC) ||
(PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(filename), "wb+",
CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -1492,7 +1492,7 @@
ZEND_FETCH_RESOURCE(fdf, FDFDoc *, &r_fdf, -1, "fdf", le_fdf);
- if (php_check_open_basedir(savepath TSRMLS_CC) || (PG(safe_mode) &&
!php_checkuid(savepath, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
+ if (php_check_open_basedir(savepath TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/filepro/filepro.c?r1=1.59&r2=1.60&diff_format=u
Index: php-src/ext/filepro/filepro.c
diff -u php-src/ext/filepro/filepro.c:1.59 php-src/ext/filepro/filepro.c:1.60
--- php-src/ext/filepro/filepro.c:1.59 Sun Jan 1 13:09:50 2006
+++ php-src/ext/filepro/filepro.c Sun Feb 19 00:55:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filepro.c,v 1.59 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: filepro.c,v 1.60 2006/02/19 00:55:19 andi Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -268,10 +268,6 @@
snprintf(workbuf, sizeof(workbuf), "%s/map", Z_STRVAL_PP(dir));
- if (PG(safe_mode) && (!php_checkuid(workbuf, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -362,10 +358,6 @@
/* Now read the records in, moving forward recsize-1 bytes each time */
snprintf(workbuf, sizeof(workbuf), "%s/key", FP_GLOBAL(fp_database));
- if (PG(safe_mode) && (!php_checkuid(workbuf, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -574,10 +566,6 @@
/* Now read the record in */
snprintf(workbuf, sizeof(workbuf), "%s/key", FP_GLOBAL(fp_database));
- if (PG(safe_mode) && (!php_checkuid(workbuf, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/php_gd.h?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.64 php-src/ext/gd/php_gd.h:1.65
--- php-src/ext/gd/php_gd.h:1.64 Sun Jan 1 13:09:50 2006
+++ php-src/ext/gd/php_gd.h Sun Feb 19 00:55:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.64 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: php_gd.h,v 1.65 2006/02/19 00:55:19 andi Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -32,8 +32,7 @@
/* open_basedir and safe_mode checks */
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg)
\
- if (!filename || php_check_open_basedir(filename TSRMLS_CC) ||
\
- (PG(safe_mode) && !php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) \
+ if (!filename || php_check_open_basedir(filename TSRMLS_CC))
\
) {
\
php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg);
\
RETURN_FALSE;
\
http://cvs.php.net/viewcvs.cgi/php-src/ext/ming/ming.c?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.81 php-src/ext/ming/ming.c:1.82
--- php-src/ext/ming/ming.c:1.81 Sun Jan 1 13:09:51 2006
+++ php-src/ext/ming/ming.c Sun Feb 19 00:55:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.81 2006/01/01 13:09:51 sniper Exp $ */
+/* $Id: ming.c,v 1.82 2006/02/19 00:55:19 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -79,7 +79,7 @@
#endif
#define PHP_MING_FILE_CHK(file) \
- if ((PG(safe_mode) && !php_checkuid((file), NULL,
CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) { \
+ if (php_check_open_basedir((file) TSRMLS_CC)) { \
RETURN_FALSE; \
} \
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.11
php-src/ext/oci8/oci8_interface.c:1.12
--- php-src/ext/oci8/oci8_interface.c:1.11 Tue Jan 31 18:36:59 2006
+++ php-src/ext/oci8/oci8_interface.c Sun Feb 19 00:55:20 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.11 2006/01/31 18:36:59 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.12 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -909,10 +909,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(filename TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -1680,12 +1676,6 @@
int user_len, pass_old_len, pass_new_len, dbname_len;
php_oci_connection *connection;
- /* Disable in Safe Mode */
- if (PG(safe_mode)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "is disabled in
Safe Mode");
- RETURN_FALSE;
- }
-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "rsss", &z_connection, &user, &user_len, &pass_old, &pass_old_len,
&pass_new, &pass_new_len) == SUCCESS) {
PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection);
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.9 php-src/ext/oci8/oci8_lob.c:1.10
--- php-src/ext/oci8/oci8_lob.c:1.9 Thu Jan 5 13:40:10 2006
+++ php-src/ext/oci8/oci8_lob.c Sun Feb 19 00:55:20 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_lob.c,v 1.9 2006/01/05 13:40:10 tony2001 Exp $ */
+/* $Id: oci8_lob.c,v 1.10 2006/02/19 00:55:20 andi Exp $ */
@@ -504,7 +504,7 @@
char buf[8192];
ub4 offset = 1;
- if ((PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)) {
+ if (php_check_open_basedir(filename TSRMLS_CC)) {
return 1;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc.c?r1=1.193&r2=1.194&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.193 php-src/ext/odbc/php_odbc.c:1.194
--- php-src/ext/odbc/php_odbc.c:1.193 Sun Jan 1 13:09:52 2006
+++ php-src/ext/odbc/php_odbc.c Sun Feb 19 00:55:20 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.193 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.194 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1017,13 +1017,6 @@
filename = estrndup(&Z_STRVAL_PP(tmp)[1],
Z_STRLEN_PP(tmp) - 2);
filename[strlen(filename)] = '\0';
- /* Check for safe mode. */
- if (PG(safe_mode) && (!php_checkuid(filename,
NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
- efree(filename);
- efree(params);
- RETURN_FALSE;
- }
-
/* Check the basedir */
if (php_check_open_basedir(filename TSRMLS_CC))
{
efree(filename);
http://cvs.php.net/viewcvs.cgi/php-src/ext/openssl/openssl.c?r1=1.102&r2=1.103&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.102 php-src/ext/openssl/openssl.c:1.103
--- php-src/ext/openssl/openssl.c:1.102 Sun Jan 1 13:09:52 2006
+++ php-src/ext/openssl/openssl.c Sun Feb 19 00:55:20 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.102 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: openssl.c,v 1.103 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -179,12 +179,9 @@
}
/* }}} */
-/* {{{ openssl safe_mode & open_basedir checks */
+/* {{{ openssl open_basedir checks */
inline static int php_openssl_safe_mode_chk(char *filename TSRMLS_DC)
{
- if (PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- return -1;
- }
if (php_check_open_basedir(filename TSRMLS_CC)) {
return -1;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/sqlite_driver.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_driver.c
diff -u php-src/ext/pdo_sqlite/sqlite_driver.c:1.28
php-src/ext/pdo_sqlite/sqlite_driver.c:1.29
--- php-src/ext/pdo_sqlite/sqlite_driver.c:1.28 Sun Jan 1 13:09:53 2006
+++ php-src/ext/pdo_sqlite/sqlite_driver.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_driver.c,v 1.28 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: sqlite_driver.c,v 1.29 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -677,11 +677,6 @@
if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) {
char *fullpath = expand_filepath(filename, NULL TSRMLS_CC);
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- efree(fullpath);
- return NULL;
- }
-
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
efree(fullpath);
return NULL;
@@ -739,7 +734,7 @@
if (!filename) {
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0
TSRMLS_CC,
- "safe_mode/open_basedir prohibits opening %s",
+ "open_basedir prohibits opening %s",
dbh->data_source);
goto cleanup;
}
@@ -752,7 +747,7 @@
goto cleanup;
}
- if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
+ if ((PG(open_basedir) && *PG(open_basedir))) {
sqlite3_set_authorizer(H->db, authorizer, NULL);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.339&r2=1.340&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.339 php-src/ext/pgsql/pgsql.c:1.340
--- php-src/ext/pgsql/pgsql.c:1.339 Sun Jan 1 13:09:53 2006
+++ php-src/ext/pgsql/pgsql.c Sun Feb 19 00:55:20 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.339 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: pgsql.c,v 1.340 2006/02/19 00:55:20 andi Exp $ */
#include <stdlib.h>
@@ -2808,10 +2808,6 @@
WRONG_PARAM_COUNT;
}
- if (PG(safe_mode) &&(!php_checkuid(file_in, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(file_in TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -2906,10 +2902,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) &&(!php_checkuid(file_out, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(file_out TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/posix/posix.c?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.73 php-src/ext/posix/posix.c:1.74
--- php-src/ext/posix/posix.c:1.73 Sun Jan 1 13:09:53 2006
+++ php-src/ext/posix/posix.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.73 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: posix.c,v 1.74 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -143,7 +143,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.73 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.74 $");
php_info_print_table_end();
}
/* }}} */
@@ -653,10 +653,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && (!php_checkuid(path, NULL,
CHECKUID_ALLOW_ONLY_DIR))) {
- RETURN_FALSE;
- }
-
result = mkfifo(path, mode);
if (result < 0) {
POSIX_G(last_error) = errno;
@@ -687,8 +683,7 @@
RETURN_FALSE;
}
- if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
- (PG(safe_mode) && (!php_checkuid(path, NULL,
CHECKUID_ALLOW_ONLY_DIR)))) {
+ if (php_check_open_basedir_ex(path, 0 TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -767,8 +762,7 @@
path = expand_filepath(filename, NULL TSRMLS_CC);
- if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
- (PG(safe_mode) && (!php_checkuid_ex(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS)))) {
+ if (php_check_open_basedir_ex(path, 0 TSRMLS_CC)) {
efree(path);
POSIX_G(last_error) = EPERM;
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/pspell/pspell.c?r1=1.49&r2=1.50&diff_format=u
Index: php-src/ext/pspell/pspell.c
diff -u php-src/ext/pspell/pspell.c:1.49 php-src/ext/pspell/pspell.c:1.50
--- php-src/ext/pspell/pspell.c:1.49 Sun Jan 1 13:09:53 2006
+++ php-src/ext/pspell/pspell.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pspell.c,v 1.49 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: pspell.c,v 1.50 2006/02/19 00:55:20 andi Exp $ */
#define IS_EXT_MODULE
@@ -281,10 +281,6 @@
convert_to_string_ex(personal);
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(personal), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(personal) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -782,10 +778,6 @@
convert_to_string_ex(value);
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(value), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(value) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -840,10 +832,6 @@
convert_to_string_ex(repl);
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(repl), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(repl) TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.428&r2=1.429&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.428 php-src/ext/session/session.c:1.429
--- php-src/ext/session/session.c:1.428 Fri Feb 10 07:41:59 2006
+++ php-src/ext/session/session.c Sun Feb 19 00:55:20 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.428 2006/02/10 07:41:59 rasmus Exp $ */
+/* $Id: session.c,v 1.429 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -137,10 +137,6 @@
{
/* Only do the safemode/open_basedir check at runtime */
if (stage == PHP_INI_STAGE_RUNTIME) {
- if (PG(safe_mode) && (!php_checkuid(new_value, NULL,
CHECKUID_ALLOW_ONLY_DIR))) {
- return FAILURE;
- }
-
if (php_check_open_basedir(new_value TSRMLS_CC)) {
return FAILURE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/sqlite/pdo_sqlite2.c
diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.10
php-src/ext/sqlite/pdo_sqlite2.c:1.11
--- php-src/ext/sqlite/pdo_sqlite2.c:1.10 Sun Jan 1 13:09:54 2006
+++ php-src/ext/sqlite/pdo_sqlite2.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite2.c,v 1.10 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: pdo_sqlite2.c,v 1.11 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -518,11 +518,6 @@
if (strncmp(filename, ":memory:", sizeof(":memory:")-1)) {
char *fullpath = expand_filepath(filename, NULL TSRMLS_CC);
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- efree(fullpath);
- return NULL;
- }
-
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
efree(fullpath);
return NULL;
@@ -581,7 +576,7 @@
if (!filename) {
zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0
TSRMLS_CC,
- "safe_mode/open_basedir prohibits opening %s",
+ "open_basedir prohibits opening %s",
dbh->data_source);
goto cleanup;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sess_sqlite.c?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.19
php-src/ext/sqlite/sess_sqlite.c:1.20
--- php-src/ext/sqlite/sess_sqlite.c:1.19 Sun Jan 1 13:09:54 2006
+++ php-src/ext/sqlite/sess_sqlite.c Sun Feb 19 00:55:20 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sess_sqlite.c,v 1.19 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: sess_sqlite.c,v 1.20 2006/02/19 00:55:20 andi Exp $ */
#include "php.h"
@@ -42,7 +42,6 @@
char *errmsg = NULL;
sqlite *db;
- /* TODO: do we need a safe_mode check here? */
db = sqlite_open(save_path, 0666, &errmsg);
if (db == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.185&r2=1.186&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.185 php-src/ext/sqlite/sqlite.c:1.186
--- php-src/ext/sqlite/sqlite.c:1.185 Thu Feb 16 01:12:51 2006
+++ php-src/ext/sqlite/sqlite.c Sun Feb 19 00:55:20 2006
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.185 2006/02/16 01:12:51 helly Exp $
+ $Id: sqlite.c,v 1.186 2006/02/19 00:55:20 andi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -728,10 +728,6 @@
case SQLITE_COPY:
if (strncmp(arg4, ":memory:", sizeof(":memory:") - 1)) {
TSRMLS_FETCH();
- if (PG(safe_mode) && (!php_checkuid(arg4, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- return SQLITE_DENY;
- }
-
if (php_check_open_basedir(arg4 TSRMLS_CC)) {
return SQLITE_DENY;
}
@@ -740,10 +736,7 @@
#ifdef SQLITE_ATTACH
case SQLITE_ATTACH:
if (strncmp(arg3, ":memory:", sizeof(":memory:") - 1)) {
- TSRMLS_FETCH();
- if (PG(safe_mode) && (!php_checkuid(arg3, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- return SQLITE_DENY;
- }
+ TSRMLS_FETCH();
if (php_check_open_basedir(arg3 TSRMLS_CC)) {
return SQLITE_DENY;
@@ -1134,7 +1127,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.185 2006/02/16 01:12:51 helly Exp
$");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.186 2006/02/19 00:55:20 andi Exp
$");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1183,10 +1176,10 @@
* then fail with a busy status code */
sqlite_busy_timeout(sdb, 60000);
- /* authorizer hook so we can enforce safe mode
+ /* authorizer hook so we can enforce open_basedir
* Note: the declaration of php_sqlite_authorizer is correct for 2.8.2
of libsqlite,
* and IS backwards binary compatible with earlier versions */
- if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
+ if ((PG(open_basedir) && *PG(open_basedir))) {
sqlite_set_authorizer(sdb, php_sqlite_authorizer, NULL);
}
@@ -1239,12 +1232,9 @@
if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
/* resolve the fully-qualified path name to use as the hash key
*/
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
-
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+
+ if (php_check_open_basedir(fullpath TSRMLS_CC)) {
+ efree(fullpath);
RETURN_FALSE;
}
} else {
@@ -1316,16 +1306,6 @@
/* resolve the fully-qualified path name to use as the hash key
*/
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- php_std_error_handling();
- efree(fullpath);
- if (object) {
- RETURN_NULL();
- } else {
- RETURN_FALSE;
- }
- }
-
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
php_std_error_handling();
efree(fullpath);
@@ -1371,12 +1351,6 @@
/* resolve the fully-qualified path name to use as the hash key
*/
fullpath = expand_filepath(filename, NULL TSRMLS_CC);
- if (PG(safe_mode) && (!php_checkuid(fullpath, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- efree(fullpath);
- php_std_error_handling();
- RETURN_NULL();
- }
-
if (php_check_open_basedir(fullpath TSRMLS_CC)) {
efree(fullpath);
php_std_error_handling();
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.750&r2=1.751&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.750
php-src/ext/standard/basic_functions.c:1.751
--- php-src/ext/standard/basic_functions.c:1.750 Thu Feb 16 10:13:23 2006
+++ php-src/ext/standard/basic_functions.c Sun Feb 19 00:55:20 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.750 2006/02/16 10:13:23 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.751 2006/02/19 00:55:20 andi Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2450,10 +2450,6 @@
}
convert_to_string(filename);
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_P(filename), NULL,
CHECKUID_ALLOW_ONLY_FILE))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_P(filename) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -2678,19 +2674,15 @@
#define _CHECK_PATH(var, ini) php_ini_check_path(Z_STRVAL_PP(var),
Z_STRLEN_PP(var), ini, sizeof(ini))
- /* safe_mode & basedir check */
- if (PG(safe_mode) || PG(open_basedir)) {
+ /* basedir check */
+ if (PG(open_basedir)) {
if (_CHECK_PATH(varname, "error_log") ||
_CHECK_PATH(varname, "java.class.path") ||
_CHECK_PATH(varname, "java.home") ||
_CHECK_PATH(varname, "java.library.path") ||
_CHECK_PATH(varname, "session.save_path") ||
_CHECK_PATH(varname, "vpopmail.directory")) {
- if (PG(safe_mode)
&&(!php_checkuid(Z_STRVAL_PP(new_value), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
- zval_dtor(return_value);
- RETURN_FALSE;
- }
-
+
if (php_check_open_basedir(Z_STRVAL_PP(new_value)
TSRMLS_CC)) {
zval_dtor(return_value);
RETURN_FALSE;
@@ -3083,10 +3075,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(new_path), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(new_path) TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/dir.c?r1=1.151&r2=1.152&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.151 php-src/ext/standard/dir.c:1.152
--- php-src/ext/standard/dir.c:1.151 Mon Feb 13 10:23:58 2006
+++ php-src/ext/standard/dir.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.151 2006/02/13 10:23:58 dmitry Exp $ */
+/* $Id: dir.c,v 1.152 2006/02/19 00:55:20 andi Exp $ */
/* {{{ includes/startup/misc */
@@ -286,9 +286,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && !php_checkuid(str, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
ret = VCWD_CHDIR(str);
if (ret != 0) {
@@ -422,9 +419,7 @@
/* we assume that any glob pattern will match files from one directory
only
so checking the dirname of the first match should be sufficient */
strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
- if (PG(safe_mode) && (!php_checkuid(cwd, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
+
if (php_check_open_basedir(cwd TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.416&r2=1.417&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.416 php-src/ext/standard/file.c:1.417
--- php-src/ext/standard/file.c:1.416 Tue Jan 17 12:18:52 2006
+++ php-src/ext/standard/file.c Sun Feb 19 00:55:20 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.416 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: file.c,v 1.417 2006/02/19 00:55:20 andi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1415,10 +1415,6 @@
{
int ret;
- if (PG(safe_mode) && (!php_checkuid(dir, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- return -1;
- }
-
if (php_check_open_basedir(dir TSRMLS_CC)) {
return -1;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.142&r2=1.143&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.142
php-src/ext/standard/filestat.c:1.143
--- php-src/ext/standard/filestat.c:1.142 Wed Jan 4 17:34:44 2006
+++ php-src/ext/standard/filestat.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.142 2006/01/04 17:34:44 rrichards Exp $ */
+/* $Id: filestat.c,v 1.143 2006/02/19 00:55:20 andi Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -348,10 +348,6 @@
gid = Z_LVAL_PP(group);
}
- if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
- RETURN_FALSE;
- }
-
/* Check the basedir */
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
@@ -422,10 +418,6 @@
uid = Z_LVAL_PP(user);
}
- if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
- RETURN_FALSE;
- }
-
/* Check the basedir */
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
@@ -486,10 +478,6 @@
convert_to_string_ex(filename);
convert_to_long_ex(mode);
- if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_ALLOW_FILE_NOT_EXISTS))) {
- RETURN_FALSE;
- }
-
/* Check the basedir */
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
@@ -546,10 +534,6 @@
}
convert_to_string_ex(filename);
- if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
-
/* Check the basedir */
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/link.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.54 php-src/ext/standard/link.c:1.55
--- php-src/ext/standard/link.c:1.54 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/link.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: link.c,v 1.54 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: link.c,v 1.55 2006/02/19 00:55:20 andi Exp $ */
#include "php.h"
#include "php_filestat.h"
@@ -63,10 +63,6 @@
}
convert_to_string_ex(filename);
- if (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -132,14 +128,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && !php_checkuid(dest_p, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
-
- if (PG(safe_mode) && !php_checkuid(source_p, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(dest_p TSRMLS_CC)) {
RETURN_FALSE;
}
@@ -187,14 +175,6 @@
RETURN_FALSE;
}
- if (PG(safe_mode) && !php_checkuid(dest_p, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
-
- if (PG(safe_mode) && !php_checkuid(source_p, NULL,
CHECKUID_CHECK_FILE_AND_DIR)) {
- RETURN_FALSE;
- }
-
if (php_check_open_basedir(dest_p TSRMLS_CC)) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.73 php-src/ext/tidy/tidy.c:1.74
--- php-src/ext/tidy/tidy.c:1.73 Sun Jan 1 13:09:56 2006
+++ php-src/ext/tidy/tidy.c Sun Feb 19 00:55:20 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.73 2006/01/01 13:09:56 sniper Exp $ */
+/* $Id: tidy.c,v 1.74 2006/02/19 00:55:20 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -85,7 +85,7 @@
_php_tidy_apply_config_array(_doc, HASH_OF(_val) TSRMLS_CC); \
} else { \
convert_to_string_ex(&_val); \
- TIDY_SAFE_MODE_CHECK(Z_STRVAL_P(_val)); \
+ TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_P(_val)); \
if (tidyLoadConfig(_doc, Z_STRVAL_P(_val)) < 0) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not load
configuration file '%s'", Z_STRVAL_P(_val)); \
RETURN_FALSE; \
@@ -163,8 +163,8 @@
zend_hash_update(_table, #_key, sizeof(#_key), (void *)&tmp,
sizeof(zval *), NULL); \
}
-#define TIDY_SAFE_MODE_CHECK(filename) \
-if ((PG(safe_mode) && (!php_checkuid(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)) {
\
+#define TIDY_OPEN_BASEDIR_CHECK(filename) \
+if (php_check_open_basedir(filename TSRMLS_CC)) { \
RETURN_FALSE; \
} \
@@ -461,7 +461,7 @@
_php_tidy_apply_config_array(doc, HASH_OF(config)
TSRMLS_CC);
} else {
convert_to_string_ex(&config);
- TIDY_SAFE_MODE_CHECK(Z_STRVAL_P(config));
+ TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_P(config));
if (tidyLoadConfig(doc, Z_STRVAL_P(config)) < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Could not load configuration file '%s'", Z_STRVAL_P(config));
RETVAL_FALSE;
@@ -983,7 +983,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.73 2006/01/01 13:09:56 sniper Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.74 2006/02/19 00:55:20 andi Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
