Merge branch '5.4'

* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
This commit is contained in:
George Wang 2012-10-12 13:29:37 -04:00
commit 1407b4a080

View File

@ -431,7 +431,7 @@ static void cli_usage( TSRMLS_D )
" args... Arguments passed to script.\n";
php_output_startup();
php_output_activate(TSRMLS_C);
php_printf( usage );
php_printf( "%s", usage );
#ifdef PHP_OUTPUT_NEWAPI
php_output_end_all(TSRMLS_C);
#else