diff options
| author | Michael Wallner <mike@php.net> | 2006-06-02 19:51:43 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2006-06-02 19:51:43 +0000 |
| commit | 4ce0141713bfc14bfab06aaa9525b7d6a3339438 (patch) | |
| tree | 8468e9d21dc5c63fdd39bf356ee56cb4d16f0d50 /main/SAPI.c | |
| parent | 653007cea0bb87ccd39a746c7867eb10d907fd81 (diff) | |
| download | php-git-4ce0141713bfc14bfab06aaa9525b7d6a3339438.tar.gz | |
- new output control code
# scan README.NEW-OUTPUT-API to get a grasp
# tree has been tagged with BEFORE_NEW_OUTPUT_API
#
# TODO:
# - improve existing output handlers
# - move zlib.output_compression cruft from SAPI.c to zlib.c
# - output_encoding handling was ambigious, resp. is undefined yet
# - more tests
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 4a5ea83521..6b7e1ef4ae 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -553,8 +553,8 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) int http_response_code; if (SG(headers_sent) && !SG(request_info).no_headers) { - char *output_start_filename = php_get_output_start_filename(TSRMLS_C); - int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); + char *output_start_filename = php_output_get_start_filename(); + int output_start_lineno = php_output_get_start_lineno(); if (output_start_filename) { sapi_module.sapi_error(E_WARNING, "Cannot modify header information - headers already sent by (output started at %s:%d)", @@ -720,6 +720,7 @@ SAPI_API int sapi_send_headers(TSRMLS_D) } #if HAVE_ZLIB + /* TODO: move to zlib.c */ /* Add output compression headers at this late stage in order to make it possible to switch it off inside the script. */ |