com php-src: Fixed a bug that causes crash when environment variable is access while parsing php.ini: sapi/litespeed/lsapi_main.c
| From: | George Wang | Date: | Fri, 03 Oct 2014 20:42:27 +0000 |
| Subject: | com php-src: Fixed a bug that causes crash when environment variable is access while parsing php.ini: sapi/litespeed/lsapi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82088@lists.php.net to get a copy of this message | ||
Commit: 5b08e56eca6be95913be815097308b7359b52e37
Author: George Wang <gwang@php.net> Fri, 3 Oct 2014 16:41:32 -0400
Parents: 4bdd9aabdd9ddabac9fe253aab4c8366691c5171
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b08e56eca6be95913be815097308b7359b52e37
Log:
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Changed paths:
M sapi/litespeed/lsapi_main.c
Diff:
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index 789ebf2..425d638 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -69,7 +69,7 @@
#define SAPI_LSAPI_MAX_HEADER_LENGTH 2048
-static int lsapi_mode = 1;
+static int lsapi_mode = 0;
static char *php_self = "";
static char *script_filename = "";
static int source_highlight = 0;
@@ -1053,6 +1053,7 @@ int main( int argc, char * argv[] )
LSAPI_Init();
LSAPI_Init_Env_Parameters( NULL );
+ lsapi_mode = 1;
slow_script_msec = LSAPI_Get_Slow_Req_Msecs();