com php-src: Merge branch '5.4': sapi/litespeed/lsapi_main. c
| From: | Xinchen Hui | Date: | Fri, 12 Oct 2012 17:29:37 +0000 |
| Subject: | com php-src: Merge branch '5.4': sapi/litespeed/lsapi_main. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73959@lists.php.net to get a copy of this message | ||
Commit: 1407b4a08085cc6b4b534baa2ca9eb40f8d39241
Author: George Wang <gwang@php.net> Fri, 12 Oct 2012 13:29:37 -0400
Parents: 6fbcf693750d682b223660d3299a0b6864915acc 68e528a6bca59fcbcefeb49a6fcf992c8648475f
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1407b4a08085cc6b4b534baa2ca9eb40f8d39241
Log:
Merge branch '5.4'
* 5.4:
sapi/litespeed/lsapi_main.c: Fix bug #63228
Bugs:
https://bugs.php.net/63228
Changed paths:
MM sapi/litespeed/lsapi_main.c
Diff:
diff --cc sapi/litespeed/lsapi_main..c
index 5f4d2e6,7058342..338b8e9
--- a/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