From: George Wang <gwang@php.net>
Date: Tue, 27 Feb 2018 18:57:06 +0000 (-0500)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ec012fa2a806d7d4a9808a287efbcdf7753f3cb;p=php

Merge branch 'PHP-7.2'

Conflicts:
	sapi/litespeed/lsapi_main.c
---

2ec012fa2a806d7d4a9808a287efbcdf7753f3cb
diff --cc sapi/litespeed/lsapi_main.c
index 3545f94d39,d0d4cdbb0b..1ebf7ed18d
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -995,13 -1024,9 +1024,12 @@@ static int cli_main( int argc, char * a
          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
          for( ini = ini_defaults; *ini; ini+=2 ) {
- #if PHP_MAJOR_VERSION >= 7
- 			psKey = zend_string_init(*ini, strlen( *ini ), 1);
+             psKey = zend_string_init(*ini, strlen( *ini ), 1);
              zend_alter_ini_entry_chars(psKey,
                                  (char *)*(ini+1), strlen( *(ini+1) ),
                                  PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);