Commit ee9b8cb8 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 629ed2e3

server/main.c

+9 −4
Changes for server/main.c: 9 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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;

    }