summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-10-29 16:48:42 +0300
committerDmitry Stogov <dmitry@zend.com>2018-10-29 21:39:26 +0300
commitea2e67876a55ffce2d38bff920ce7afdc7aff847 (patch)
tree5f7cb7c9337caca5bb86d634dd34dbbcd2dc3b50
parent7a5416b1c54798e630b5453242c345b22dd4967b (diff)
downloadphp-git-ea2e67876a55ffce2d38bff920ce7afdc7aff847.tar.gz
Stop Apache if PHP wasn't started successful.
-rw-r--r--sapi/apache2handler/sapi_apache2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 23eef816a8..283ec5722d 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -482,7 +482,9 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp
zend_signal_startup();
sapi_startup(&apache2_sapi_module);
- apache2_sapi_module.startup(&apache2_sapi_module);
+ if (apache2_sapi_module.startup(&apache2_sapi_module) != SUCCESS) {
+ return DONE;
+ }
apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null);
php_apache_add_version(pconf);