diff options
| author | George Wang <gwang@php.net> | 2008-07-30 00:07:29 +0000 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2008-07-30 00:07:29 +0000 |
| commit | 835c0b022c0e9731503a881f180eb266036a0c38 (patch) | |
| tree | fa3a21c9fba2f303d8e08aad920183ba1388c79d /sapi | |
| parent | b1f466b3edca44972d33d6c8190dbbfcc0622e53 (diff) | |
| download | php-git-835c0b022c0e9731503a881f180eb266036a0c38.tar.gz | |
make it compatible with PHP 6.0 using new php output API
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 289a6ffb70..7f3cd7ef9b 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -431,7 +431,11 @@ static void cli_usage( TSRMLS_D ) php_output_startup(); php_output_activate(TSRMLS_C); php_printf( usage ); - php_end_ob_buffers(1 TSRMLS_CC); +#ifdef PHP_OUTPUT_NEWAPI + php_output_end_all(TSRMLS_C); +#else + php_end_ob_buffers(1 TSRMLS_CC); +#endif } static int parse_opt( int argc, char * argv[], int *climode, @@ -529,7 +533,11 @@ static int cli_main( int argc, char * argv[] ) case 'i': if (php_request_startup(TSRMLS_C) != FAILURE) { php_print_info(0xFFFFFFFF TSRMLS_CC); - php_end_ob_buffers(1 TSRMLS_CC); +#ifdef PHP_OUTPUT_NEWAPI + php_output_end_all(TSRMLS_C); +#else + php_end_ob_buffers(1 TSRMLS_CC); +#endif php_request_shutdown( NULL ); } ret = 1; @@ -541,7 +549,11 @@ static int cli_main( int argc, char * argv[] ) #else php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif - php_end_ob_buffers(1 TSRMLS_CC); +#ifdef PHP_OUTPUT_NEWAPI + php_output_end_all(TSRMLS_C); +#else + php_end_ob_buffers(1 TSRMLS_CC); +#endif php_request_shutdown( NULL ); } ret = 1; |