Merge branch 'master' of https://github.com/DylanArnold/php-src

m6w6 · m6w6 · commit 41da5376149c · 2013-10-21T12:04:06.000+02:00
* 'master' of https://github.com/DylanArnold/php-src: Call php_module_shutdown() for php-fpm child processes
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -1982,8 +1982,9 @@ consult the installation file that came with this distribution, or visit \n\
 out:
 
 	SG(server_context) = NULL;
+	php_module_shutdown(TSRMLS_C);
+
 	if (parent) {
-		php_module_shutdown(TSRMLS_C);
 		sapi_shutdown();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1982,8 +1982,9 @@ consult the installation file that came with this distribution, or visit \n\`
`1982`	`1982`	`out:`
`1983`	`1983`
`1984`	`1984`	`SG(server_context) = NULL;`
	`1985`	`+ php_module_shutdown(TSRMLS_C);`
	`1986`	`+`
`1985`	`1987`	`if (parent) {`
`1986`		`- php_module_shutdown(TSRMLS_C);`
`1987`	`1988`	`sapi_shutdown();`
`1988`	`1989`	`}`
`1989`	`1990`