diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-14 18:15:01 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-14 18:15:01 +0000 |
| commit | af327304765f2f554f20a85d2ab6057bc6c370ad (patch) | |
| tree | 7aa856ecd600611edaaf5a9b985e02c119f412c7 /sapi/apache2handler/sapi_apache2.c | |
| parent | 022a1625a3b2f69afe1412d266c0f5bab049d32a (diff) | |
| download | php-git-af327304765f2f554f20a85d2ab6057bc6c370ad.tar.gz | |
Revert the last patch.
# sorry for the annoyance
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index ae403d505e..0abd1e20b3 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -227,20 +227,13 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) php_struct *ctx = SG(server_context); const apr_array_header_t *arr = apr_table_elts(ctx->r->subprocess_env); char *key, *val; - zval **path_translated_zv; - + APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) val = empty_string; php_register_variable(key, val, track_vars_array TSRMLS_CC); APR_ARRAY_FOREACH_CLOSE() php_register_variable("PHP_SELF", ctx->r->uri, track_vars_array TSRMLS_CC); - - /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */ - if (!zend_hash_exists(Z_ARRVAL_P(track_vars_array), "PATH_TRANSLATED", sizeof("PATH_TRANSLATED")) - && zend_hash_find(Z_ARRVAL_P(track_vars_array), "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &path_translated_zv) == SUCCESS) { - php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated_zv), track_vars_array TSRMLS_CC); - } } static void @@ -431,7 +424,6 @@ static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC) apr_table_unset(r->headers_out, "Expires"); apr_table_unset(r->headers_out, "ETag"); apr_table_unset(r->headers_in, "Connection"); - if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(r))) { auth = apr_table_get(r->headers_in, "Authorization"); php_handle_auth_data(auth TSRMLS_CC); |