Execute zend_post_startup() with module_initialized flag set.

dstogov · dstogov · commit 17a3cb4a2ab2 · 2018-10-29T15:25:17.000+03:00
diff --git a/main/main.c b/main/main.c
@@ -2362,12 +2362,12 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 		module->info_func = PHP_MINFO(php_core);
 	}
 
+	module_initialized = 1;
+
 	if (zend_post_startup() != SUCCESS) {
 		return FAILURE;
 	}
 
-	module_initialized = 1;
-
 	/* Check for deprecated directives */
 	/* NOTE: If you add anything here, remember to add it to Makefile.global! */
 	{

Original file line number	Diff line number	Diff line change
`@@ -2362,12 +2362,12 @@ int php_module_startup(sapi_module_struct sf, zend_module_entry additional_mod`
`2362`	`2362`	`module->info_func = PHP_MINFO(php_core);`
`2363`	`2363`	`}`
`2364`	`2364`
	`2365`	`+ module_initialized = 1;`
	`2366`	`+`
`2365`	`2367`	`if (zend_post_startup() != SUCCESS) {`
`2366`	`2368`	`return FAILURE;`
`2367`	`2369`	`}`
`2368`	`2370`
`2369`		`- module_initialized = 1;`
`2370`		`-`
`2371`	`2371`	`/* Check for deprecated directives */`
`2372`	`2372`	`/* NOTE: If you add anything here, remember to add it to Makefile.global! */`
`2373`	`2373`	`{`