Commit d5be160a authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

ap_document_root_check must live in libhttpd, not in the httpd binary, 

due to the way that symbols are resolved.

Generally, main.c should export nothing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@997396 13f79535-47bb-0310-9956-ffa450edef68
parent d5396a1b

server/core.c

+3 −0
Changes for server/core.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle; 
/* magic pointer for ErrorDocument xxx "default" */

static char errordocument_default;



/* Default ap_document_root_check to default value: true */

AP_DECLARE_DATA int ap_document_root_check = 1;



static void *create_core_dir_config(apr_pool_t *a, char *dir)

{

    core_dir_config *conf;

server/main.c

+0 −3
Changes for server/main.c: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -446,9 +446,6 @@ static void usage(process_rec *process) 
    destroy_and_exit_process(process, 1);

}



/* Set ap_document_root_check to default value: true */

AP_DECLARE_DATA int ap_document_root_check = 1;



int main(int argc, const char * const argv[])

{

    char c;