@- Fixed several problems with the PATH_TRANSLATED and PHP_SELF under Apache

@  (Paul Gregg & Zeev)

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index fe062e08eb0ad56509607f794eb787c5660b7289..cb9447ea453003058d8b745cb83cae8413137eeb 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -243,7 +243,7 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC
 
                if (elts[i].val) {
                        val = elts[i].val;
-                       if (!strcmp(val, "SCRIPT_FILENAME")) {
+                       if (!strcmp(elts[i].key, "SCRIPT_FILENAME")) {
                                script_filename = val;
                        }
                } else {
@@ -254,9 +254,9 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC
 
        /* insert special variables */
        if (script_filename) {
-               php_register_variable("PATH_TRANSLATED", script_filename, NULL ELS_CC PLS_CC);
+               php_register_variable("PATH_TRANSLATED", script_filename, track_vars_array ELS_CC PLS_CC);
        }
-       php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, NULL ELS_CC PLS_CC);
+       php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array ELS_CC PLS_CC);
 }
 
 static int