diff options
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 10 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index eeba18a691..fca55d9c33 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -183,7 +183,7 @@ PHP_FUNCTION(apache_request_headers) arr = apr_table_elts(ctx->r->headers_in); APR_ARRAY_FOREACH_OPEN(arr, key, val) - if (!val) val = empty_string; + if (!val) val = ""; add_assoc_string(return_value, key, val, 1); APR_ARRAY_FOREACH_CLOSE() } @@ -203,7 +203,7 @@ PHP_FUNCTION(apache_response_headers) arr = apr_table_elts(ctx->r->headers_out); APR_ARRAY_FOREACH_OPEN(arr, key, val) - if (!val) val = empty_string; + if (!val) val = ""; add_assoc_string(return_value, key, val, 1); APR_ARRAY_FOREACH_CLOSE() } @@ -423,7 +423,7 @@ PHP_MINFO_FUNCTION(apache) php_info_print_table_header(2, "Variable", "Value"); APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) { - val = empty_string; + val = ""; } php_info_print_table_row(2, key, val); APR_ARRAY_FOREACH_CLOSE() @@ -438,7 +438,7 @@ PHP_MINFO_FUNCTION(apache) arr = apr_table_elts(((php_struct *) SG(server_context))->r->headers_in); APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) { - val = empty_string; + val = ""; } php_info_print_table_row(2, key, val); APR_ARRAY_FOREACH_CLOSE() @@ -447,7 +447,7 @@ PHP_MINFO_FUNCTION(apache) arr = apr_table_elts(((php_struct *) SG(server_context))->r->headers_out); APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) { - val = empty_string; + val = ""; } php_info_print_table_row(2, key, val); APR_ARRAY_FOREACH_CLOSE() diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index f5b133bcc1..e7e9571044 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -215,7 +215,7 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) char *key, *val; APR_ARRAY_FOREACH_OPEN(arr, key, val) - if (!val) val = empty_string; + if (!val) val = ""; php_register_variable(key, val, track_vars_array TSRMLS_CC); APR_ARRAY_FOREACH_CLOSE() |