diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-20 07:34:08 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2003-05-20 07:34:08 +0000 |
| commit | a9a70574485c1cbefc7cb5f07e777dd21139ff7c (patch) | |
| tree | ddb01a2e8355ce4e2c8a081b04d85f372103e46d /sapi/apache2handler | |
| parent | 5defe2dd7cdc563120f9dc48c7b9d71d2c7fcd06 (diff) | |
| download | php-git-a9a70574485c1cbefc7cb5f07e777dd21139ff7c.tar.gz | |
Revisit the braindead patch only for this branch
# this behaviour is fixed in the php5 branch
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index b6492db8d5..696c121a55 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -225,13 +225,20 @@ 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 |