cvs: php-src /sapi/litespeed lsapi_main.c

gwang Wed Jul 30 00:07:29 2008 UTC Modified files: /php-src/sapi/litespeed lsapi_main.c Log: make it compatible with PHP 6.0 using new php output API http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/sapi/litespeed/lsapi_main.c diff -u php-src/sapi/litespeed/lsapi_main.c:1.4 php-src/sapi/litespeed/lsapi_main.c:1.5 --- php-src/sapi/litespeed/lsapi_main.c:1.4 Tue Apr 1 05:01:13 2008 +++ php-src/sapi/litespeed/lsapi_main.c Wed Jul 30 00:07:29 2008 @@ -431,7 +431,11 @@ 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 @@ 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 @@ #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;