diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 09:34:05 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 09:34:05 +0200 |
| commit | a141ccb4ff7fb0666c7d7986c39feda9421291fe (patch) | |
| tree | 8c707cd918831dcfb27c23756ad434509e655ccc | |
| parent | 7845bcd82793bc6cda33d9e8a7d9f10a8866817d (diff) | |
| download | php-git-a141ccb4ff7fb0666c7d7986c39feda9421291fe.tar.gz | |
Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already)
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 4 | ||||
| -rw-r--r-- | main/php_streams.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index ff1dbf23b5..20cd706b5a 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -669,7 +669,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromFile) PDO_CONSTRUCT_CHECK; PDO_DBH_CLEAR_ERR(); - stream = php_stream_open_wrapper_ex(filename, "rb", ENFORCE_SAFE_MODE, NULL, FG(default_context)); + stream = php_stream_open_wrapper_ex(filename, "rb", 0, NULL, FG(default_context)); if (!stream) { pdo_pgsql_error_msg(dbh, PGRES_FATAL_ERROR, "Unable to open the file"); PDO_HANDLE_DBH_ERR(); @@ -771,7 +771,7 @@ static PHP_METHOD(PDO, pgsqlCopyToFile) H = (pdo_pgsql_db_handle *)dbh->driver_data; - stream = php_stream_open_wrapper_ex(filename, "wb", ENFORCE_SAFE_MODE, NULL, FG(default_context)); + stream = php_stream_open_wrapper_ex(filename, "wb", 0, NULL, FG(default_context)); if (!stream) { pdo_pgsql_error_msg(dbh, PGRES_FATAL_ERROR, "Unable to open the file for writing"); PDO_HANDLE_DBH_ERR(); diff --git a/main/php_streams.h b/main/php_streams.h index a21d442095..4f3d860a90 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -503,7 +503,6 @@ END_EXTERN_C() #define USE_PATH 0x00000001 #define IGNORE_URL 0x00000002 #define REPORT_ERRORS 0x00000008 -#define ENFORCE_SAFE_MODE 0 /* for BC only */ /* If you don't need to write to the stream, but really need to * be able to seek, use this flag in your options. */ |