diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
| commit | ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch) | |
| tree | 360c977fa1f03c2db397743988cd003e2321e44c /sapi/litespeed/lsapi_main.c | |
| parent | 55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff) | |
| parent | 7302b72d6e6bb77446599ec29a3b89702a506025 (diff) | |
| download | php-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz | |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'sapi/litespeed/lsapi_main.c')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index a296261e1a..b0ea105a88 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -418,7 +418,7 @@ static void sapi_lsapi_log_message(char *message) static sapi_module_struct lsapi_sapi_module = { "litespeed", - "LiteSpeed V6.8", + "LiteSpeed V6.9", php_lsapi_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ @@ -771,6 +771,8 @@ static int cli_main( int argc, char * argv[] ) zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */ CG(in_compilation) = 0; /* not initialized but needed for several options */ + SG(options) |= SAPI_OPTION_NO_CHDIR; + #if PHP_MAJOR_VERSION < 7 EG(uninitialized_zval_ptr) = NULL; #endif @@ -809,9 +811,9 @@ static int cli_main( int argc, char * argv[] ) case 'v': if (php_request_startup() != FAILURE) { #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #else - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2016 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif #ifdef PHP_OUTPUT_NEWAPI php_output_end_all(); @@ -1169,11 +1171,7 @@ zend_module_entry litespeed_module_entry = { static int add_associate_array( const char * pKey, int keyLen, const char * pValue, int valLen, void * arg ) { - add_assoc_string_ex( (zval *)arg, (char *)pKey, keyLen+1, (char *)pValue -#if PHP_MAJOR_VERSION < 7 - , 1 -#endif - ); + add_assoc_string_ex((zval *)arg, (char *)pKey, keyLen, (char *)pValue); return 1; } @@ -1227,11 +1225,7 @@ PHP_FUNCTION(litespeed_response_headers) headerBuf[len] = 0; if ( len ) { while( isspace(*++p)); - add_assoc_string_ex(return_value, headerBuf, len+1, p -#if PHP_MAJOR_VERSION < 7 - , 1 -#endif - ); + add_assoc_string_ex(return_value, headerBuf, len, p); } } } @@ -1248,7 +1242,7 @@ PHP_FUNCTION(apache_get_modules) { static const char * mod_names[] = { - "mod_rewrite", "mod_mime", "mod_headers", "mod_expires", NULL + "mod_rewrite", "mod_mime", "mod_headers", "mod_expires", "mod_auth_basic", NULL }; const char **name = mod_names; /* TODO: */ |