diff options
author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:53:30 +0000 |
---|---|---|
committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:53:30 +0000 |
commit | dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f (patch) | |
tree | 6c3e808cb0300c72f869478fbbc9dea69e5cf697 /ext/oci8/oci8_interface.c | |
parent | 3c78ad763ebb0e09ad5524ba08fa6e83feffe102 (diff) | |
download | php-git-dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f.tar.gz |
Removed safe_mode
* Removed ini options, safe_mode*
* Removed --enable-safe-mode --with-exec-dir configure options on Unix
* Updated extensions, SAPI's and core
* php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
Diffstat (limited to 'ext/oci8/oci8_interface.c')
-rw-r--r-- | ext/oci8/oci8_interface.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index b12c8dc3bc..2f01f27e22 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -918,16 +918,12 @@ PHP_FUNCTION(oci_lob_export) /* nothing to write, fail silently */ 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; } - 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) { @@ -1871,12 +1867,6 @@ PHP_FUNCTION(oci_password_change) 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); |