diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 16 | ||||
| -rw-r--r-- | main/php.h | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/main/main.c b/main/main.c index 2cef5cf732..0b3c054194 100644 --- a/main/main.c +++ b/main/main.c @@ -654,10 +654,10 @@ static void php_message_handler_for_zend(long message, void *data) int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) { - zend_output_startup(); + php_output_startup(); if (PG(output_buffering)) { - zend_start_ob_buffering(); + php_start_ob_buffering(); } #if APACHE /* @@ -732,7 +732,7 @@ void php_request_shutdown(void *dummy) SLS_FETCH(); sapi_send_headers(); - zend_end_ob_buffering(SG(request_info).headers_only?0:1); + php_end_ob_buffering(SG(request_info).headers_only?0:1); php3_call_shutdown_functions(); @@ -771,9 +771,9 @@ static void php3_config_ini_shutdown() } -static int zend_body_write_wrapper(const char *str, uint str_length) +static int php_body_write_wrapper(const char *str, uint str_length) { - return zend_body_write(str, str_length); + return php_body_write(str, str_length); } #ifdef ZTS @@ -825,11 +825,11 @@ int php_module_startup(sapi_module_struct *sf) sapi_module = *sf; - zend_output_startup(); + php_output_startup(); zuf.error_function = php_error; zuf.printf_function = php_printf; - zuf.write_function = zend_body_write_wrapper; + zuf.write_function = php_body_write_wrapper; zuf.fopen_function = php_fopen_wrapper_for_zend; zuf.message_handler = php_message_handler_for_zend; zuf.block_interruptions = BLOCK_INTERRUPTIONS; @@ -1210,7 +1210,7 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod } php3_header(); /* Make sure headers have been sent */ - zend_end_ob_buffering(1); + php_end_ob_buffering(1); return (OK); } #endif /* APACHE */ diff --git a/main/php.h b/main/php.h index af977c8ccf..fec1000107 100644 --- a/main/php.h +++ b/main/php.h @@ -312,12 +312,12 @@ PHPAPI int cfg_get_string(char *varname, char **result); /* Output support */ #include "output.h" -#define PHPWRITE(str, str_len) zend_body_write((str), (str_len)) -#define PUTS(str) zend_body_write((str), strlen((str))) -#define PUTC(c) (zend_body_write(&(c), 1), (c)) -#define PHPWRITE_H(str, str_len) zend_header_write((str), (str_len)) -#define PUTS_H(str) zend_header_write((str), strlen((str))) -#define PUTC_H(c) (zend_header_write(&(c), 1), (c)) +#define PHPWRITE(str, str_len) php_body_write((str), (str_len)) +#define PUTS(str) php_body_write((str), strlen((str))) +#define PUTC(c) (php_body_write(&(c), 1), (c)) +#define PHPWRITE_H(str, str_len) php_header_write((str), (str_len)) +#define PUTS_H(str) php_header_write((str), strlen((str))) +#define PUTC_H(c) (php_header_write(&(c), 1), (c)) #include "zend_operators.h" |