andi Sun Feb 19 04:29:42 2006 UTC
Modified files:
/php-src/ext/bz2 bz2.c
/php-src/ext/dba dba.c
/php-src/ext/exif exif.c
/php-src/ext/ftp php_ftp.c
/php-src/ext/gd gd.c
/php-src/ext/hash hash.c hash_md.c hash_sha.c
/php-src/ext/imap php_imap.c
/php-src/ext/libxml libxml.c
/php-src/ext/mime_magic mime_magic.c
/php-src/ext/ming ming.c
/php-src/ext/oci8 oci8_interface.c
/php-src/ext/pdo pdo_dbh.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/soap php_http.c php_xml.c
/php-src/ext/spl spl_directory.c
/php-src/ext/standard basic_functions.c dir.c file.c fsock.c
http_fopen_wrapper.c image.c md5.c
proc_open.c sha1.c streamsfuncs.c
/php-src/ext/tidy tidy.c
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/zlib zlib.c
/php-src/main main.c network.c
/php-src/main/streams streams.c
Log:
- Get rid of using ENFORCE_SAFE_MODE.
http://cvs.php.net/viewcvs.cgi/php-src/ext/bz2/bz2.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.17 php-src/ext/bz2/bz2.c:1.18
--- php-src/ext/bz2/bz2.c:1.17 Sun Jan 1 13:09:48 2006
+++ php-src/ext/bz2/bz2.c Sun Feb 19 04:29:40 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.17 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: bz2.c,v 1.18 2006/02/19 04:29:40 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -327,7 +327,7 @@
stream = php_stream_bz2open(NULL,
Z_STRVAL_PP(file),
Z_STRVAL_PP(mode),
-
ENFORCE_SAFE_MODE | REPORT_ERRORS,
+
REPORT_ERRORS,
NULL);
} else {
/* If it is a resource, than its a stream resource */
http://cvs.php.net/viewcvs.cgi/php-src/ext/dba/dba.c?r1=1.115&r2=1.116&diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.115 php-src/ext/dba/dba.c:1.116
--- php-src/ext/dba/dba.c:1.115 Sun Jan 1 13:09:49 2006
+++ php-src/ext/dba/dba.c Sun Feb 19 04:29:40 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.115 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: dba.c,v 1.116 2006/02/19 04:29:40 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -753,7 +753,7 @@
/* when in read only mode try to use existing
.lck file first */
/* do not log errors for .lck file while in
read ony mode on .lck file */
lock_file_mode = "rb";
- info->lock.fp =
php_stream_open_wrapper(lock_name, lock_file_mode,
STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag, &opened_path);
+ info->lock.fp =
php_stream_open_wrapper(lock_name, lock_file_mode,
STREAM_MUST_SEEK|IGNORE_PATH|persistent_flag, &opened_path);
}
if (!info->lock.fp) {
/* when not in read mode or failed to open .lck
file read only. now try again in create(write) mode and log errors */
@@ -768,7 +768,7 @@
}
}
if (!info->lock.fp) {
- info->lock.fp = php_stream_open_wrapper(lock_name,
lock_file_mode,
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag,
&opened_path);
+ info->lock.fp = php_stream_open_wrapper(lock_name,
lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|persistent_flag,
&opened_path);
if (info->lock.fp) {
if (lock_dbf) {
/* replace the path info with the real
path of the opened file */
@@ -806,7 +806,7 @@
if (info->lock.fp && lock_dbf) {
info->fp = info->lock.fp; /* use the same stream for
locking and database access */
} else {
- info->fp = php_stream_open_wrapper(info->path,
file_mode,
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE|persistent_flag,
NULL);
+ info->fp = php_stream_open_wrapper(info->path,
file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|persistent_flag, NULL);
}
if (!info->fp) {
dba_close(info TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/exif.c?r1=1.177&r2=1.178&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.177 php-src/ext/exif/exif.c:1.178
--- php-src/ext/exif/exif.c:1.177 Sun Jan 1 13:09:49 2006
+++ php-src/ext/exif/exif.c Sun Feb 19 04:29:40 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.177 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: exif.c,v 1.178 2006/02/19 04:29:40 andi Exp $ */
/* ToDos
*
@@ -115,7 +115,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.177 2006/01/01 13:09:49 sniper Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.178 2006/02/19 04:29:40 andi Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3729,7 +3729,7 @@
ImageInfo->motorola_intel = -1; /* flag as unknown */
- ImageInfo->infile = php_stream_open_wrapper(FileName, "rb",
STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ ImageInfo->infile = php_stream_open_wrapper(FileName, "rb",
STREAM_MUST_SEEK|IGNORE_PATH, NULL);
if (!ImageInfo->infile) {
exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING,
"Unable to open file");
return FALSE;
@@ -4047,7 +4047,7 @@
WRONG_PARAM_COUNT;
convert_to_string_ex(arg1);
- stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
IGNORE_PATH|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
IGNORE_PATH|REPORT_ERRORS, NULL);
if (stream == NULL) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/ftp/php_ftp.c?r1=1.105&r2=1.106&diff_format=u
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.105 php-src/ext/ftp/php_ftp.c:1.106
--- php-src/ext/ftp/php_ftp.c:1.105 Sun Jan 1 13:09:50 2006
+++ php-src/ext/ftp/php_ftp.c Sun Feb 19 04:29:40 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.105 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: php_ftp.c,v 1.106 2006/02/19 04:29:40 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -684,9 +684,9 @@
#endif
if (ftp->autoseek && resumepos) {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "rt+" : "rb+", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "rt+" : "rb+", REPORT_ERRORS, NULL);
if (outstream == NULL) {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", REPORT_ERRORS, NULL);
}
if (outstream != NULL) {
/* if autoresume is wanted seek to end */
@@ -698,7 +698,7 @@
}
}
} else {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", REPORT_ERRORS, NULL);
}
if (outstream == NULL) {
@@ -745,9 +745,9 @@
mode = FTPTYPE_IMAGE;
#endif
if (ftp->autoseek && resumepos) {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "rt+" : "rb+", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "rt+" : "rb+", REPORT_ERRORS, NULL);
if (outstream == NULL) {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", REPORT_ERRORS, NULL);
}
if (outstream != NULL) {
/* if autoresume is wanted seek to end */
@@ -759,7 +759,7 @@
}
}
} else {
- outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ outstream = php_stream_open_wrapper(local, mode ==
FTPTYPE_ASCII ? "wt" : "wb", REPORT_ERRORS, NULL);
}
if (outstream == NULL) {
@@ -941,7 +941,7 @@
ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name,
le_ftpbuf);
XTYPE(xtype, mode);
- if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ?
"rt" : "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL))) {
+ if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ?
"rt" : "rb", REPORT_ERRORS, NULL))) {
RETURN_FALSE;
}
@@ -994,7 +994,7 @@
ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name,
le_ftpbuf);
XTYPE(xtype, mode);
- if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ?
"rt" : "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL))) {
+ if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ?
"rt" : "rb", REPORT_ERRORS, NULL))) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.344&r2=1.345&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.344 php-src/ext/gd/gd.c:1.345
--- php-src/ext/gd/gd.c:1.344 Sun Feb 5 15:53:02 2006
+++ php-src/ext/gd/gd.c Sun Feb 19 04:29:40 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.344 2006/02/05 15:53:02 pajoye Exp $ */
+/* $Id: gd.c,v 1.345 2006/02/19 04:29:40 andi Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -607,7 +607,7 @@
convert_to_string_ex(file);
- stream = php_stream_open_wrapper(Z_STRVAL_PP(file), "rb",
ENFORCE_SAFE_MODE | IGNORE_PATH | IGNORE_URL_WIN | REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(file), "rb", IGNORE_PATH |
IGNORE_URL_WIN | REPORT_ERRORS, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -1400,7 +1400,7 @@
fn = Z_STRVAL_PP(file);
- stream = php_stream_open_wrapper(fn, "rb",
ENFORCE_SAFE_MODE|REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
+ stream = php_stream_open_wrapper(fn, "rb",
REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.21 php-src/ext/hash/hash.c:1.22
--- php-src/ext/hash/hash.c:1.21 Sun Jan 1 13:09:50 2006
+++ php-src/ext/hash/hash.c Sun Feb 19 04:29:40 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash.c,v 1.21 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: hash.c,v 1.22 2006/02/19 04:29:40 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -82,7 +82,7 @@
RETURN_FALSE;
}
if (isfilename) {
- stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL, DEFAULT_CONTEXT);
+ stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS,
NULL, DEFAULT_CONTEXT);
if (!stream) {
/* Stream will report errors opening file */
RETURN_FALSE;
@@ -157,7 +157,7 @@
RETURN_FALSE;
}
if (isfilename) {
- stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL, DEFAULT_CONTEXT);
+ stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS,
NULL, DEFAULT_CONTEXT);
if (!stream) {
/* Stream will report errors opening file */
RETURN_FALSE;
@@ -388,7 +388,7 @@
ZEND_FETCH_RESOURCE(hash, php_hash_data*, &zhash, -1, PHP_HASH_RESNAME,
php_hash_le_hash);
context = php_stream_context_from_zval(zcontext, 0);
- stream = php_stream_open_wrapper_ex(filename, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL, context);
+ stream = php_stream_open_wrapper_ex(filename, "rb", REPORT_ERRORS,
NULL, context);
if (!stream) {
/* Stream will report errors opening file */
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash_md.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/hash/hash_md.c
diff -u php-src/ext/hash/hash_md.c:1.8 php-src/ext/hash/hash_md.c:1.9
--- php-src/ext/hash/hash_md.c:1.8 Sun Jan 1 13:09:50 2006
+++ php-src/ext/hash/hash_md.c Sun Feb 19 04:29:40 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash_md.c,v 1.8 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: hash_md.c,v 1.9 2006/02/19 04:29:40 andi Exp $ */
#include "php_hash.h"
#include "php_hash_md.h"
@@ -136,7 +136,7 @@
return;
}
- stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash_sha.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/hash/hash_sha.c
diff -u php-src/ext/hash/hash_sha.c:1.11 php-src/ext/hash/hash_sha.c:1.12
--- php-src/ext/hash/hash_sha.c:1.11 Sun Jan 1 13:09:50 2006
+++ php-src/ext/hash/hash_sha.c Sun Feb 19 04:29:40 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hash_sha.c,v 1.11 2006/01/01 13:09:50 sniper Exp $ */
+/* $Id: hash_sha.c,v 1.12 2006/02/19 04:29:40 andi Exp $ */
#include "php_hash.h"
#include "php_hash_sha.h"
@@ -131,7 +131,7 @@
return;
}
- stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/imap/php_imap.c?r1=1.215&r2=1.216&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.215 php-src/ext/imap/php_imap.c:1.216
--- php-src/ext/imap/php_imap.c:1.215 Sat Jan 28 08:08:48 2006
+++ php-src/ext/imap/php_imap.c Sun Feb 19 04:29:41 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.215 2006/01/28 08:08:48 mike Exp $ */
+/* $Id: php_imap.c,v 1.216 2006/02/19 04:29:41 andi Exp $ */
#define IMAP41
@@ -1886,7 +1886,7 @@
default:
convert_to_string_ex(&out);
- writer = php_stream_open_wrapper(Z_STRVAL_P(out), "wb",
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+ writer = php_stream_open_wrapper(Z_STRVAL_P(out), "wb",
REPORT_ERRORS, NULL);
break;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.42&r2=1.43&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.42 php-src/ext/libxml/libxml.c:1.43
--- php-src/ext/libxml/libxml.c:1.42 Sun Jan 1 13:09:51 2006
+++ php-src/ext/libxml/libxml.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.42 2006/01/01 13:09:51 sniper Exp $ */
+/* $Id: libxml.c,v 1.43 2006/02/19 04:29:41 andi Exp $ */
#define IS_EXT_MODULE
@@ -283,7 +283,7 @@
that the streams layer puts out at times, but for libxml we
may try to open files that don't exist, but it is not a failure
in xml processing (eg. DTD files) */
- wrapper = php_stream_locate_url_wrapper(resolved_path, &path_to_open,
ENFORCE_SAFE_MODE TSRMLS_CC);
+ wrapper = php_stream_locate_url_wrapper(resolved_path, &path_to_open, 0
TSRMLS_CC);
if (wrapper && read_only && wrapper->wops->url_stat) {
if (wrapper->wops->url_stat(wrapper, path_to_open,
PHP_STREAM_URL_STAT_QUIET, &ssbuf, NULL TSRMLS_CC) == -1) {
if (isescaped) {
@@ -297,7 +297,7 @@
context = zend_fetch_resource(&LIBXML(stream_context)
TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context());
}
- ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
+ ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode,
REPORT_ERRORS, NULL, context);
if (isescaped) {
xmlFree(resolved_path);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.47
php-src/ext/mime_magic/mime_magic.c:1.48
--- php-src/ext/mime_magic/mime_magic.c:1.47 Sun Jan 1 13:09:51 2006
+++ php-src/ext/mime_magic/mime_magic.c Sun Feb 19 04:29:41 2006
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.47 2006/01/01 13:09:51 sniper Exp $
+ $Id: mime_magic.c,v 1.48 2006/02/19 04:29:41 andi Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -1060,7 +1060,7 @@
switch (Z_TYPE_P(what)) {
case IS_STRING:
- stream = php_stream_open_wrapper(Z_STRVAL_P(what), "rb",
IGNORE_PATH | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_P(what), "rb",
IGNORE_PATH | REPORT_ERRORS, NULL);
if (stream == NULL) {
/* We can't open it, but we were able to stat it. */
if(MIME_MAGIC_G(debug))
http://cvs.php.net/viewcvs.cgi/php-src/ext/ming/ming.c?r1=1.82&r2=1.83&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.82 php-src/ext/ming/ming.c:1.83
--- php-src/ext/ming/ming.c:1.82 Sun Feb 19 00:55:19 2006
+++ php-src/ext/ming/ming.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.82 2006/02/19 00:55:19 andi Exp $ */
+/* $Id: ming.c,v 1.83 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1422,7 +1422,7 @@
php_stream * stream;
FILE * file;
- stream = php_stream_open_wrapper(Z_STRVAL_PP(zfile), "rb",
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(zfile), "rb",
REPORT_ERRORS, NULL);
if (stream == NULL) {
RETURN_FALSE;
@@ -2387,7 +2387,7 @@
}
convert_to_string_ex(x);
- stream = php_stream_open_wrapper(Z_STRVAL_PP(x), "wb",
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(x), "wb", REPORT_ERRORS,
NULL);
if (stream == NULL) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.12
php-src/ext/oci8/oci8_interface.c:1.13
--- php-src/ext/oci8/oci8_interface.c:1.12 Sun Feb 19 00:55:20 2006
+++ php-src/ext/oci8/oci8_interface.c Sun Feb 19 04:29:41 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.12 2006/02/19 00:55:20 andi Exp $ */
+/* $Id: oci8_interface.c,v 1.13 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -913,7 +913,7 @@
RETURN_FALSE;
}
- stream = php_stream_open_wrapper_ex(filename, "w", ENFORCE_SAFE_MODE |
REPORT_ERRORS, NULL, NULL);
+ stream = php_stream_open_wrapper_ex(filename, "w", REPORT_ERRORS, NULL,
NULL);
block_length = PHP_OCI_LOB_BUFFER_SIZE;
if (block_length > length) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.111&r2=1.112&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.111 php-src/ext/pdo/pdo_dbh.c:1.112
--- php-src/ext/pdo/pdo_dbh.c:1.111 Mon Feb 13 10:23:57 2006
+++ php-src/ext/pdo/pdo_dbh.c Sun Feb 19 04:29:41 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.111 2006/02/13 10:23:57 dmitry Exp $ */
+/* $Id: pdo_dbh.c,v 1.112 2006/02/19 04:29:41 andi Exp $ */
/* The PDO Database Handle Class */
@@ -183,7 +183,7 @@
php_stream *stream;
char *dsn = NULL;
- stream = php_stream_open_wrapper(uri, "rb",
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(uri, "rb", REPORT_ERRORS, NULL);
if (stream) {
dsn = php_stream_get_line(stream, buf, buflen, NULL);
php_stream_close(stream);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pgsql/pgsql.c?r1=1.340&r2=1.341&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.340 php-src/ext/pgsql/pgsql.c:1.341
--- php-src/ext/pgsql/pgsql.c:1.340 Sun Feb 19 00:55:20 2006
+++ php-src/ext/pgsql/pgsql.c Sun Feb 19 04:29:41 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.340 2006/02/19 00:55:20 andi Exp $ */
+/* $Id: pgsql.c,v 1.341 2006/02/19 04:29:41 andi Exp $ */
#include <stdlib.h>
@@ -2354,7 +2354,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL
link", le_link, le_plink);
convert_to_string_ex(z_filename);
- stream = php_stream_open_wrapper(Z_STRVAL_PP(z_filename), mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(z_filename), mode,
REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.86&r2=1.87&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.86 php-src/ext/soap/php_http.c:1.87
--- php-src/ext/soap/php_http.c:1.86 Tue Feb 7 12:57:43 2006
+++ php-src/ext/soap/php_http.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.86 2006/02/07 12:57:43 dmitry Exp $ */
+/* $Id: php_http.c,v 1.87 2006/02/19 04:29:41 andi Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -147,7 +147,7 @@
namelen = spprintf(&name, 0, "%s://%s:%d", (use_ssl && !*use_proxy)?
"ssl" : "tcp", host, port);
stream = php_stream_xport_create(name, namelen,
- ENFORCE_SAFE_MODE | REPORT_ERRORS,
+ REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT,
NULL /*persistent_id*/,
timeout,
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_xml.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/soap/php_xml.c
diff -u php-src/ext/soap/php_xml.c:1.26 php-src/ext/soap/php_xml.c:1.27
--- php-src/ext/soap/php_xml.c:1.26 Sun Jan 1 13:09:54 2006
+++ php-src/ext/soap/php_xml.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_xml.c,v 1.26 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: php_xml.c,v 1.27 2006/02/19 04:29:41 andi Exp $ */
#include "php_soap.h"
#include "libxml/parser.h"
@@ -176,7 +176,7 @@
void *php_stream_xmlIO_open_wrapper(const char *filename)
{
TSRMLS_FETCH();
- return php_stream_open_wrapper((char*)filename, "rb",
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ return php_stream_open_wrapper((char*)filename, "rb", REPORT_ERRORS,
NULL);
}
int php_stream_xmlIO_read(void *context, char *buffer, int len)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.75&r2=1.76&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.75
php-src/ext/spl/spl_directory.c:1.76
--- php-src/ext/spl/spl_directory.c:1.75 Mon Feb 13 10:23:57 2006
+++ php-src/ext/spl/spl_directory.c Sun Feb 19 04:29:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.75 2006/02/13 10:23:57 dmitry Exp $ */
+/* $Id: spl_directory.c,v 1.76 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -174,7 +174,7 @@
{
intern->type = SPL_FS_DIR;
intern->path_len = strlen(path);
- intern->u.dir.dirp = php_stream_opendir(path,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ intern->u.dir.dirp = php_stream_opendir(path, REPORT_ERRORS, NULL);
if (intern->path_len && (path[intern->path_len-1] == '/'
#if defined(PHP_WIN32) || defined(NETWARE)
@@ -202,7 +202,7 @@
{
intern->type = SPL_FS_FILE;
intern->u.file.context =
php_stream_context_from_zval(intern->u.file.zcontext, 0);
- intern->u.file.stream = php_stream_open_wrapper_ex(intern->file_name,
intern->u.file.open_mode, (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE
| REPORT_ERRORS, NULL, intern->u.file.context);
+ intern->u.file.stream = php_stream_open_wrapper_ex(intern->file_name,
intern->u.file.open_mode, (use_include_path ? USE_PATH : 0) | REPORT_ERRORS,
NULL, intern->u.file.context);
if (intern->u.file.stream == NULL) {
if (!EG(exception)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.751&r2=1.752&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.751
php-src/ext/standard/basic_functions.c:1.752
--- php-src/ext/standard/basic_functions.c:1.751 Sun Feb 19 00:55:20 2006
+++ php-src/ext/standard/basic_functions.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.751 2006/02/19 00:55:20 andi Exp $ */
+/* $Id: basic_functions.c,v 1.752 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2033,7 +2033,7 @@
break;
case 3: /*save to a file */
- stream = php_stream_open_wrapper(opt, "a", IGNORE_URL |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(opt, "a", IGNORE_URL |
REPORT_ERRORS, NULL);
if (!stream)
return FAILURE;
php_stream_write(stream, message, strlen(message));
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/dir.c?r1=1.152&r2=1.153&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.152 php-src/ext/standard/dir.c:1.153
--- php-src/ext/standard/dir.c:1.152 Sun Feb 19 00:55:20 2006
+++ php-src/ext/standard/dir.c Sun Feb 19 04:29:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.152 2006/02/19 00:55:20 andi Exp $ */
+/* $Id: dir.c,v 1.153 2006/02/19 04:29:41 andi Exp $ */
/* {{{ includes/startup/misc */
@@ -192,7 +192,7 @@
context = php_stream_context_from_zval(zcontext, 0);
}
- dirp = php_stream_opendir(dirname, ENFORCE_SAFE_MODE|REPORT_ERRORS,
context);
+ dirp = php_stream_opendir(dirname, REPORT_ERRORS, context);
if (dirp == NULL) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.418&r2=1.419&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.418 php-src/ext/standard/file.c:1.419
--- php-src/ext/standard/file.c:1.418 Sun Feb 19 03:07:39 2006
+++ php-src/ext/standard/file.c Sun Feb 19 04:29:41 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.418 2006/02/19 03:07:39 andi Exp $ */
+/* $Id: file.c,v 1.419 2006/02/19 04:29:41 andi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -379,7 +379,7 @@
}
md.stream = php_stream_open_wrapper(filename, "rb",
- (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE |
REPORT_ERRORS,
+ (use_include_path ? USE_PATH : 0) | REPORT_ERRORS,
NULL);
if (!md.stream) {
@@ -531,7 +531,7 @@
context = php_stream_context_from_zval(zcontext, 0);
stream = php_stream_open_wrapper_ex(filename, "rb",
- (use_include_path ? USE_PATH : 0) |
ENFORCE_SAFE_MODE | REPORT_ERRORS,
+ (use_include_path ? USE_PATH : 0) |
REPORT_ERRORS,
NULL, context);
if (!stream) {
RETURN_FALSE;
@@ -592,7 +592,7 @@
mode[1] = 't';
}
stream = php_stream_open_wrapper_ex(filename, mode,
- ((flags & PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ ((flags & PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) |
REPORT_ERRORS, NULL, context);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -751,7 +751,7 @@
context = php_stream_context_from_zval(zcontext, flags &
PHP_FILE_NO_DEFAULT_CONTEXT);
- stream = php_stream_open_wrapper_ex(filename, "rb", (use_include_path ?
USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ stream = php_stream_open_wrapper_ex(filename, "rb", (use_include_path ?
USE_PATH : 0) | REPORT_ERRORS, NULL, context);
if (!stream) {
RETURN_FALSE;
}
@@ -893,7 +893,7 @@
context = php_stream_context_from_zval(zcontext, 0);
- stream = php_stream_open_wrapper_ex(filename, mode, (use_include_path ?
USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ stream = php_stream_open_wrapper_ex(filename, mode, (use_include_path ?
USE_PATH : 0) | REPORT_ERRORS, NULL, context);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -1491,7 +1491,7 @@
context = php_stream_context_from_zval(zcontext, 0);
- stream = php_stream_open_wrapper_ex(filename, "rb", (use_include_path ?
USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ stream = php_stream_open_wrapper_ex(filename, "rb", (use_include_path ?
USE_PATH : 0) | REPORT_ERRORS, NULL, context);
if (stream) {
size = php_stream_passthru(stream);
php_stream_close(stream);
@@ -1612,7 +1612,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s does not allow
unlinking", wrapper->wops->label ? wrapper->wops->label : "Wrapper");
RETURN_FALSE;
}
- RETURN_BOOL(wrapper->wops->unlink(wrapper, filename, ENFORCE_SAFE_MODE
| REPORT_ERRORS, context TSRMLS_CC));
+ RETURN_BOOL(wrapper->wops->unlink(wrapper, filename, REPORT_ERRORS,
context TSRMLS_CC));
}
/* }}} */
@@ -1817,7 +1817,7 @@
return ret;
}
- deststream = php_stream_open_wrapper(dest, "wb", ENFORCE_SAFE_MODE |
REPORT_ERRORS, NULL);
+ deststream = php_stream_open_wrapper(dest, "wb", REPORT_ERRORS, NULL);
if (srcstream && deststream) {
ret = php_stream_copy_to_stream(srcstream, deststream,
PHP_STREAM_COPY_ALL) == 0 ? FAILURE : SUCCESS;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/fsock.c?r1=1.122&r2=1.123&diff_format=u
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.122 php-src/ext/standard/fsock.c:1.123
--- php-src/ext/standard/fsock.c:1.122 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/fsock.c Sun Feb 19 04:29:41 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.122 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: fsock.c,v 1.123 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -76,7 +76,7 @@
ZVAL_STRING(zerrstr, "", 1);
}
- stream = php_stream_xport_create(hostname, hostname_len,
ENFORCE_SAFE_MODE | REPORT_ERRORS,
+ stream = php_stream_xport_create(hostname, hostname_len, REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey,
&tv, NULL, &errstr, &err);
if (port > 0) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.109
php-src/ext/standard/http_fopen_wrapper.c:1.110
--- php-src/ext/standard/http_fopen_wrapper.c:1.109 Fri Jan 20 01:40:48 2006
+++ php-src/ext/standard/http_fopen_wrapper.c Sun Feb 19 04:29:41 2006
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.109 2006/01/20 01:40:48 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.110 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -123,7 +123,7 @@
Z_TYPE_PP(tmpzval) != IS_STRING ||
Z_STRLEN_PP(tmpzval) <= 0) {
php_url_free(resource);
- return php_stream_open_wrapper_ex(path, mode,
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ return php_stream_open_wrapper_ex(path, mode,
REPORT_ERRORS, NULL, context);
}
/* Called from a non-http wrapper with http proxying requested
(i.e. ftp) */
request_fulluri = 1;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/image.c?r1=1.118&r2=1.119&diff_format=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.118 php-src/ext/standard/image.c:1.119
--- php-src/ext/standard/image.c:1.118 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/image.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.118 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: image.c,v 1.119 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1291,7 +1291,7 @@
WRONG_PARAM_COUNT;
}
- stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb",
STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH, NULL);
if (!stream) {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/md5.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/standard/md5.c
diff -u php-src/ext/standard/md5.c:1.44 php-src/ext/standard/md5.c:1.45
--- php-src/ext/standard/md5.c:1.44 Tue Jan 17 12:18:52 2006
+++ php-src/ext/standard/md5.c Sun Feb 19 04:29:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: md5.c,v 1.44 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: md5.c,v 1.45 2006/02/19 04:29:41 andi Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -85,7 +85,7 @@
return;
}
- stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/proc_open.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.37
php-src/ext/standard/proc_open.c:1.38
--- php-src/ext/standard/proc_open.c:1.37 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/proc_open.c Sun Feb 19 04:29:41 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.37 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: proc_open.c,v 1.38 2006/02/19 04:29:41 andi Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -660,7 +660,7 @@
/* try a wrapper */
stream =
php_stream_open_wrapper(Z_STRVAL_PP(zfile), Z_STRVAL_PP(zmode),
-
ENFORCE_SAFE_MODE|REPORT_ERRORS|STREAM_WILL_CAST, NULL);
+ REPORT_ERRORS|STREAM_WILL_CAST,
NULL);
/* force into an fd */
if (stream == NULL || FAILURE ==
php_stream_cast(stream,
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/sha1.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/standard/sha1.c
diff -u php-src/ext/standard/sha1.c:1.15 php-src/ext/standard/sha1.c:1.16
--- php-src/ext/standard/sha1.c:1.15 Tue Jan 17 12:18:52 2006
+++ php-src/ext/standard/sha1.c Sun Feb 19 04:29:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sha1.c,v 1.15 2006/01/17 12:18:52 dmitry Exp $ */
+/* $Id: sha1.c,v 1.16 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
@@ -85,7 +85,7 @@
return;
}
- stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS |
ENFORCE_SAFE_MODE, NULL);
+ stream = php_stream_open_wrapper(arg, "rb", REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.61&r2=1.62&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.61
php-src/ext/standard/streamsfuncs.c:1.62
--- php-src/ext/standard/streamsfuncs.c:1.61 Wed Feb 1 10:31:26 2006
+++ php-src/ext/standard/streamsfuncs.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.61 2006/02/01 10:31:26 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.62 2006/02/19 04:29:41 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -116,7 +116,7 @@
ZVAL_STRING(zerrstr, "", 1);
}
- stream = php_stream_xport_create(host, host_len, ENFORCE_SAFE_MODE |
REPORT_ERRORS,
+ stream = php_stream_xport_create(host, host_len, REPORT_ERRORS,
STREAM_XPORT_CLIENT | (flags &
PHP_STREAM_CLIENT_CONNECT ? STREAM_XPORT_CONNECT : 0) |
(flags & PHP_STREAM_CLIENT_ASYNC_CONNECT ?
STREAM_XPORT_CONNECT_ASYNC : 0),
hashkey, &tv, context, &errstr, &err);
@@ -190,7 +190,7 @@
ZVAL_STRING(zerrstr, "", 1);
}
- stream = php_stream_xport_create(host, host_len, ENFORCE_SAFE_MODE |
REPORT_ERRORS,
+ stream = php_stream_xport_create(host, host_len, REPORT_ERRORS,
STREAM_XPORT_SERVER | flags,
NULL, NULL, context, &errstr, &err);
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.74&r2=1.75&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.74 php-src/ext/tidy/tidy.c:1.75
--- php-src/ext/tidy/tidy.c:1.74 Sun Feb 19 00:55:20 2006
+++ php-src/ext/tidy/tidy.c Sun Feb 19 04:29:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.74 2006/02/19 00:55:20 andi Exp $ */
+/* $Id: tidy.c,v 1.75 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -514,7 +514,7 @@
php_stream *stream;
char *data = NULL;
- if (!(stream = php_stream_open_wrapper(filename, "rb",
(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE, NULL))) {
+ if (!(stream = php_stream_open_wrapper(filename, "rb",
(use_include_path ? USE_PATH : 0), NULL))) {
return NULL;
}
if ((*len = (int) php_stream_copy_to_mem(stream, &data,
PHP_STREAM_COPY_ALL, 0)) == 0) {
@@ -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.74 2006/02/19 00:55:20 andi Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.75 2006/02/19 04:29:41 andi Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.30
php-src/ext/xmlwriter/php_xmlwriter.c:1.31
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.30 Mon Feb 6 11:28:20 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.30 2006/02/06 11:28:20 tony2001 Exp $ */
+/* $Id: php_xmlwriter.c,v 1.31 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -300,7 +300,7 @@
php_stream_wrapper *wrapper = NULL;
void *ret_val = NULL;
- ret_val = php_stream_open_wrapper_ex((char *)filename, "wb",
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, NULL);
+ ret_val = php_stream_open_wrapper_ex((char *)filename, "wb",
REPORT_ERRORS, NULL, NULL);
return ret_val;
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/zlib.c?r1=1.189&r2=1.190&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.189 php-src/ext/zlib/zlib.c:1.190
--- php-src/ext/zlib/zlib.c:1.189 Sun Jan 1 13:09:56 2006
+++ php-src/ext/zlib/zlib.c Sun Feb 19 04:29:41 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.189 2006/01/01 13:09:56 sniper Exp $ */
+/* $Id: zlib.c,v 1.190 2006/02/19 04:29:41 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -294,7 +294,7 @@
use_include_path = flags ? USE_PATH : 0;
/* using a stream here is a bit more efficient (resource wise) than
php_gzopen_wrapper */
- stream = php_stream_gzopen(NULL, filename, "rb", use_include_path |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC);
+ stream = php_stream_gzopen(NULL, filename, "rb", use_include_path |
REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC);
if (stream == NULL) {
/* Error reporting is already done by stream code */
RETURN_FALSE;
@@ -336,7 +336,7 @@
use_include_path = flags ? USE_PATH : 0;
- stream = php_stream_gzopen(NULL, filename, mode, use_include_path |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC);
+ stream = php_stream_gzopen(NULL, filename, mode, use_include_path |
REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC);
if (!stream) {
RETURN_FALSE;
@@ -365,7 +365,7 @@
use_include_path = flags ? USE_PATH : 0;
- stream = php_stream_gzopen(NULL, filename, "rb", use_include_path |
ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC);
+ stream = php_stream_gzopen(NULL, filename, "rb", use_include_path,
NULL, NULL STREAMS_CC TSRMLS_CC);
if (!stream) {
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.663&r2=1.664&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.663 php-src/main/main.c:1.664
--- php-src/main/main.c:1.663 Sun Feb 19 01:10:13 2006
+++ php-src/main/main.c Sun Feb 19 04:29:41 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.663 2006/02/19 01:10:13 andi Exp $ */
+/* $Id: main.c,v 1.664 2006/02/19 04:29:41 andi Exp $ */
/* {{{ includes
*/
@@ -1001,7 +1001,7 @@
{
TSRMLS_FETCH();
- return php_stream_open_wrapper_as_file((char *)filename, "rb",
ENFORCE_SAFE_MODE|USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE,
opened_path);
+ return php_stream_open_wrapper_as_file((char *)filename, "rb",
USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path);
}
/* }}} */
@@ -1019,7 +1019,7 @@
{
php_stream *stream;
- stream = php_stream_open_wrapper((char *)filename, "rb",
ENFORCE_SAFE_MODE|USE_PATH|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE,
&handle->opened_path);
+ stream = php_stream_open_wrapper((char *)filename, "rb",
USE_PATH|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, &handle->opened_path);
if (stream) {
handle->type = ZEND_HANDLE_STREAM;
http://cvs.php.net/viewcvs.cgi/php-src/main/network.c?r1=1.119&r2=1.120&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.119 php-src/main/network.c:1.120
--- php-src/main/network.c:1.119 Sun Jan 1 13:09:57 2006
+++ php-src/main/network.c Sun Feb 19 04:29:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.119 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: network.c,v 1.120 2006/02/19 04:29:41 andi Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1005,7 +1005,7 @@
reslen = spprintf(&res, 0, "tcp://%s:%d", host, port);
- stream = php_stream_xport_create(res, reslen, ENFORCE_SAFE_MODE |
REPORT_ERRORS,
+ stream = php_stream_xport_create(res, reslen, REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT,
persistent_id, timeout, NULL, NULL, NULL);
efree(res);
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.94&r2=1.95&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.94 php-src/main/streams/streams.c:1.95
--- php-src/main/streams/streams.c:1.94 Sun Jan 1 13:09:57 2006
+++ php-src/main/streams/streams.c Sun Feb 19 04:29:42 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.94 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: streams.c,v 1.95 2006/02/19 04:29:42 andi Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2222,7 +2222,7 @@
{
php_stream_wrapper *wrapper = NULL;
- wrapper = php_stream_locate_url_wrapper(path, NULL, ENFORCE_SAFE_MODE
TSRMLS_CC);
+ wrapper = php_stream_locate_url_wrapper(path, NULL, 0 TSRMLS_CC);
if (!wrapper || !wrapper->wops || !wrapper->wops->stream_mkdir) {
return 0;
}
@@ -2237,7 +2237,7 @@
{
php_stream_wrapper *wrapper = NULL;
- wrapper = php_stream_locate_url_wrapper(path, NULL, ENFORCE_SAFE_MODE
TSRMLS_CC);
+ wrapper = php_stream_locate_url_wrapper(path, NULL, 0 TSRMLS_CC);
if (!wrapper || !wrapper->wops || !wrapper->wops->stream_rmdir) {
return 0;
}
@@ -2266,7 +2266,7 @@
}
}
- wrapper = php_stream_locate_url_wrapper(path, &path_to_open,
ENFORCE_SAFE_MODE TSRMLS_CC);
+ wrapper = php_stream_locate_url_wrapper(path, &path_to_open, 0
TSRMLS_CC);
if (wrapper && wrapper->wops->url_stat) {
ret = wrapper->wops->url_stat(wrapper, path_to_open, flags,
ssb, context TSRMLS_CC);
if (ret == 0) {
@@ -2692,7 +2692,7 @@
return FAILURE;
}
- stream = php_stream_opendir(dirname, ENFORCE_SAFE_MODE | REPORT_ERRORS,
context);
+ stream = php_stream_opendir(dirname, REPORT_ERRORS, context);
if (!stream) {
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
