cvs: php4 /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c

moriyoshi Wed May 14 14:15:02 2003 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/apache2handler sapi_apache2.c Log: Revert the last patch. # sorry for the annoyance Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.112 php4/sapi/apache2filter/sapi_apache2.c:1.113 --- php4/sapi/apache2filter/sapi_apache2.c:1.112 Tue May 13 15:35:49 2003 +++ php4/sapi/apache2filter/sapi_apache2.c Wed May 14 14:15:01 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.112 2003/05/13 19:35:49 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.113 2003/05/14 18:15:01 moriyoshi Exp $ */ #include <fcntl.h> @@ -224,12 +224,6 @@ 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 @@ -402,7 +396,6 @@ apr_table_unset(f->r->headers_out, "Expires"); apr_table_unset(f->r->headers_out, "ETag"); apr_table_unset(f->r->headers_in, "Connection"); - if (!PG(safe_mode) || (PG(safe_mode) && !ap_auth_type(f->r))) { auth = apr_table_get(f->r->headers_in, "Authorization"); php_handle_auth_data(auth TSRMLS_CC); Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.18 php4/sapi/apache2handler/sapi_apache2.c:1.19 --- php4/sapi/apache2handler/sapi_apache2.c:1.18 Tue May 13 15:35:49 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Wed May 14 14:15:01 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.18 2003/05/13 19:35:49 moriyoshi Exp $ */ +/* $Id: sapi_apache2.c,v 1.19 2003/05/14 18:15:01 moriyoshi Exp $ */ #include <fcntl.h> @@ -227,20 +227,13 @@ 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 @@ 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);