Merge branch '5.4'

* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228

diff --cc sapi/litespeed/lsapi_main.c
index 5f4d2e6ec7cde249cd19a1bb1c63ce24b1b46d83,70583426c4679752720db475ace703ee8e4af5c0..338b8e9d1e534ca9daf0c7fe3aa3e9ef70f7a148
--- 1/sapi/litespeed/lsapi_main.c
--- 2/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -413,25 -585,25 +413,25 @@@ static int processReq( TSRMLS_D 
  
  static void cli_usage( TSRMLS_D )
  {
 -    static const char * usage =
 -        "Usage: php\n"
 -        "      php -[b|c|h|i|q|s|v|?] [<file>] [args...]\n"
 -        "  Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n"
 -        "  Run in Command Line Interpreter mode when parameters are specified\n"
 -        "\n"
 -        "  -b <address:port>|<port> Bind Path for external LSAPI Server mode\n"
 -        "  -c <path>|<file> Look for php.ini file in this directory\n"
 -        "  -h    This help\n"
 -        "  -i    PHP information\n"
 -        "  -q    Quiet-mode.  Suppress HTTP Header output.\n"
 -        "  -s    Display colour syntax highlighted source.\n"
 -        "  -v    Version number\n"
 -        "  -?    This help\n"
 -        "\n"
 -        "  args...    Arguments passed to script.\n";
 -    php_output_startup();
 -    php_output_activate(TSRMLS_C);
 -    php_printf( "%s", usage );
 +      static const char * usage =
 +              "Usage: php\n"
 +              "      php -[b|c|h|i|q|s|v|?] [<file>] [args...]\n"
 +              "  Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n"
 +              "  Run in Command Line Interpreter mode when parameters are specified\n"
 +              "\n"
 +              "  -b <address:port>|<port> Bind Path for external LSAPI Server mode\n"
 +              "  -c <path>|<file> Look for php.ini file in this directory\n"
 +              "  -h    This help\n"
 +              "  -i    PHP information\n"
 +              "  -q    Quiet-mode.  Suppress HTTP Header output.\n"
 +              "  -s    Display colour syntax highlighted source.\n"
 +              "  -v    Version number\n"
 +              "  -?    This help\n"
 +              "\n"
 +              "  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