diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2016-08-11 05:06:55 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2016-08-11 05:06:55 +0200 |
| commit | 197051f3ab50a0e4ee6d15cd09099f21852d1c14 (patch) | |
| tree | 14fc7bca5b898e1e8b03ff70d3193a6940fcfe51 /ext/interbase | |
| parent | 13e076f446b0997033b0f5dc886ee874c137775b (diff) | |
| download | php-git-197051f3ab50a0e4ee6d15cd09099f21852d1c14.tar.gz | |
Remove sql.safe_mode
This is one of the last old and odd deprecated settings we still have in PHP, it was never fully implemented in all the database extensions and should probably have been gone back in 5.4, along with safe_mode. Although if my memory strikes me right, mysql was also supporting it back then, but not mysqli.
So far only interbase was supporting this feature, and the removal of it causes two effects for interbase:
- CREATE DATABASE is now allowed no matter
- The default database set by php.ini (ibase.default_db) is no longer forced
http://php.net/ini.core#ini.sql.safe-mode
Diffstat (limited to 'ext/interbase')
| -rw-r--r-- | ext/interbase/ibase_query.c | 4 | ||||
| -rw-r--r-- | ext/interbase/interbase.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c index 37e59dd3a7..77de9f77e4 100644 --- a/ext/interbase/ibase_query.c +++ b/ext/interbase/ibase_query.c @@ -1109,10 +1109,6 @@ PHP_FUNCTION(ibase_query) isc_db_handle db = 0; isc_tr_handle trans = 0; - if (PG(sql_safe_mode)) { - _php_ibase_module_error("CREATE DATABASE is not allowed in SQL safe mode" - ); - } else if (((l = INI_INT("ibase.max_links")) != -1) && (IBG(num_links) >= l)) { _php_ibase_module_error("CREATE DATABASE is not allowed: maximum link count " "(" ZEND_LONG_FMT ") reached", l); diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 531019b841..a4e51c27a6 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -902,7 +902,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* } /* restrict to the server/db in the .ini if in safe mode */ - if ((!len[DB] || PG(sql_safe_mode)) && (c = INI_STR("ibase.default_db"))) { + if (!len[DB] && (c = INI_STR("ibase.default_db"))) { args[DB] = c; len[DB] = strlen(c); } |