Merge branch '5.3' into 5.4

* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
This commit is contained in:
George Wang 2012-10-12 13:09:53 -04:00
commit 68e528a6bc

View File

@ -603,7 +603,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