From: Jeff Trawick Date: Wed, 22 Mar 2000 10:26:44 +0000 (+0000) Subject: axe code to print "-D MULTITHREAD" for apache -V; MULTITHREAD X-Git-Tag: APACHE_2_0_ALPHA_2~41 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2af7ce1379c88cc4a26f3e0646f15fe8ed880d4;p=apache axe code to print "-D MULTITHREAD" for apache -V; MULTITHREAD is a 1.3 hangover; exit with a log message if ap_create_context() fails when creating the initial context; otherwise, we SIGSEGV later git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84822 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/main.c b/server/main.c index f5a8214fa7..94c835e018 100644 --- a/server/main.c +++ b/server/main.c @@ -147,9 +147,6 @@ static void show_compile_settings(void) printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF); #endif #endif -#ifdef MULTITHREAD - printf(" -D MULTITHREAD\n"); -#endif #ifdef CHARSET_EBCDIC printf(" -D CHARSET_EBCDIC\n"); #endif @@ -205,8 +202,16 @@ static process_rec *create_process(int argc, const char **argv) { ap_context_t *cntx; + ap_status_t stat; + + stat = ap_create_context(&cntx, NULL); + if (stat != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL, + "ap_create_context() failed to create " + "initial context"); + exit(1); + } - ap_create_context(&cntx, NULL); process = ap_palloc(cntx, sizeof(process_rec)); process->pool = cntx; }