Merge branch 'PHP-7.1' into PHP-7.2

George Wang · George Wang · commit 1e1695e8de39 · 2018-04-03T11:47:41.000-04:00
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
@@ -574,6 +574,7 @@ static int alter_ini( const char * pKey, int keyLen, const char * pValue, int va
         ++pKey;
         if ( *pKey == 4 ) {
             type = ZEND_INI_SYSTEM;
+            stage = PHP_INI_STAGE_ACTIVATE;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -574,6 +574,7 @@ static int alter_ini( const char * pKey, int keyLen, const char * pValue, int va`
`574`	`574`	`++pKey;`
`575`	`575`	`if ( *pKey == 4 ) {`
`576`	`576`	`type = ZEND_INI_SYSTEM;`
	`577`	`+ stage = PHP_INI_STAGE_ACTIVATE;`
`577`	`578`	`}`
`578`	`579`	`else`
`579`	`580`	`{`