diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-03-07 14:43:16 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-03-07 14:43:16 +0000 |
| commit | 87c4a01b87608b7abc12c8258aad8b052b8c5a67 (patch) | |
| tree | dc35256a74db923ef9654a37df35df54c65f21de /sapi/apache/php_apache.c | |
| parent | d88e3ee93d58acdc2fb6192e0f44e14d631494d0 (diff) | |
| download | php-git-87c4a01b87608b7abc12c8258aad8b052b8c5a67.tar.gz | |
Nuke safe_mode from sapi/*
# only main/ remains at this point, this is the next step
Diffstat (limited to 'sapi/apache/php_apache.c')
| -rw-r--r-- | sapi/apache/php_apache.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 854ea18401..ebc7902564 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -275,7 +275,7 @@ PHP_MINFO_FUNCTION(apache) env_arr = table_elts(r->headers_in); env = (table_entry *)env_arr->elts; for (i = 0; i < env_arr->nelts; ++i) { - if (env[i].key && (!PG(safe_mode) || (PG(safe_mode) && strncasecmp(env[i].key, "authorization", 13)))) { + if (env[i].key) { php_info_print_table_row(2, env[i].key, env[i].val); } } @@ -353,9 +353,7 @@ PHP_FUNCTION(apache_request_headers) env_arr = table_elts(((request_rec *) SG(server_context))->headers_in); tenv = (table_entry *)env_arr->elts; for (i = 0; i < env_arr->nelts; ++i) { - if (!tenv[i].key || - (PG(safe_mode) && - !strncasecmp(tenv[i].key, "authorization", 13))) { + if (!tenv[i].key) { continue; } if (add_assoc_string(return_value, tenv[i].key, (tenv[i].val==NULL) ? "" : tenv[i].val, 1)==FAILURE) { @@ -541,11 +539,6 @@ PHP_FUNCTION(apache_get_modules) Reset the Apache write timer */ PHP_FUNCTION(apache_reset_timeout) { - if (PG(safe_mode)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot reset the Apache timeout in safe mode"); - RETURN_FALSE; - } - ap_reset_timeout((request_rec *)SG(server_context)); RETURN_TRUE; } |