mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 17:59:59 +00:00
Paul Eggleton
25ba859ab6
* Enable threading for PHP * Backport a number of patches * Use apachectl in init script * Install modules into a sane location * Ensure apxs script is installed into sysroot in crossscripts directory and modified so that it works for building PHP * Install httpd executable for native version so that PHP configure script can call it * Rename server-makefile-patch to server-makefile.patch and drop apply=yes * Add LIC_FILES_CHKSUM * Fix packaging QA warnings * Add LSB headers to init script * Clean out some cruft and move packaging stuff after do_install Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
36 lines
973 B
Diff
36 lines
973 B
Diff
|
|
* server/main.c (main): Bail out *before* signalling the server
|
|
if the config is bad. (as per the claim in the docs!)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=814645
|
|
http://svn.apache.org/viewvc?view=revision&revision=1328345
|
|
|
|
Upstream-Status: Backport
|
|
|
|
--- httpd-2.4.2/server/main.c.restart
|
|
+++ httpd-2.4.2/server/main.c
|
|
@@ -671,6 +671,11 @@ int main(int argc, const char * const ar
|
|
}
|
|
}
|
|
|
|
+ /* If our config failed, deal with that here. */
|
|
+ if (rv != OK) {
|
|
+ destroy_and_exit_process(process, 1);
|
|
+ }
|
|
+
|
|
signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server);
|
|
if (signal_server) {
|
|
int exit_status;
|
|
@@ -680,11 +685,6 @@ int main(int argc, const char * const ar
|
|
}
|
|
}
|
|
|
|
- /* If our config failed, deal with that here. */
|
|
- if (rv != OK) {
|
|
- destroy_and_exit_process(process, 1);
|
|
- }
|
|
-
|
|
apr_pool_clear(plog);
|
|
|
|
if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {
|